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:
-rwxr-xr-xChangeLog185
-rwxr-xr-xDocumentation.html91
-rwxr-xr-xREADME4
-rw-r--r--browse_foreigners.php6
-rw-r--r--config.inc.php9
-rw-r--r--css/phpmyadmin.css.php16
-rw-r--r--db_details_structure.php4
-rw-r--r--footer.inc.php2
-rw-r--r--lang/afrikaans-iso-8859-1.inc.php6
-rw-r--r--lang/afrikaans-utf-8.inc.php6
-rw-r--r--lang/albanian-iso-8859-1.inc.php6
-rw-r--r--lang/albanian-utf-8.inc.php6
-rw-r--r--lang/arabic-utf-8.inc.php6
-rw-r--r--lang/arabic-windows-1256.inc.php6
-rw-r--r--lang/azerbaijani-iso-8859-9.inc.php6
-rw-r--r--lang/azerbaijani-utf-8.inc.php6
-rw-r--r--lang/basque-iso-8859-1.inc.php6
-rw-r--r--lang/basque-utf-8.inc.php6
-rw-r--r--lang/bosnian-utf-8.inc.php6
-rw-r--r--lang/bosnian-windows-1250.inc.php6
-rw-r--r--lang/brazilian_portuguese-iso-8859-1.inc.php6
-rw-r--r--lang/brazilian_portuguese-utf-8.inc.php6
-rw-r--r--lang/bulgarian-koi8-r.inc.php6
-rw-r--r--lang/bulgarian-utf-8.inc.php6
-rw-r--r--lang/bulgarian-windows-1251.inc.php6
-rw-r--r--lang/catalan-iso-8859-1.inc.php50
-rw-r--r--lang/catalan-utf-8.inc.php50
-rw-r--r--lang/chinese_simplified-gb2312.inc.php6
-rw-r--r--lang/chinese_simplified-utf-8.inc.php6
-rw-r--r--lang/chinese_traditional-big5.inc.php334
-rw-r--r--lang/chinese_traditional-utf-8.inc.php337
-rw-r--r--lang/croatian-iso-8859-2.inc.php6
-rw-r--r--lang/croatian-utf-8.inc.php6
-rw-r--r--lang/croatian-windows-1250.inc.php6
-rw-r--r--lang/czech-iso-8859-2.inc.php278
-rw-r--r--lang/czech-utf-8.inc.php278
-rw-r--r--lang/czech-windows-1250.inc.php278
-rw-r--r--lang/danish-iso-8859-1.inc.php63
-rw-r--r--lang/danish-utf-8.inc.php63
-rw-r--r--lang/dutch-iso-8859-1.inc.php6
-rw-r--r--lang/dutch-utf-8.inc.php6
-rw-r--r--lang/english-iso-8859-1.inc.php234
-rw-r--r--lang/english-utf-8.inc.php234
-rw-r--r--lang/estonian-iso-8859-1.inc.php6
-rw-r--r--lang/estonian-utf-8.inc.php6
-rw-r--r--lang/finnish-iso-8859-1.inc.php6
-rw-r--r--lang/finnish-utf-8.inc.php6
-rw-r--r--lang/french-iso-8859-1.inc.php43
-rw-r--r--lang/french-utf-8.inc.php43
-rw-r--r--lang/galician-iso-8859-1.inc.php70
-rw-r--r--lang/galician-utf-8.inc.php70
-rw-r--r--lang/georgian-utf-8.inc.php6
-rw-r--r--lang/german-iso-8859-1.inc.php6
-rw-r--r--lang/german-utf-8.inc.php6
-rw-r--r--lang/greek-iso-8859-7.inc.php6
-rw-r--r--lang/greek-utf-8.inc.php6
-rw-r--r--lang/hebrew-iso-8859-8-i.inc.php6
-rw-r--r--lang/hebrew-utf-8.inc.php6
-rw-r--r--lang/hindi-utf-8.inc.php6
-rw-r--r--lang/hungarian-iso-8859-2.inc.php6
-rw-r--r--lang/hungarian-utf-8.inc.php6
-rw-r--r--lang/indonesian-iso-8859-1.inc.php246
-rw-r--r--lang/indonesian-utf-8.inc.php246
-rw-r--r--lang/italian-iso-8859-1.inc.php6
-rw-r--r--lang/italian-utf-8.inc.php6
-rw-r--r--lang/japanese-euc.inc.php90
-rw-r--r--lang/japanese-sjis.inc.php95
-rw-r--r--lang/japanese-utf-8.inc.php92
-rw-r--r--lang/korean-euc-kr.inc.php6
-rw-r--r--lang/korean-utf-8.inc.php6
-rw-r--r--lang/latvian-utf-8.inc.php51
-rw-r--r--lang/latvian-windows-1257.inc.php51
-rw-r--r--lang/lithuanian-utf-8.inc.php6
-rw-r--r--lang/lithuanian-windows-1257.inc.php6
-rw-r--r--lang/malay-iso-8859-1.inc.php6
-rw-r--r--lang/malay-utf-8.inc.php6
-rw-r--r--lang/norwegian-iso-8859-1.inc.php40
-rw-r--r--lang/norwegian-utf-8.inc.php40
-rw-r--r--lang/persian-utf-8.inc.php6
-rw-r--r--lang/persian-windows-1256.inc.php6
-rw-r--r--lang/polish-iso-8859-2.inc.php52
-rw-r--r--lang/polish-utf-8.inc.php52
-rw-r--r--lang/portuguese-iso-8859-1.inc.php6
-rw-r--r--lang/portuguese-utf-8.inc.php6
-rw-r--r--lang/romanian-iso-8859-1.inc.php6
-rw-r--r--lang/romanian-utf-8.inc.php6
-rw-r--r--lang/russian-cp-866.inc.php6
-rw-r--r--lang/russian-koi8-r.inc.php6
-rw-r--r--lang/russian-utf-8.inc.php6
-rw-r--r--lang/russian-windows-1251.inc.php6
-rw-r--r--lang/serbian_cyrillic-utf-8.inc.php50
-rw-r--r--lang/serbian_cyrillic-windows-1251.inc.php50
-rw-r--r--lang/serbian_latin-utf-8.inc.php50
-rw-r--r--lang/serbian_latin-windows-1250.inc.php50
-rw-r--r--lang/slovak-iso-8859-2.inc.php6
-rw-r--r--lang/slovak-utf-8.inc.php6
-rw-r--r--lang/slovak-windows-1250.inc.php6
-rw-r--r--lang/slovenian-iso-8859-2.inc.php6
-rw-r--r--lang/slovenian-utf-8.inc.php6
-rw-r--r--lang/slovenian-windows-1250.inc.php6
-rw-r--r--lang/spanish-iso-8859-1.inc.php50
-rw-r--r--lang/spanish-utf-8.inc.php50
-rw-r--r--lang/swedish-iso-8859-1.inc.php6
-rw-r--r--lang/swedish-utf-8.inc.php6
-rw-r--r--lang/thai-tis-620.inc.php6
-rw-r--r--lang/thai-utf-8.inc.php6
-rw-r--r--lang/turkish-iso-8859-9.inc.php66
-rw-r--r--lang/turkish-utf-8.inc.php6
-rw-r--r--lang/ukrainian-utf-8.inc.php6
-rw-r--r--lang/ukrainian-windows-1251.inc.php6
-rw-r--r--left.php70
-rw-r--r--libraries/auth/cookie.auth.lib.php107
-rw-r--r--libraries/blowfish.php97
-rw-r--r--libraries/bookmark.lib.php40
-rw-r--r--libraries/common.lib.php181
-rw-r--r--libraries/config_import.lib.php9
-rw-r--r--libraries/database_interface.lib.php4
-rw-r--r--libraries/dbg/profiling.php8
-rw-r--r--libraries/defines.lib.php2
-rw-r--r--libraries/display_export.lib.php13
-rw-r--r--libraries/display_tbl.lib.php19
-rw-r--r--libraries/display_tbl_links.lib.php2
-rw-r--r--libraries/export/sql.php17
-rw-r--r--libraries/fpdf/font/FreeSans.ctg.zbin0 -> 4503 bytes
-rw-r--r--libraries/fpdf/font/FreeSans.php150
-rw-r--r--libraries/fpdf/font/FreeSans.zbin0 -> 131363 bytes
-rw-r--r--libraries/fpdf/font/FreeSansBold.ctg.zbin0 -> 2193 bytes
-rw-r--r--libraries/fpdf/font/FreeSansBold.php79
-rw-r--r--libraries/fpdf/font/FreeSansBold.zbin0 -> 46047 bytes
-rw-r--r--libraries/fpdf/fpdf.php8
-rw-r--r--libraries/fpdf/ufpdf.php481
-rw-r--r--libraries/mcrypt.lib.php93
-rw-r--r--libraries/mysql_charsets.lib.php12
-rw-r--r--libraries/select_server.lib.php2
-rw-r--r--libraries/sqlparser.data.php4
-rw-r--r--libraries/sqlparser.lib.php11
-rw-r--r--libraries/string.lib.php24
-rw-r--r--libraries/tbl_change.js24
-rw-r--r--libraries/tbl_move_copy.php14
-rw-r--r--libraries/transformations/text_plain__external.inc.php70
-rw-r--r--libraries/zip.lib.php12
-rw-r--r--main.php29
-rw-r--r--mult_submits.inc.php7
-rw-r--r--pdf_schema.php44
-rw-r--r--queryframe.php13
-rw-r--r--read_dump.php19
-rw-r--r--scripts/upgrade_tables_mysql_4_1_2+.sql6
-rw-r--r--server_binlog.php4
-rw-r--r--server_databases.php30
-rw-r--r--server_privileges.php19
-rw-r--r--sql.php20
-rw-r--r--tbl_change.php18
-rw-r--r--tbl_create.php3
-rw-r--r--tbl_indexes.php7
-rw-r--r--tbl_properties_operations.php19
-rw-r--r--tbl_relation.php91
-rw-r--r--tbl_replace.php30
-rw-r--r--tbl_row_delete.php6
-rw-r--r--tbl_select.php8
-rw-r--r--themes/darkblue_orange/css/theme_right.css.php2
-rw-r--r--translators.html4
-rw-r--r--user_password.php2
162 files changed, 4211 insertions, 2300 deletions
diff --git a/ChangeLog b/ChangeLog
index 9530539970..45acf7bca2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,8 +5,193 @@ phpMyAdmin - Changelog
$Id$
$Source$
+2004-12-29 Michal ÄŒihaÅ™ <michal@cihar.com>
+ * libraries/export/sql.php: Fix typo.
+ * server_databases.php: Use same sort order as in left frame (bug
+ #1087244), allow sorting even if not showing stats.
+ * pdf_schema.php, libraries/fpdf/fpdf.php, libraries/fpdf/ufpdf.php,
+ libraries/fpdf/font/FreeSans*: Added support for PDF output in utf-8,
+ uses UFPDF class from http://www.acko.net/node/56. NOTE: We now have a
+ bit modified FPDF class. (bug #1046051)
+ * Documentation.html: Added info about UFPDF library.
+
+2004-12-28 Michal ÄŒihaÅ™ <michal@cihar.com>
+ * libraries/tbl_move_copy.php: Fix constraints copying (bug #1085900).
+ * config.inc.php, lang/*, libraries/common.lib.php,
+ libraries/config_import.lib.php, libraries/display_export.lib.php,
+ libraries/export/sql.php: Support for selecting SQL export compatibility
+ (RFE #1060040).
+ * libraries/tbl_change.js: Faster navigation in calendar (RFE #1090315).
+ * mult_submits.inc.php, tbl_row_delete.php: Fix % escaping (bug #1082954).
+ * read_dump.php: Fix database name extraction from use statement (bug
+ #1084777).
+ * css/phpmyadmin.css.php, libraries/common.lib.php: Disabled theme manager
+ still allows to select theme in configuration (bug #1084712).
+ * tbl_replace.php: Remove unused code.
+ * main.php, lang/*, libraries/string.lib.php: Added warnings about
+ mbstring - one to disable function overloading and one for requesting
+ mbstring for multibyte charsets (bugs #1063149 and #1063821).
+ * tbl_change.php, tbl_replace.php, lang/*, libraries/common.lib.php:
+ Support for editing next entry (when numeric primary key) (RFE
+ #1074906).
+
+2004-12-26 Marc Delisle <lem9@users.sourceforge.net>
+ * libraries/database_interface.lib.php: bug #1085647, wrong parameters
+ for strpos(), thanks to Meithar - meithar
+ * libraries/select_server.lib.php, bug #1073056, unable to submit selected server,
+ thanks to jamaz - jamaz
+ * tbl_change.php: bug #1090608, undefined variable, thanks to peterinsb
+ * scripts/upgrade_tables_mysql_4_1_2+.sql: bug #1084426, misleading comments
+ * tbl_create.php: bug #1085494, illegal length value for LONGTEXT, thanks to mjec
+
+2004-12-16 Marc Delisle <lem9@users.sourceforge.net>
+ * libraries/blowfish.php: bug #1085997, undefined variables,
+ patch thanks to Chandrakumar Muthaiah - sudhach
+
+2004-12-14 Alexander M. Turek <me@derrabus.de>
+ * libraries/sqlparser.data.php: Added keywords NAMES and VIEW.
+
+2004-12-13 Michal ÄŒihaÅ™ <michal@cihar.com>
+ * libraries/tbl_change.js: Do not catch Alt and Shift keys (bug #1082315).
+ * libraries/export/sql.php: Do not duplicate constraints when exporting
+ multiple databases (bug #1084459).
+
+2004-12-12 Marc Delisle <lem9@users.sourceforge.net>
+ * lang/japanese: updated, thanks to Tadashi Jokagi (elf2000)
+ * lang/latvian: Updated, thanks to Sandis Jerics (saaa2002).
+ * lang/serbian: Updated, thanks to Mihailo Stefanovic (mikis).
+ * lang/catalan update, thanks to Xavier Navarro (xavin).
+ * lang/danish: Updated, thanks to AlleyKat - dk_alleykat.
+ * lang/galician: Updated, thanks to Xosé Calvo.
+ * lang/polish: Updated, thanks to Jakub Wilk (ubanus).
+ * lang/chinese_traditional-*.inc.php: Updates, thanks to Siu Sun.
+ * lang/spanish: Updated, thanks to Daniel Hinostroza (hinostroza).
+ * lang/turkish update, thanks to boralioglu.
+ ### 2.6.1-rc1 released
+
+2004-12-10 Marc Delisle <lem9@users.sourceforge.net>
+ * libraries/transformations/text_plain__external.inc.php:
+ security fix: no longer use the shell to execute external program
+ * Documentation.html: mention the new need of PHP >= 4.3.0 to run
+ external programs
+
+2004-12-09 Marc Delisle <lem9@users.sourceforge.net>
+ * tbl_row_delete.php, libraries/display_tbl.lib.php:
+ cannot drop or export multiple rows under IE6
+
+2004-12-07 Marc Delisle <lem9@users.sourceforge.net>
+ * read_dump.php: security fix on $sql_localfile
+ * lang/norwegian: Update, thanks to Sven-Erik Andersen
+ * lang/danish: Updated, thanks to AlleyKat - dk_alleykat.
+ * lang/indonesian: Update thanks to Rachim Tamsjadi - tamsy.
+
+2004-12-01 Marc Delisle <lem9@users.sourceforge.net>
+ * db_details_structure.php, lang/*: added hint strApproximateCount referring
+ to FAQ 3.11 (bug #1075658)
+
+2004-11-30 Marc Delisle <lem9@users.sourceforge.net>
+ * libraries/auth/cookie.auth.lib.php: Avoid displaying the
+ "No activity" message if more than 4 times the LoginCookieValidity
+ timeout has passed: no need to alert users the next morning
+ (for example) that they have been inactive.
+
+2004-11-25 Marc Delisle <lem9@users.sourceforge.net>
+ * libraries/auth/cookie.auth.lib.php, lang/*: "No activity" message
+ to explain to users why they have to relogin
+
+2004-11-25 Michal ÄŒihaÅ™ <michal@cihar.com>
+ * libraries/mcrypt.lib.php: Trim result, because it can be paded with \0s.
+
+2004-11-24 Marc Delisle <lem9@users.sourceforge.net>
+ * libraries/mcrypt.lib.php, /libraries/blowfish.php,
+ libraries/auth/cookie.auth.lib.php: support of mcrypt
+ library (blowfish) for speed improvement in auth_type cookie
+
+2004-11-23 Marc Delisle <lem9@users.sourceforge.net>
+ * user_password.php: wrong generated cookie name
+
+2004-11-21 Marc Delisle <lem9@users.sourceforge.net>
+ * server_privileges.php: bug #1067626, column privileges while copying user
+ * libraries/common.lib.php: bug #1070197, not connecting if using
+ a non-standard HTTP port (bug introduced in 2.6.0-pl3)
+
+2004-11-19 Garvin Hicking <pma@supergarv.de>
+ * libraries/bookmark.lib.php, left.php:
+ Massively speed up table display for left frame, if
+ PMA infrastructure is used. Use native PHP function
+ for indenting.
+ * libraries/mysql_charsets.lib.php: Use a static
+ array cache to speed up returning the same collation
+ information.
+
+2004-11-19 Marc Delisle <lem9@users.sourceforge.net>
+ * libraries/display_tbl.lib.php: we have the PMA_get_indexes() function,
+ let's use it!
+ * tbl_indexes.php: bug #1068994, undefined variable
+ * libraries/dbg/profiling.php: bug #1068318, call-time pass-by-reference
+
+2004-11-16 Michal ÄŒihaÅ™ <michal@cihar.com>
+ * left.php: Possible undefined index (bug #1067199).
+ * Documentation.html: Warn about Excel export problems in documentation
+ (bug #1063082).
+
+2004-11-14 Marc Delisle <lem9@users.sourceforge.net>
+ * tbl_relation.php: bug #1050437, intercept constraint failure
+ and do not offer to add an InnoDB foreign key if the field
+ does not have a key
+
+2004-11-13 Marc Delisle <lem9@users.sourceforge.net>
+ * server_privileges.php: bug #1056706: table specific privs for a db containing an escaped wildcard character
+ * libraries/display_tbl.lib.php: bug #1065688: display the Full text link
+ on the results for PROCEDURE ANALYSE
+
+2004-11-11 Michal ÄŒihaÅ™ <michal@cihar.com>
+ * tbl_properties_operations.php: Allow InnoDB text to be included in user
+ comment.
+
+2004-11-09 Michal ÄŒihaÅ™ <michal@cihar.com>
+ * browse_foreigners.php, server_binlog.php: Truncate text according to
+ text length and not byte count.
+
+2004-11-07 Alexander M. Turek <me@derrabus.de>
+ * Documentation.html, README: Updated credits.
+
+2004-11-07 Marc Delisle <lem9@users.sourceforge.net>
+ * mult_submits.inc.php: bug #1054720, multi-row delete
+
+2004-11-06 Michael Keck <mkkeck@users.sourceforge.net>
+ * queryframe.php: bug #1046434 (Light mode does not work)
+
+2004-11-06 Marc Delisle <lem9@users.sourceforge.net>
+ * libraries/common.lib.php: put sanitize logic in PMA_sanitize()
+ * sql.php: sanitize confirm page
+ * db_details_structure.php: bug #1049553, undefined $db_collation
+
+2004-11-05 Marc Delisle <lem9@users.sourceforge.net>
+ * Documentation.html: new controluser behavior starting from MySQL 4.1.2
+
+2004-11-04 Marc Delisle <lem9@users.sourceforge.net>
+ * libraries/common.lib.php, tbl_replace.php, sql.php, read_dump.php,
+ server_privileges.php: now PMA_showMessage() sanitizes the message
+ to defeat XSS attacks. Calling scripts use special tags like
+ [br], [i], [/i], [b], [/b] in the message.
+ * main.php: bug #1058692, call-time pass-by-reference error
+ * sql.php, libraries/sqlparser.lib.php: bug #1054590, handling of OFFSET
+
+2004-11-10 Garvin Hicking
+ * config.inc.php: Reverted commenting out of QueryWindowWidth/Height
+ settings. Those can be overriden by a themes layout.inc.php,
+ but not neccessarily so.
+
+2004-11-03 Michal ÄŒihaÅ™ <michal@cihar.com>
+ * libraries/common.lib.php: More robust PmaAbsoluteUri detection.
+ * libraries/sqlparser.lib.php: Escape html special chars in parser bugs.
+ * libraries/common.lib.php: HTTP_HOST might be unset (bug #1053310).
+
2004-11-02 Michal ÄŒihaÅ™ <michal@cihar.com>
* tbl_indexes.php: Fix index editing.
+ * sql.php: Decode table name.
+ * lang/czech: Updated.
2004-11-09 Garvin Hicking
* libraries/display_tbl.lib.php, libraries/common.lib.php,
diff --git a/Documentation.html b/Documentation.html
index 493411c651..8c43c63249 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -8,7 +8,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <title>phpMyAdmin 2.6.1-dev - Documentation</title>
+ <title>phpMyAdmin 2.6.1-rc2 - Documentation</title>
<link rel="stylesheet" type="text/css" href="docs.css" />
</head>
@@ -31,7 +31,7 @@
<hr noshade="noshade" width="100%" />
</div>
-<h1>phpMyAdmin 2.6.1-dev Documentation</h1>
+<h1>phpMyAdmin 2.6.1-rc2 Documentation</h1>
<!-- TOP MENU -->
@@ -62,12 +62,24 @@
<ul>
<li>
- php 4.1.0 or later (<a href="#faqphp5">*</a>)<br />
- If you want to display inline thumbnails of JPEGs with the original
- aspect ratio, you also need GD2 support in PHP.
+ <b>PHP</b>
+ <ul>
+ <li>You need PHP 4.1.0 or newer (<a href="#faqphp5">*</a>)</li>
+ <li>If you want to display inline thumbnails of JPEGs with the
+ original aspect ratio, you also need GD2 support in PHP</li>
+ <li>Starting with phpMyAdmin 2.6.1, MIME-based transformations
+ that use an external program need PHP 4.3.0 or newer</li>
+ </ul>
+ </li>
+ <li>
+ <b>MySQL</b> 3.23.32 or newer (<a href="#faqmysqlversions">details</a>);
</li>
<li>
- MySQL 3.23.32 or newer (<a href="#faqmysqlversions">details</a>);
+ Not really a requirement but a <b>strong suggestion</b>:
+ if you are using
+ the &quot;cookie&quot; authentication method, having the <tt>mcrypt</tt>
+ PHP extension on your web server accelerates not only the login
+ phase but every other action that you do in phpMyAdmin.
</li>
<li>
a web-browser (doh!).
@@ -156,7 +168,9 @@
Also insert the correct value for <tt>$cfg['PmaAbsoluteUri']</tt>.
Have a look at
<a href="#config">Configuration section</a> for an
- explanation of all values.</li>
+ explanation of all values. Please also read the remaining of this
+ Installation section for information about authentication modes
+ and the linked-tables infrastructure.</li>
<li> It is recommended that you protect the directory in which you
installed phpMyAdmin (unless it's on a closed intranet, or you wish to
use HTTP or cookie authentication), for example with HTTP-AUTH (in a
@@ -227,9 +241,9 @@
in the configuration file.<br /><br /></li>
<li>HTTP and cookie authentication modes are more secure: the MySQL
- password does not need to be set in the phpMyAdmin configuration file
- (except for the &quot;controluser&quot; -see the
- <a href="#config">Configuration section</a>).
+ login information does not need to be set in the phpMyAdmin
+ configuration file
+ (except possibly for the <a href="#controluser">controluser</a>).
<br />
However, keep in mind that the password travels in plain text, unless
you are using the HTTPS protocol.
@@ -239,14 +253,18 @@
<br /><br /></li>
<li>
+ <b>Note: starting with phpMyAdmin 2.6.1, configuring the controluser
+ to enable HTTP and cookie authentication applies <i>only
+ to MySQL servers older than 4.1.2</i>.</b>
+ <br /><br />
For 'HTTP' and 'cookie' modes, phpMyAdmin needs a controluser that has
<b>only</b> the <tt>SELECT</tt> privilege on the <i>mysql.user (all
columns except &quot;Password&quot;)</i>, <i>mysql.db (all
columns)</i>, <i>mysql.host (all columns)</i> and
<i>mysql.tables_priv (all columns except
&quot;Grantor&quot; &amp; &quot;Timestamp&quot;) </i>tables.<br /> You
- must specify the details for the controluser in the
- <i>config.inc.php</i> file under the
+ must specify the details for the <a href="#controluser">controluser</a>
+ in the <i>config.inc.php</i> file under the
<tt>$cfg['Servers'][$i]['controluser']</tt>&amp;
<tt>$cfg['Servers'][$i]['controlpass']</tt> settings.<br /> The
following example assumes you want to use <tt>pma</tt> as the
@@ -328,6 +346,8 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON &lt;pma_db&gt;.* TO 'pma'@'localhost';
with the same username.</li>
<li>If you want to login to arbitrary server see
<tt><a href="#AllowArbitraryServer">$cfg['AllowArbitraryServer']</a></tt> directive.</li>
+ <li>See also the <a href="#require">requirements</a> section for a way
+ to improve the interface speed while using this mode.</li>
</ul>
<h4>'config' authentication mode</h4>
@@ -495,14 +515,20 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON &lt;pma_db&gt;.* TO 'pma'@'localhost';
</dd>
<dt>
+<a name="controluser"></a><br />
<b>$cfg['Servers'][$i]['controluser']</b> string<br />
<b>$cfg['Servers'][$i]['controlpass']</b> string
</dt>
<dd>
+ <i>Note: starting with phpMyAdmin 2.6.1, configuring the controluser
+ to enable HTTP and cookie authentication applies only
+ to MySQL servers older than 4.1.2.</i>
+ <br /><br />
This special account is used for 2 distinct purposes: to make possible
- a multi-user installation (http or cookie authentication mode) and
- also for all relational features (see
- <a href="#pmadb">$cfg['Servers'][$i]['pmadb']</a>).
+ all relational features
+ (see <a href="#pmadb">$cfg['Servers'][$i]['pmadb']</a>) and, for a
+ MySQL server older than 4.1.2, to enable a multi-user installation
+ (http or cookie authentication mode).
<br /><br />
When using HTTP or cookie authentication modes (or 'config'
authentication mode since phpMyAdmin 2.2.1), you need to supply the
@@ -521,7 +547,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON &lt;pma_db&gt;.* TO 'pma'@'localhost';
privileges you gave to the &quot;controluser&quot;. phpMyAdmin does not
support a direct login with the &quot;controluser&quot;.
<br /><br />
- In versions before 2.2.5, those were called
+ In phpMyAdmin versions before 2.2.5, those were called
&quot;stduser/stdpass&quot;.
<br /><br />
</dd>
@@ -844,7 +870,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON &lt;pma_db&gt;.* TO 'pma'@'localhost';
<b>$cfg['Servers'][$i]['AllowRoot']</b> boolean
</dt>
<dd>
- Whethet to allow root access, This is just simplification of rules bellow.
+ Whether to allow root access, This is just simplification of rules below.
<br /><br />
</dd>
<dt>
@@ -1713,7 +1739,8 @@ Defaults to FALSE (drop-down). <br />
Determines for how large tables phpMyAdmin should get exact row count by
<code>SELECT COUNT</code>. If approximate row count is smaller than this
value, <code>SELECT COUNT</code> will be used, otherwise only value
- returned by <code>SHOW TABLE STATUS</code>.
+ returned by <code>SHOW TABLE STATUS</code>. This has currently an impact
+ only on InnoDB tables.
<br /><br />
</dd>
@@ -2955,6 +2982,16 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
can use it for the Edit and Delete links.
</p>
+<h4>
+ [3.11] The number of records for InnoDB tables is not correct.
+</h4>
+<p>
+ phpMyAdmin uses a quick method to get the row count, and this method
+ only returns an approximate count in the case of InnoDB tables. See
+ <tt>$cfg['MaxExactCount']</tt> for a way to modify those results, but
+ this could have a serious impact on performance.
+</p>
+
<a name="faqmultiuser"></a><br />
<h3>[4. ISPs, multi-user installations ]</h3>
@@ -3664,11 +3701,13 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
</h4>
<p>
You can either export as CSV suitable for MS Excel, which works out of the
- box or you can try native <b>experimental</b> MS Excel exporter. For
- enabling this you need to set $cfg['TempDir'] to place where web server
- user can write (for example <tt>'./tmp'</tt>)
- and install PEAR module Spreadsheet_Excel_Writer into php
- include path. The installation can be done by following command:
+ box or you can try native <b>experimental</b> MS Excel exporter. <b>This
+ export has several problems, most important are limitation of cell content
+ to 255 chars and no support for charsets, so think carefully whether you
+ want to enable this.</b>. For enabling this you need to set
+ $cfg['TempDir'] to place where web server user can write (for example
+ <tt>'./tmp'</tt>) and install PEAR module Spreadsheet_Excel_Writer into
+ php include path. The installation can be done by following command:
</p>
<pre>
pear -d preferred_state=beta install -a Spreadsheet_Excel_Writer
@@ -4037,7 +4076,8 @@ CREDITS, in chronological order
- Maxime Delorme &lt;delorme.maxime_at_free.fr&gt;
* PDF schema output, thanks also to Olivier Plathey for the
- &quot;FPDF&quot; library (see http://www.fpdf.org/).
+ &quot;FPDF&quot; library (see <a href="http://www.fpdf.org/">http://www.fpdf.org/</a>) and Steven Wittens
+ for the &quot;UFPDF&quot; library (see <a href="http://www.acko.net/node/56">http://www.acko.net/node/56</a>).
- Olof Edlund &lt;olof.edlund_at_upright.se&gt;
* SQL validator server
@@ -4056,6 +4096,9 @@ CREDITS, in chronological order
* redesign for 2.6.0
* phpMyAdmin sailboat logo (June 2004)
+- Mathias Landh&auml;u&szlig;er
+ * Representation at conferences
+
And also to the following people who have contributed minor changes,
enhancements, bugfixes or support for a new language since version 2.1.0:
diff --git a/README b/README
index 39673aa418..c62ef94788 100755
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ phpMyAdmin - Readme
A set of PHP-scripts to manage MySQL over the web.
- Version 2.6.1-dev
+ Version 2.6.1-rc1
-----------------
http://www.phpmyadmin.net/
@@ -16,7 +16,7 @@ phpMyAdmin - Readme
Alexander M. Turek <me_at_derrabus.de>
Michal Cihar <michal_at_cihar.com>
Garvin Hicking <me_at_supergarv.de>
- Marcel Tschopp <ne0x_at_users.sourceforge.net>
+ Michael Keck <mkkeck_at_users.sourceforge.net>
[check Documentation.txt/.html file for more details]
This program is free software; you can redistribute it and/or modify
diff --git a/browse_foreigners.php b/browse_foreigners.php
index 5925f05ce3..1b05088184 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -182,7 +182,7 @@ if (isset($disp_row) && is_array($disp_row)) {
$val = key($mysql_val_relrow[$i]);
$key = $mysql_val_relrow[$i][$val];
- if (strlen($val) <= $cfg['LimitChars']) {
+ if (PMA_strlen($val) <= $cfg['LimitChars']) {
$value = htmlspecialchars($val);
$vtitle = '';
} else {
@@ -199,12 +199,12 @@ if (isset($disp_row) && is_array($disp_row)) {
<?php
$key = key($mysql_key_relrow[$i]);
$val = $mysql_key_relrow[$i][$key];
- if (strlen($val) <= $cfg['LimitChars']) {
+ if (PMA_strlen($val) <= $cfg['LimitChars']) {
$value = htmlspecialchars($val);
$vtitle = '';
} else {
$vtitle = htmlspecialchars($val);
- $value = htmlspecialchars(substr($val, 0, $cfg['LimitChars']) . '...');
+ $value = htmlspecialchars(PMA_substr($val, 0, $cfg['LimitChars']) . '...');
}
$key_equals_data = isset($data) && $key == $data;
diff --git a/config.inc.php b/config.inc.php
index 4be14e1a03..7059f10289 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -342,6 +342,7 @@ $cfg['Export']['latex_structure_label'] = 'tab:__TABLE__-structure';
$cfg['Export']['sql_structure'] = TRUE;
$cfg['Export']['sql_data'] = TRUE;
+$cfg['Export']['sql_compat'] = 'NONE';
$cfg['Export']['sql_disable_fk'] = FALSE;
$cfg['Export']['sql_use_transaction'] = FALSE;
$cfg['Export']['sql_drop_database'] = FALSE;
@@ -507,12 +508,8 @@ $cfg['RepeatCells'] = 100; // repeat header names every X cells
$cfg['QueryFrame'] = TRUE; // displays a link or icon in the left frame to open the querybox, and activates the querybox when clicking on [Edit] on the results page.
$cfg['QueryFrameJS'] = TRUE; // whether to use JavaScript functions for opening a new window for SQL commands.
// if set to 'false', the target of the querybox is always the right frame.
-
-/* is moved to ./themes/.../layout.inc.php
- * bug #1050666: Query window too small darkblue/orange theme
- * $cfg['QueryWindowWidth'] = 550; // Width of Query window
- * $cfg['QueryWindowHeight'] = 310; // Height of Query window
-*/
+$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)
diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php
index 4428520642..05eca7faae 100644
--- a/css/phpmyadmin.css.php
+++ b/css/phpmyadmin.css.php
@@ -20,23 +20,13 @@ if (!isset($js_frame)) {
$js_frame = 'left';
}
-// 2004-05-30: Michael Keck (mail@mnichaelkeck.de)
-// check, if select_theme.lib.php exists
-// and include it
-$tmp_file_lib = './libraries/select_theme.lib.php';
-if (@file_exists($tmp_file_lib) && isset($GLOBALS['cfg']['ThemePath']) && !empty($GLOBALS['cfg']['ThemePath'])){
- require_once($tmp_file_lib);
-}else{
- $pmaTheme = 'original';
-}
-
if ($js_frame == 'left') {
/************************************************************************************
* LEFT FRAME
************************************************************************************/
// 2004-05-30: Michael Keck (mail@michaelkeck.de)
// Check, if theme_left.css.php exists and include
- $tmp_file = $GLOBALS['cfg']['ThemePath'] . '/' . $pmaTheme . '/css/theme_left.css.php';
+ $tmp_file = $GLOBALS['cfg']['ThemePath'] . '/' . $theme . '/css/theme_left.css.php';
if (@file_exists($tmp_file)) {
include($tmp_file);
} // end of include theme_left.css.php
@@ -46,7 +36,7 @@ if ($js_frame == 'left') {
************************************************************************************/
// 2004-05-30: Michael Keck (mail@michaelkeck.de)
// Check, if theme_print.css.php exists and include
- $tmp_file = $GLOBALS['cfg']['ThemePath'] . '/' . $pmaTheme . '/css/theme_print.css.php';
+ $tmp_file = $GLOBALS['cfg']['ThemePath'] . '/' . $theme . '/css/theme_print.css.php';
if (@file_exists($tmp_file)) {
include($tmp_file);
} // end of include theme_print.css.php
@@ -56,7 +46,7 @@ if ($js_frame == 'left') {
************************************************************************************/
// 2004-05-30: Michael Keck (mail@michaelkeck.de)
// Check, if theme_right.css.php exists and include
- $tmp_file = $GLOBALS['cfg']['ThemePath'] . '/' . $pmaTheme . '/css/theme_right.css.php';
+ $tmp_file = $GLOBALS['cfg']['ThemePath'] . '/' . $theme . '/css/theme_right.css.php';
if (@file_exists($tmp_file)) {
include($tmp_file);
} // end of include theme_right.css.php
diff --git a/db_details_structure.php b/db_details_structure.php
index 61329202fe..267b49d53f 100644
--- a/db_details_structure.php
+++ b/db_details_structure.php
@@ -45,7 +45,7 @@ function pma_TableHeader($alternate = FALSE) {
. ' &nbsp;' . $GLOBALS['strAction'] . '&nbsp;' . "\n"
. ' </th>' . "\n"
. ' <th>' . "\n"
- . ' &nbsp;' . $GLOBALS['strRecords'] . '&nbsp;' . "\n"
+ . ' &nbsp;' . $GLOBALS['strRecords'] . PMA_showHint($GLOBALS['strApproximateCount']) . '&nbsp;' . "\n"
. ' </th>' . "\n";
if (!$alternate) {
if (!($GLOBALS['cfg']['PropertiesNumColumns'] > 1)) {
@@ -439,7 +439,7 @@ else {
echo ' <th align="center">' . "\n"
. ' <b>--</b>' . "\n"
. ' </th>' . "\n";
- if (PMA_MYSQL_INT_VERSION >= 40100) {
+ if (PMA_MYSQL_INT_VERSION >= 40101) {
echo ' <th align="center">' . "\n"
. ' &nbsp;<b><dfn title="' . PMA_getCollationDescr($db_collation) . '">' . $db_collation . '</dfn></b>&nbsp;' . "\n"
. ' </th>' . "\n";
diff --git a/footer.inc.php b/footer.inc.php
index ebcc18e537..452813a924 100644
--- a/footer.inc.php
+++ b/footer.inc.php
@@ -39,7 +39,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
} else {
setTimeout("dbBoxSetup();",500);
}
- }
+ }
}
if (parent.frames.queryframe && parent.frames.queryframe.document && parent.frames.queryframe.document.queryframeform) {
parent.frames.queryframe.document.queryframeform.db.value = "<?php echo (isset($db) ? addslashes($db) : ''); ?>";
diff --git a/lang/afrikaans-iso-8859-1.inc.php b/lang/afrikaans-iso-8859-1.inc.php
index e9731295df..7587bf8ebe 100644
--- a/lang/afrikaans-iso-8859-1.inc.php
+++ b/lang/afrikaans-iso-8859-1.inc.php
@@ -753,4 +753,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php
index 033496676c..9528fe1eae 100644
--- a/lang/afrikaans-utf-8.inc.php
+++ b/lang/afrikaans-utf-8.inc.php
@@ -754,4 +754,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/albanian-iso-8859-1.inc.php b/lang/albanian-iso-8859-1.inc.php
index 8723048bfa..8b664ec51f 100644
--- a/lang/albanian-iso-8859-1.inc.php
+++ b/lang/albanian-iso-8859-1.inc.php
@@ -743,4 +743,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php
index 6a529ade01..9152a655f7 100644
--- a/lang/albanian-utf-8.inc.php
+++ b/lang/albanian-utf-8.inc.php
@@ -744,4 +744,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php
index 1ab3fe8c94..93bd81e12d 100644
--- a/lang/arabic-utf-8.inc.php
+++ b/lang/arabic-utf-8.inc.php
@@ -747,4 +747,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/arabic-windows-1256.inc.php b/lang/arabic-windows-1256.inc.php
index e4f083c9c4..b54c9e2699 100644
--- a/lang/arabic-windows-1256.inc.php
+++ b/lang/arabic-windows-1256.inc.php
@@ -746,4 +746,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/azerbaijani-iso-8859-9.inc.php b/lang/azerbaijani-iso-8859-9.inc.php
index 209d77083b..c56f60fea4 100644
--- a/lang/azerbaijani-iso-8859-9.inc.php
+++ b/lang/azerbaijani-iso-8859-9.inc.php
@@ -742,4 +742,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php
index 61b8c7e0f6..09f5b37efd 100644
--- a/lang/azerbaijani-utf-8.inc.php
+++ b/lang/azerbaijani-utf-8.inc.php
@@ -743,4 +743,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/basque-iso-8859-1.inc.php b/lang/basque-iso-8859-1.inc.php
index 16a2c6a1d0..452ce90a42 100644
--- a/lang/basque-iso-8859-1.inc.php
+++ b/lang/basque-iso-8859-1.inc.php
@@ -745,4 +745,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php
index fee689715e..533436f442 100644
--- a/lang/basque-utf-8.inc.php
+++ b/lang/basque-utf-8.inc.php
@@ -746,4 +746,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php
index c74aab64ee..b23980d379 100644
--- a/lang/bosnian-utf-8.inc.php
+++ b/lang/bosnian-utf-8.inc.php
@@ -752,4 +752,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/bosnian-windows-1250.inc.php b/lang/bosnian-windows-1250.inc.php
index a8ab8463f7..d41afb1687 100644
--- a/lang/bosnian-windows-1250.inc.php
+++ b/lang/bosnian-windows-1250.inc.php
@@ -751,4 +751,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/brazilian_portuguese-iso-8859-1.inc.php b/lang/brazilian_portuguese-iso-8859-1.inc.php
index bbba654cc6..fd0d9cfb28 100644
--- a/lang/brazilian_portuguese-iso-8859-1.inc.php
+++ b/lang/brazilian_portuguese-iso-8859-1.inc.php
@@ -767,4 +767,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php
index 975418f8c5..c695d4e712 100644
--- a/lang/brazilian_portuguese-utf-8.inc.php
+++ b/lang/brazilian_portuguese-utf-8.inc.php
@@ -768,4 +768,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/bulgarian-koi8-r.inc.php b/lang/bulgarian-koi8-r.inc.php
index 52191ff4db..0914cb650b 100644
--- a/lang/bulgarian-koi8-r.inc.php
+++ b/lang/bulgarian-koi8-r.inc.php
@@ -752,4 +752,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php
index 451d9f2e8e..ae526b1631 100644
--- a/lang/bulgarian-utf-8.inc.php
+++ b/lang/bulgarian-utf-8.inc.php
@@ -753,4 +753,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/bulgarian-windows-1251.inc.php b/lang/bulgarian-windows-1251.inc.php
index 40bec49e36..9a8410003a 100644
--- a/lang/bulgarian-windows-1251.inc.php
+++ b/lang/bulgarian-windows-1251.inc.php
@@ -752,4 +752,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/catalan-iso-8859-1.inc.php b/lang/catalan-iso-8859-1.inc.php
index 6cd4bd5790..2fd3873646 100644
--- a/lang/catalan-iso-8859-1.inc.php
+++ b/lang/catalan-iso-8859-1.inc.php
@@ -28,6 +28,7 @@ $strAddConstraints = 'Afegir restriccions';
$strAddDeleteColumn = 'Afegir/esborrar Camps de Columna';
$strAddDeleteRow = 'Afegir/esborrar fila de criteri';
$strAddDropDatabase = 'Afegir DROP DATABASE';
+$strAddFields = 'Afegir %s camp(s)';
$strAddHeaderComment = 'Afegir comentari personalitzat a la capçalera (\\n divideix linies)';
$strAddIfNotExists = 'Afegir IF NOT EXISTS';
$strAddIntoComments = 'Afegir en comentaris';
@@ -55,6 +56,7 @@ $strAnd = 'I';
$strAny = 'Qualsevol';
$strAnyHost = 'Qualsevol servidor';
$strAnyUser = 'Qualsevol usuari';
+$strApproximateCount = 'Pot ser aproximat. Veure FAQ 3.11';
$strArabic = 'Àrab';
$strArmenian = 'Armeni';
$strAscending = 'Ascendent';
@@ -68,8 +70,15 @@ $strBack = 'Enrere';
$strBaltic = 'Bàltic';
$strBeginCut = 'INICI DEL TALL';
$strBeginRaw = 'INICI DEL VOLCAT';
+$strBinLogEventType = 'Tipus d\'event';
+$strBinLogInfo = 'Informació';
+$strBinLogName = 'Nom del registre';
+$strBinLogOriginalPosition = 'Posició original';
+$strBinLogPosition = 'Posició';
+$strBinLogServerId = 'ID de Servidor';
$strBinary = ' Binari ';
$strBinaryDoNotEdit = ' Binari - no editeu ';
+$strBinaryLog = 'Registre binari';
$strBookmarkAllUsers = 'Deixa accedir a cada usuari a aquesta consulta arxivada';
$strBookmarkDeleted = 'S\'ha esborrat la consulta arxivada.';
$strBookmarkLabel = 'Etiqueta';
@@ -121,6 +130,7 @@ $strColumnPrivileges = 'Permissos específics de columna';
$strCommand = 'Ordre';
$strComments = 'Comentaris';
$strCommentsForTable = 'COMENTARIS PER LA TAULA';
+$strCompatibleHashing = 'Compatible amb MySQL&nbsp;4.0';
$strCompleteInserts = 'Completar insercions';
$strCompression = 'Compressió';
$strConfigFileError = 'phpMyAdmin és incapaç de llegir el fitxer de configuració!<br />Això pot succeir si php troba un error sintàctic en ell o bé php no pot trobar el fitxer.<br />Intenta obrir el fitxer de configuració directament fent servir l\'enllaç següent i comprova el(s) missatge(s) d\'error que reps. En moltes ocasions una coma o punt i coma falta en algun lloc.<br />Si reps una plana en blanc, tot està bé.';
@@ -130,6 +140,7 @@ $strConnections = 'Connexions';
$strConstraintsForDumped = 'Restriccions per taules volcades';
$strConstraintsForTable = 'Restriccions per la taula';
$strCookiesRequired = 'A partir d\'aquest punt és necessari tenir les galetes (cookies) activades.';
+$strCopyDatabaseOK = 'La Base de dades %s s\'ha copiat a %s';
$strCopyTable = 'Copia taula a (base-de-dades<b>.</b>taula):';
$strCopyTableOK = 'La taula %s ha estat copiada a %s.';
$strCopyTableSameNames = 'No es pot copiar la taula sobre ella mateixa';
@@ -149,6 +160,7 @@ $strCzech = 'Txec';
$strCzechSlovak = 'Txec-Eslovac';
$strDBComment = 'Comentaris de la Base de Dades: ';
+$strDBCopy = 'Copiar base de dades a';
$strDBGContext = 'Contexte';
$strDBGContextID = 'ID de contexte';
$strDBGHits = 'Accessos';
@@ -221,6 +233,7 @@ $strEndRaw = 'FI DEL VOLCAT';
$strEnglish = 'Anglès';
$strEnglishPrivileges = ' Nota: Els noms dels privilegis del MySQL són en llengua anglesa ';
$strError = 'Errada';
+$strEscapeWildcards = 'Els comodins _ i % han de marcar-se amb una \ per usar-las literalment';
$strEstonian = 'Estonià ';
$strExcelEdition = 'Edició per Excel';
$strExcelOptions = 'Opcions d\'Excel';
@@ -290,11 +303,16 @@ $strIndex = 'Índex';
$strIndexHasBeenDropped = 'S\'ha esborrat l\'índex %s';
$strIndexName = 'Nom d\'índex:';
$strIndexType = 'Tipus d\'índex:';
+$strIndexWarningMultiple = 'Més d\'una clau %s s\'ha creat per a la columna `%s`';
+$strIndexWarningPrimary = 'Les claus PRIMARY i INDEX no es poden establir alhora per a la columna `%s`';
+$strIndexWarningTable = 'Problemes amb els index de la taula `%s`';
+$strIndexWarningUnique = 'Les claus UNIQUE i INDEX no es poden establir alhora per a la columna `%s`';
$strIndexes = 'Indexos';
$strInnodbStat = 'Estat InnoDB';
$strInsecureMySQL = 'El vostre fitxer 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.';
$strInsert = 'Insereix';
$strInsertAsNewRow = 'Inserir com a nova fila';
+$strInsertBookmarkTitle = 'Entra un títol de consulta arxivada';
$strInsertNewRow = 'Inserir nova fila';
$strInsertTextfiles = 'Inserir fitxers de text a la taula';
$strInsertedRowId = 'Id de la fila inserida:';
@@ -376,6 +394,7 @@ $strName = 'Nom';
$strNeedPrimaryKey = 'S\'ha de definir una clau principal per a aquesta taula.';
$strNext = 'Següent';
$strNo = 'No';
+$strNoActivity = 'Sense activitat des de fa %s segons o més, entra de nou';
$strNoDatabases = 'No hi ha Bases de Dades';
$strNoDatabasesSelected = 'No hi han Bases de dades sel.leccionades.';
$strNoDescription = 'Sense Descripció';
@@ -395,6 +414,7 @@ $strNoRights = 'No tens prou permissos per visualitzar aquesta informació!';
$strNoRowsSelected = 'No s\'han seleccionat files';
$strNoSpace = 'No hi ha prou espai per guardar l\'arxiu %s.';
$strNoTablesFound = 'Base de dades sense taules.';
+$strNoThemeSupport = 'No hi ha suport pels temes, si et plau comprova la teva configuració i/o els teus temes al directori %s.';
$strNoUsersFound = 'No s\'han trobat usuaris.';
$strNoValidateSQL = 'Saltar la Validació de l\'SQL';
$strNone = 'Res';
@@ -426,6 +446,7 @@ $strPartialText = 'Textos Parcials';
$strPassword = 'Contrasenya';
$strPasswordChanged = 'La contrasenya per a %s s\'ha canviat correctament.';
$strPasswordEmpty = 'La contrasenya és buida!';
+$strPasswordHashing = 'Contrasenya Hashing';
$strPasswordNotSame = 'Les contrasenyes no coincideixen!';
$strPdfDbSchema = 'Esquema de la base de dades "%s" - Pàgina %s';
$strPdfInvalidTblName = 'La taula "%s" no existeix!';
@@ -562,6 +583,7 @@ $strSearchType = 'Trobat:';
$strSecretRequired = 'El fitxer de configuració necessita ara una frase de pas secreta (blowfish_secret).';
$strSelectADb = 'Selecciona una Base de Dades';
$strSelectAll = 'Selecciona Tot';
+$strSelectBinaryLog = 'Selecciona el registre binari per veure';
$strSelectFields = 'Selecciona els camps (un com a mínim):';
$strSelectNumRows = 'en consulta';
$strSelectTables = 'Selecciona Taules';
@@ -617,6 +639,7 @@ $strSubmit = 'Enviar';
$strSuccess = 'La vostra comanda SQL ha estat executada amb èxit';
$strSum = 'Suma';
$strSwedish = 'Suec';
+$strSwitchToDatabase = 'Canviar a la base de dades copiada';
$strSwitchToTable = 'Canvia a una taula copiada';
$strTable = 'Taula';
@@ -678,6 +701,7 @@ $strUpgrade = 'Es necessari actualitzar a %s %s o posterior.';
$strUsage = 'Ús';
$strUseBackquotes = 'Usa &quot;backquotes&quot; amb taules i noms de camps';
$strUseHostTable = 'Utilitza la Taula de Hosts';
+$strUseTabKey = 'Usa la tecla TAB per moure\'t de valor en valor, o CTRL+fletxes per moure\'t on vulguis';
$strUseTables = 'Usa Taules';
$strUseTextField = 'Usa camp de texte';
$strUseThisValue = 'Fes servir aquest valor';
@@ -716,26 +740,8 @@ $strYes = 'Si';
$strZeroRemovesTheLimit = 'Nota: Establint aquestes opcions a 0 (zero) treu el limit.';
$strZip = '"comprimit amb zip"';
-$strAddFields = 'Add %s field(s)'; //to translate
-$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
-$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php
index 179489ad5b..67d389144f 100644
--- a/lang/catalan-utf-8.inc.php
+++ b/lang/catalan-utf-8.inc.php
@@ -29,6 +29,7 @@ $strAddConstraints = 'Afegir restriccions';
$strAddDeleteColumn = 'Afegir/esborrar Camps de Columna';
$strAddDeleteRow = 'Afegir/esborrar fila de criteri';
$strAddDropDatabase = 'Afegir DROP DATABASE';
+$strAddFields = 'Afegir %s camp(s)';
$strAddHeaderComment = 'Afegir comentari personalitzat a la capçalera (\\n divideix linies)';
$strAddIfNotExists = 'Afegir IF NOT EXISTS';
$strAddIntoComments = 'Afegir en comentaris';
@@ -56,6 +57,7 @@ $strAnd = 'I';
$strAny = 'Qualsevol';
$strAnyHost = 'Qualsevol servidor';
$strAnyUser = 'Qualsevol usuari';
+$strApproximateCount = 'Pot ser aproximat. Veure FAQ 3.11';
$strArabic = 'Àrab';
$strArmenian = 'Armeni';
$strAscending = 'Ascendent';
@@ -69,8 +71,15 @@ $strBack = 'Enrere';
$strBaltic = 'Bàltic';
$strBeginCut = 'INICI DEL TALL';
$strBeginRaw = 'INICI DEL VOLCAT';
+$strBinLogEventType = 'Tipus d\'event';
+$strBinLogInfo = 'Informació';
+$strBinLogName = 'Nom del registre';
+$strBinLogOriginalPosition = 'Posició original';
+$strBinLogPosition = 'Posició';
+$strBinLogServerId = 'ID de Servidor';
$strBinary = ' Binari ';
$strBinaryDoNotEdit = ' Binari - no editeu ';
+$strBinaryLog = 'Registre binari';
$strBookmarkAllUsers = 'Deixa accedir a cada usuari a aquesta consulta arxivada';
$strBookmarkDeleted = 'S\'ha esborrat la consulta arxivada.';
$strBookmarkLabel = 'Etiqueta';
@@ -122,6 +131,7 @@ $strColumnPrivileges = 'Permissos específics de columna';
$strCommand = 'Ordre';
$strComments = 'Comentaris';
$strCommentsForTable = 'COMENTARIS PER LA TAULA';
+$strCompatibleHashing = 'Compatible amb MySQL&nbsp;4.0';
$strCompleteInserts = 'Completar insercions';
$strCompression = 'Compressió';
$strConfigFileError = 'phpMyAdmin és incapaç de llegir el fitxer de configuració!<br />Això pot succeir si php troba un error sintàctic en ell o bé php no pot trobar el fitxer.<br />Intenta obrir el fitxer de configuració directament fent servir l\'enllaç següent i comprova el(s) missatge(s) d\'error que reps. En moltes ocasions una coma o punt i coma falta en algun lloc.<br />Si reps una plana en blanc, tot està bé.';
@@ -131,6 +141,7 @@ $strConnections = 'Connexions';
$strConstraintsForDumped = 'Restriccions per taules volcades';
$strConstraintsForTable = 'Restriccions per la taula';
$strCookiesRequired = 'A partir d\'aquest punt és necessari tenir les galetes (cookies) activades.';
+$strCopyDatabaseOK = 'La Base de dades %s s\'ha copiat a %s';
$strCopyTable = 'Copia taula a (base-de-dades<b>.</b>taula):';
$strCopyTableOK = 'La taula %s ha estat copiada a %s.';
$strCopyTableSameNames = 'No es pot copiar la taula sobre ella mateixa';
@@ -150,6 +161,7 @@ $strCzech = 'Txec';
$strCzechSlovak = 'Txec-Eslovac';
$strDBComment = 'Comentaris de la Base de Dades: ';
+$strDBCopy = 'Copiar base de dades a';
$strDBGContext = 'Contexte';
$strDBGContextID = 'ID de contexte';
$strDBGHits = 'Accessos';
@@ -222,6 +234,7 @@ $strEndRaw = 'FI DEL VOLCAT';
$strEnglish = 'Anglès';
$strEnglishPrivileges = ' Nota: Els noms dels privilegis del MySQL són en llengua anglesa ';
$strError = 'Errada';
+$strEscapeWildcards = 'Els comodins _ i % han de marcar-se amb una \ per usar-las literalment';
$strEstonian = 'Estonià ';
$strExcelEdition = 'Edició per Excel';
$strExcelOptions = 'Opcions d\'Excel';
@@ -291,11 +304,16 @@ $strIndex = 'Ãndex';
$strIndexHasBeenDropped = 'S\'ha esborrat l\'índex %s';
$strIndexName = 'Nom d\'índex:';
$strIndexType = 'Tipus d\'índex:';
+$strIndexWarningMultiple = 'Més d\'una clau %s s\'ha creat per a la columna `%s`';
+$strIndexWarningPrimary = 'Les claus PRIMARY i INDEX no es poden establir alhora per a la columna `%s`';
+$strIndexWarningTable = 'Problemes amb els index de la taula `%s`';
+$strIndexWarningUnique = 'Les claus UNIQUE i INDEX no es poden establir alhora per a la columna `%s`';
$strIndexes = 'Indexos';
$strInnodbStat = 'Estat InnoDB';
$strInsecureMySQL = 'El vostre fitxer 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.';
$strInsert = 'Insereix';
$strInsertAsNewRow = 'Inserir com a nova fila';
+$strInsertBookmarkTitle = 'Entra un títol de consulta arxivada';
$strInsertNewRow = 'Inserir nova fila';
$strInsertTextfiles = 'Inserir fitxers de text a la taula';
$strInsertedRowId = 'Id de la fila inserida:';
@@ -377,6 +395,7 @@ $strName = 'Nom';
$strNeedPrimaryKey = 'S\'ha de definir una clau principal per a aquesta taula.';
$strNext = 'Següent';
$strNo = 'No';
+$strNoActivity = 'Sense activitat des de fa %s segons o més, entra de nou';
$strNoDatabases = 'No hi ha Bases de Dades';
$strNoDatabasesSelected = 'No hi han Bases de dades sel.leccionades.';
$strNoDescription = 'Sense Descripció';
@@ -396,6 +415,7 @@ $strNoRights = 'No tens prou permissos per visualitzar aquesta informació!';
$strNoRowsSelected = 'No s\'han seleccionat files';
$strNoSpace = 'No hi ha prou espai per guardar l\'arxiu %s.';
$strNoTablesFound = 'Base de dades sense taules.';
+$strNoThemeSupport = 'No hi ha suport pels temes, si et plau comprova la teva configuració i/o els teus temes al directori %s.';
$strNoUsersFound = 'No s\'han trobat usuaris.';
$strNoValidateSQL = 'Saltar la Validació de l\'SQL';
$strNone = 'Res';
@@ -427,6 +447,7 @@ $strPartialText = 'Textos Parcials';
$strPassword = 'Contrasenya';
$strPasswordChanged = 'La contrasenya per a %s s\'ha canviat correctament.';
$strPasswordEmpty = 'La contrasenya és buida!';
+$strPasswordHashing = 'Contrasenya Hashing';
$strPasswordNotSame = 'Les contrasenyes no coincideixen!';
$strPdfDbSchema = 'Esquema de la base de dades "%s" - Pàgina %s';
$strPdfInvalidTblName = 'La taula "%s" no existeix!';
@@ -563,6 +584,7 @@ $strSearchType = 'Trobat:';
$strSecretRequired = 'El fitxer de configuració necessita ara una frase de pas secreta (blowfish_secret).';
$strSelectADb = 'Selecciona una Base de Dades';
$strSelectAll = 'Selecciona Tot';
+$strSelectBinaryLog = 'Selecciona el registre binari per veure';
$strSelectFields = 'Selecciona els camps (un com a mínim):';
$strSelectNumRows = 'en consulta';
$strSelectTables = 'Selecciona Taules';
@@ -618,6 +640,7 @@ $strSubmit = 'Enviar';
$strSuccess = 'La vostra comanda SQL ha estat executada amb èxit';
$strSum = 'Suma';
$strSwedish = 'Suec';
+$strSwitchToDatabase = 'Canviar a la base de dades copiada';
$strSwitchToTable = 'Canvia a una taula copiada';
$strTable = 'Taula';
@@ -679,6 +702,7 @@ $strUpgrade = 'Es necessari actualitzar a %s %s o posterior.';
$strUsage = 'Ús';
$strUseBackquotes = 'Usa &quot;backquotes&quot; amb taules i noms de camps';
$strUseHostTable = 'Utilitza la Taula de Hosts';
+$strUseTabKey = 'Usa la tecla TAB per moure\'t de valor en valor, o CTRL+fletxes per moure\'t on vulguis';
$strUseTables = 'Usa Taules';
$strUseTextField = 'Usa camp de texte';
$strUseThisValue = 'Fes servir aquest valor';
@@ -717,26 +741,8 @@ $strYes = 'Si';
$strZeroRemovesTheLimit = 'Nota: Establint aquestes opcions a 0 (zero) treu el limit.';
$strZip = '"comprimit amb zip"';
-$strAddFields = 'Add %s field(s)'; //to translate
-$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
-$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/chinese_simplified-gb2312.inc.php b/lang/chinese_simplified-gb2312.inc.php
index 6a50777f70..d86b484047 100644
--- a/lang/chinese_simplified-gb2312.inc.php
+++ b/lang/chinese_simplified-gb2312.inc.php
@@ -744,4 +744,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php
index 40a0d0381b..3678588d61 100644
--- a/lang/chinese_simplified-utf-8.inc.php
+++ b/lang/chinese_simplified-utf-8.inc.php
@@ -745,4 +745,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/chinese_traditional-big5.inc.php b/lang/chinese_traditional-big5.inc.php
index 9500d3fd73..04a9bee487 100644
--- a/lang/chinese_traditional-big5.inc.php
+++ b/lang/chinese_traditional-big5.inc.php
@@ -23,18 +23,18 @@ $datefmt = '%B %d, %Y, %I:%M %p';
$timespanfmt = '%s ¤é, %s ¤p®É, %s ¤ÀÄÁ %s ¬í';
+$strAPrimaryKey = '¥DÁä¤w¸g·s¼W¨ì %s';
$strAbortedClients = '¨ú®ø';
$strAbsolutePathToDocSqlDir = '½Ð¿é¤J docSQL ¥Ø¿ý©óºô­¶¦øªA¾¹ªºµ´¹ï¸ô®|';
-$strAccessDeniedExplanation = 'phpMyAdmin ¹Á¸Õ³s½u¨ì MySQL ¦øªA¾¹, ¦ý¦øªA¾¹©Úµ´¤F³s½u. ±zÀ³©ó config.inc.php ¤ºÀˬd¥D¾÷¦WºÙ, µn¤J¦WºÙ¤Î±K½X¤Î½T«O³o¨Ç¸ê®Æ¬O»P¨t²ÎºÞ²z¤H­û©Ò´£¨Ñªº MySQL ¦øªA¾¹¸ê®Æ¬Û¦P';
$strAccessDenied = '©Úµ´¦s¨ú';
+$strAccessDeniedExplanation = 'phpMyAdmin ¹Á¸Õ³s½u¨ì MySQL ¦øªA¾¹, ¦ý¦øªA¾¹©Úµ´¤F³s½u. ±zÀ³©ó config.inc.php ¤ºÀˬd¥D¾÷¦WºÙ, µn¤J¦WºÙ¤Î±K½X¤Î½T«O³o¨Ç¸ê®Æ¬O»P¨t²ÎºÞ²z¤H­û©Ò´£¨Ñªº MySQL ¦øªA¾¹¸ê®Æ¬Û¦P';
$strAction = '°õ¦æ';
$strAddAutoIncrement = "·s¼W AUTO_INCREMENT ¼Æ­È";
$strAddConstraints = '¥[¤J­­¨î';
$strAddDeleteColumn = '·s¼W/´î¤Ö ¿ï¾ÜÄæ';
$strAddDeleteRow = '·s¼W/´î¤Ö ¿z¿ï¦C';
$strAddDropDatabase = '¥[¤J \'§R°£¸ê®Æªí\' »yªk';
-$strAddedColumnComment = '©ó¥H¤UÄæ¦ì¥[¤Jµù¸Ñ¤å¦r';
-$strAddedColumnRelation = '©ó¥H¤UÄæ¦ì¥[¤JÃöÁp';
+$strAddFields = '·s¼W %s ­ÓÄæ¦ì';
$strAddHeaderComment = '©ó¼ÐÃD¥[¤J­Ó¤Hµù¸Ñ (\\n ¶}·s¦æ)';
$strAddIfNotExists = '¥[¤J IF NOT EXISTS';
$strAddIntoComments = '¥[¤Jµù¸Ñ¤å¦r';
@@ -43,24 +43,26 @@ $strAddPrivilegesOnDb = '©ó¥H¤U¸ê®Æ®w¥[¤JÅv­­';
$strAddPrivilegesOnTbl = '©ó¥H¤U¸ê®Æªí¥[¤JÅv­­';
$strAddSearchConditions = '¼W¥[À˯Á±ø¥ó ("where" ¤l¥yªº¥DÅé)';
$strAddToIndex = '·s¼W &nbsp;%s&nbsp; ²Õ¯Á¤ÞÄæ';
-$strAddUserMessage = '±z¤w·s¼W¤F¤@­Ó·s¨Ï¥ÎªÌ.';
$strAddUser = '·s¼W¨Ï¥ÎªÌ';
+$strAddUserMessage = '±z¤w·s¼W¤F¤@­Ó·s¨Ï¥ÎªÌ.';
+$strAddedColumnComment = '©ó¥H¤UÄæ¦ì¥[¤Jµù¸Ñ¤å¦r';
+$strAddedColumnRelation = '©ó¥H¤UÄæ¦ì¥[¤JÃöÁp';
$strAdministration = '¨t²ÎºÞ²z';
$strAffectedRows = '¼vÅT¦C¼Æ: ';
+$strAfter = '¦b %s ¤§«á';
$strAfterInsertBack = 'ªð¦^';
$strAfterInsertNewInsert = '·s¼W¤@µ§°O¿ý';
$strAfterInsertSame = 'ªð¦^³o­¶';
-$strAfter = '¦b %s ¤§«á';
-$strAllTableSameWidth = '¥H¬Û¦P¼e«×Åã¥Ü©Ò¦³¸ê®Æªí?';
$strAll = '¥þ³¡';
+$strAllTableSameWidth = '¥H¬Û¦P¼e«×Åã¥Ü©Ò¦³¸ê®Æªí?';
$strAlterOrderBy = '®Ú¾ÚÄæ¦ì¤º®e±Æ§Ç°O¿ý';
+$strAnIndex = '¯Á¤Þ¤w¸g·s¼W¨ì %s';
$strAnalyzeTable = '¤ÀªR¸ê®Æªí';
$strAnd = '»P';
-$strAnIndex = '¯Á¤Þ¤w¸g·s¼W¨ì %s';
+$strAny = '¥ô¦ó';
$strAnyHost = '¥ô¦ó¥D¾÷';
$strAnyUser = '¥ô¦ó¨Ï¥ÎªÌ';
-$strAny = '¥ô¦ó';
-$strAPrimaryKey = '¥DÁä¤w¸g·s¼W¨ì %s';
+$strApproximateCount = '¥i¯à±µªñ. ½Ð°Ñ¬Ý FAQ 3.11';
$strArabic = 'ªü©Ô§B»y';
$strArmenian = '¬ü¦¡­^»y';
$strAscending = '»¼¼W';
@@ -74,8 +76,15 @@ $strBack = '¦^¤W¤@­¶';
$strBaltic = 'ªiùªº®ü»y';
$strBeginCut = '¶}©l °Å¨ú';
$strBeginRaw = '¶}©l ­ì©l¸ê®Æ';
-$strBinaryDoNotEdit = '¤G¶i¨î½X - ¤£¯à½s¿è';
+$strBinLogEventType = '¨Æ¥ó¤è¦¡';
+$strBinLogInfo = '¸ê®Æ';
+$strBinLogName = '°O¿ýÀɮ׺Ù';
+$strBinLogOriginalPosition = '­ì¦³¦ì¸m';
+$strBinLogPosition = '¦ì¸m';
+$strBinLogServerId = '¦øªA¾¹ ID';
$strBinary = '¤G¶i¨î½X';
+$strBinaryDoNotEdit = '¤G¶i¨î½X - ¤£¯à½s¿è';
+$strBinaryLog = '¤G¶i¨î°O¿ý';
$strBookmarkAllUsers = '©Ò¦³¥ÎªÌ¥iŪ¨ú¦¹®ÑÅÒ';
$strBookmarkDeleted = '®ÑÅÒ¤w¸g§R°£.';
$strBookmarkLabel = '®ÑÅÒ¦WºÙ';
@@ -83,16 +92,17 @@ $strBookmarkOptions = '®ÑÅҿﶵ';
$strBookmarkQuery = 'SQL »yªk®ÑÅÒ';
$strBookmarkThis = '±N¦¹ SQL »yªk¥[¤J®ÑÅÒ';
$strBookmarkView = '¬d¬Ý';
-$strBrowseForeignValues = 'ÂsÄý¥~¨Ó­È';
$strBrowse = 'ÂsÄý';
+$strBrowseForeignValues = 'ÂsÄý¥~¨Ó­È';
$strBulgarian = '«O¥[§Q¨È»y';
$strBzError = 'phpMyAdmin µLªkÀ£ÁY¦]©ó³o­Ó php ª©¥»ªº Bz2 ¼Ò²Õ¿ù»~. ±j¦C­n¨D©ó phpMyAdmin ³]©wÀɳ]©w <code>$cfg[\'BZipDump\']</code> ¬°<code>FALSE</code>. ¦pªG·Q¨Ï¥Î Bz2 À£ÁY¥\¯à,½Ð§ó·s php ¨ì³Ì·sª©¥». ¸Ô±¡½Ð°Ñ¬Ý php ¿ù»~³ø³ø %s .';
$strBzip = '"bzipped"';
+$strCSVOptions = 'CSV ¿ï¶µ';
$strCalendar = '¤é¾ä';
$strCannotLogin = 'µLªkµn¤J MySQL ¦øªA¾¹';
-$strCantLoadRecodeIconv = '¥¼¯àŪ¨ú iconv ©Î­«·s½s½Xµ{¦¡¨Ó§@¤å¦r½s½XÂà´«, ½Ð³]©w php ¨Ó±Ò°Ê³o¨Ç¼Ò²Õ©Î¨ú®ø phpMyAdmin ¨Ï¥Î¤å¦r½s½XÂà´«¥\¯à.';
$strCantLoad = 'µLªkŪ¨ú %s ¼Ò²Õ,<br />½ÐÀˬd PHP ³]©w';
+$strCantLoadRecodeIconv = '¥¼¯àŪ¨ú iconv ©Î­«·s½s½Xµ{¦¡¨Ó§@¤å¦r½s½XÂà´«, ½Ð³]©w php ¨Ó±Ò°Ê³o¨Ç¼Ò²Õ©Î¨ú®ø phpMyAdmin ¨Ï¥Î¤å¦r½s½XÂà´«¥\¯à.';
$strCantRenameIdxToPrimary = 'µLªk±N¯Á¤Þ§ó¦W¬° PRIMARY!';
$strCantUseRecodeIconv = '·í¤å½s½X¼Ò²ÕŪ¨ú«á,¥¼¯à¨Ï¥Î iconv, libiconv ©Î recode_string ¥\¯à. ½ÐÀˬd±zªº php ³]©w.';
$strCardinality = '²Õ§O';
@@ -100,23 +110,23 @@ $strCarriage = 'Âk¦ì: \\r';
$strCaseInsensitive = '¤j¤p¼g¤£¬Û²Å';
$strCaseSensitive = '¤j¤p¼g¬Û²Å';
$strCentralEuropean = '¤¤¼Ú»y';
+$strChange = '­×§ï';
+$strChangeCopyMode = '«Ø¥ß·s¨Ï¥ÎªÌ¤Î¨Ï¥Î¬Û¦P¤§Åv­­, ¤Î ...';
$strChangeCopyModeCopy = '... «O¯d¨ϥΪÌ.';
$strChangeCopyModeDeleteAndReload = ' ... §R°£Â¨ϥΪ̤έ«·sŪ¨úÅv­­¸ê®Æªí.';
$strChangeCopyModeJustDelete = ' ... §R°£Â¨ϥΪÌ.';
$strChangeCopyModeRevoke = ' ... ¼o°£©Ò¦³Â¨ϥΪ̦³®Ä¤§Åv­­¨Ã§R°£.';
-$strChangeCopyMode = '«Ø¥ß·s¨Ï¥ÎªÌ¤Î¨Ï¥Î¬Û¦P¤§Åv­­, ¤Î ...';
$strChangeCopyUser = '§ó§ïµn¤J¸ê°T / ½Æ»s¨Ï¥ÎªÌ';
$strChangeDisplay = '¿ï¾ÜÅã¥Ü¤§Äæ¦ì';
$strChangePassword = '§ó§ï±K½X';
-$strChange = '­×§ï';
+$strCharset = '¤å¦r®æ¦¡ (Charset)';
$strCharsetOfFile = '¦r¤¸ªíÀÉ®×:';
-$strCharsetsAndCollations = '¦r¤¸¶°¤Î®Õ¹ï';
$strCharsets = '¦r¤¸¶°';
-$strCharset = '¤å¦r®æ¦¡ (Charset)';
+$strCharsetsAndCollations = '¦r¤¸¶°¤Î®Õ¹ï';
$strCheckAll = '¥þ¿ï';
$strCheckOverhead = 'ÀˬdÃB¥~°O¿ý (overheaded)'; // nor sure yet.
-$strCheckPrivsLong = '¬d¸ß¸ê®Æ®w &quot;%s&quot; ¤§Åv­­.';
$strCheckPrivs = '¬d¸ßÅv­­';
+$strCheckPrivsLong = '¬d¸ß¸ê®Æ®w &quot;%s&quot; ¤§Åv­­.';
$strCheckTable = 'Àˬd¸ê®Æªí';
$strChoosePage = '½Ð¿ï¾Ü»Ý­n½s¿èªº­¶½X';
$strColComFeat = 'Åã¥ÜÄæ¦ìµù¸Ñ';
@@ -124,8 +134,9 @@ $strCollation = '®Õ¹ï';
$strColumnNames = 'Äæ¦ì¦WºÙ';
$strColumnPrivileges = '«ü©wÄæ¦ìÅv­­';
$strCommand = '«ü¥O';
-$strCommentsForTable = 'COMMENTS FOR TABLE'; // keep in SQL statement
$strComments = 'µù¸Ñ';
+$strCommentsForTable = 'COMMENTS FOR TABLE'; // keep in SQL statement
+$strCompatibleHashing = 'MySQL&nbsp;4.0 ¬Û®e';
$strCompleteInserts = '¨Ï¥Î§¹¾ã·s¼W«ü¥O';
$strCompression = 'À£ÁY';
$strConfigFileError = 'phpMyAdmin ¥¼¯àŪ¨ú±zªº³]©wÀÉ! ³o¥i¯à¬O¦]¬° php §ä¨ì»yªk¤Wªº¿ù»~©Î php ¥¼¯à§ä¨ìÀɮצӦ¨.<br />½Ð¹Á¸Õª½±µ«ö¤U¤U¤èªº³sµ²¶}±Ò¨Ã¬d¬Ý php ªº¿ù»~«H®§. ³q±`ªº¿ù»~³£¨Ó¦Û¬Y³Bº|¤F¤Þ¸¹©Î¤À§O.<br />¦pªG«ö¤U³sµ²«á¥X²{ªÅ¥Õ­¶, §Y¥Nªí¨S¦³¥ô¦ó°ÝÃD.';
@@ -135,43 +146,29 @@ $strConnections = '³s½u';
$strConstraintsForDumped = '³Æ¥÷¸ê®Æªí­­¨î';
$strConstraintsForTable = '¸ê®Æªí­­¨î';
$strCookiesRequired = 'Cookies ¥²¶·±Ò°Ê¤~¯àµn¤J.';
+$strCopyDatabaseOK = '¸ê®Æ®w %s ¤w½Æ»s¨ì %s';
+$strCopyTable = '½Æ»s¸ê®Æªí¨ì¡G (®æ¦¡¬° ¸ê®Æ®w¦WºÙ<b>.</b>¸ê®Æªí¦WºÙ):';
$strCopyTableOK = '¤w¸g±N¸ê®Æªí %s ½Æ»s¬° %s.';
$strCopyTableSameNames = 'µLªk½Æ»s¨ì¬Û¦P¸ê®Æªí!';
-$strCopyTable = '½Æ»s¸ê®Æªí¨ì¡G (®æ¦¡¬° ¸ê®Æ®w¦WºÙ<b>.</b>¸ê®Æªí¦WºÙ):';
$strCouldNotKill = 'phpMyAdmin µLªk¤¤Â_«ü¥O %s. ¥i¯à³o«ü¥O¤w¸gµ²§ô.';
-$strCreateIndexTopic = '·s¼W¤@²Õ¯Á¤Þ';
+$strCreate = '«Ø¥ß';
$strCreateIndex = '·s¼W &nbsp;%s&nbsp; ²Õ¯Á¤ÞÄæ';
+$strCreateIndexTopic = '·s¼W¤@²Õ¯Á¤Þ';
$strCreateNewDatabase = '«Ø¥ß·s¸ê®Æ®w';
$strCreateNewTable = '«Ø¥ß·s¸ê®Æªí©ó¸ê®Æ®w %s';
$strCreatePage = '«Ø¥ß·s¤@­¶';
$strCreatePdfFeat = '«Ø¥ß PDF';
-$strCreate = '«Ø¥ß';
$strCreationDates = '«Ø¥ß/§ó·s/Àˬd ¤é´Á';
$strCriteria = '¿z¿ï';
$strCroatian = '§Jù¦è¨È»y';
-$strCSVOptions = 'CSV ¿ï¶µ';
$strCyrillic = '¦è¨½º¸»y';
-$strCzechSlovak = '±¶§J»y';
$strCzech = '±¶§J»y';
+$strCzechSlovak = '±¶§J»y';
-$strDanish = '¤¦³Á»y';
-$strDatabaseEmpty = '¸ê®Æ®w¦WºÙ¨Ã¥¼¿é¤J!!';
-$strDatabaseExportOptions = '¸ê®Æ®w¿é¥X¿ï¶µ';
-$strDatabaseHasBeenDropped = '¸ê®Æ®w %s ¤w³Q§R°£';
-$strDatabaseNoTable = '³o¸ê®Æ®w¨S¦³¸ê®Æªí!';
-$strDatabasesDropped = '%s ­Ó¸ê®Æ®w¤w¦¨¥\§R°£.';
-$strDatabasesStatsDisable = '°±¤î²Î­p¼Æ¾Ú';
-$strDatabasesStatsEnable = '±Ò°Ê²Î­p¼Æ¾Ú';
-$strDatabasesStatsHeavyTraffic = 'µù: ±Ò°Ê¸ê®Æ®w²Î­p¼Æ¾Ú¥i¯à·|²£¥Í¤j¶q¥Ñ Web ¦øªA¾¹¤Î MySQL ¤§¶¡ªº¬y¶q.';
-$strDatabasesStats = '¸ê®Æ®w²Î­p';
-$strDatabases = '¸ê®Æ®w';
-$strDatabase = '¸ê®Æ®w';
-$strDataDict = '¼Æ¾Ú¦r¨å';
-$strDataOnly = '¥u¦³¸ê®Æ';
-$strData = '¸ê®Æ';
$strDBComment = '¸ê®Æ®wµù¸Ñ¤å¦r: ';
-$strDBGContextID = '¥»¤å (Context) ID';
+$strDBCopy = '½Æ»s¸ê®Æ®w¨ì';
$strDBGContext = '¥»¤å (Context)';
+$strDBGContextID = '¥»¤å (Context) ID';
$strDBGHits = '¦¸¼Æ';
$strDBGLine = '¦æ';
$strDBGMaxTimeMs = '³Ì¤j®É¶¡, ms';
@@ -179,54 +176,70 @@ $strDBGMinTimeMs = '³Ì¤p®É¶¡, ms';
$strDBGModule = '¼Ò²Õ';
$strDBGTimePerHitMs = '®É¶¡/¦¸, ms';
$strDBGTotalTimeMs = 'Á`®É¶¡, ms';
-$strDbPrivileges = '«ü©w¸ê®Æ®wÅv­­';
$strDBRename = '§ó§ï¸ê®Æ®w¦WºÙ¨ì';
+$strDanish = '¤¦³Á»y';
+$strData = '¸ê®Æ';
+$strDataDict = '¼Æ¾Ú¦r¨å';
+$strDataOnly = '¥u¦³¸ê®Æ';
+$strDatabase = '¸ê®Æ®w';
+$strDatabaseEmpty = '¸ê®Æ®w¦WºÙ¨Ã¥¼¿é¤J!!';
+$strDatabaseExportOptions = '¸ê®Æ®w¿é¥X¿ï¶µ';
+$strDatabaseHasBeenDropped = '¸ê®Æ®w %s ¤w³Q§R°£';
+$strDatabaseNoTable = '³o¸ê®Æ®w¨S¦³¸ê®Æªí!';
+$strDatabases = '¸ê®Æ®w';
+$strDatabasesDropped = '%s ­Ó¸ê®Æ®w¤w¦¨¥\§R°£.';
+$strDatabasesStats = '¸ê®Æ®w²Î­p';
+$strDatabasesStatsDisable = '°±¤î²Î­p¼Æ¾Ú';
+$strDatabasesStatsEnable = '±Ò°Ê²Î­p¼Æ¾Ú';
+$strDatabasesStatsHeavyTraffic = 'µù: ±Ò°Ê¸ê®Æ®w²Î­p¼Æ¾Ú¥i¯à·|²£¥Í¤j¶q¥Ñ Web ¦øªA¾¹¤Î MySQL ¤§¶¡ªº¬y¶q.';
+$strDbPrivileges = '«ü©w¸ê®Æ®wÅv­­';
$strDbSpecific = '«ü©w¸ê®Æ®w';
-$strDefaultValueHelp = '¹w³]­È: ½Ð¥u¿é¤J¸Ó¹w³]­È, µL»Ý¥[¤W¥ô¦ó¤Ï±×½u©Î¤Þ¸¹';
$strDefault = '¹w³]­È';
+$strDefaultValueHelp = '¹w³]­È: ½Ð¥u¿é¤J¸Ó¹w³]­È, µL»Ý¥[¤W¥ô¦ó¤Ï±×½u©Î¤Þ¸¹';
$strDefragment = '¾ã²z¸ê®Æªí';
+$strDelOld = '¥»­¶ªº°Ñ¦Ò¨ì¸ê®Æªí¤w¤£¦s¦b. ±z§Æ±æ§R°£³o¨Ç°Ñ¦Ò¶Ü?';
$strDelayedInserts = '¨Ï¥Î©µ¿ð¦¡·s¼W';
-$strDeleteAndFlushDescr = '³o¬O¤@­Ó³Ì²M¼äªº°µªk,¦ý­«·sŪ¨úÅv­­»Ý¤@¬q®É¶¡.';
+$strDelete = '§R°£';
$strDeleteAndFlush = '§R°£¨Ï¥ÎªÌ¤Î­«·sŪ¨úÅv­­.';
-$strDeletedRows = '¤w§R°£Äæ¼Æ:';
+$strDeleteAndFlushDescr = '³o¬O¤@­Ó³Ì²M¼äªº°µªk,¦ý­«·sŪ¨úÅv­­»Ý¤@¬q®É¶¡.';
$strDeleted = '°O¿ý¤w³Q§R°£';
-$strDelete = '§R°£';
+$strDeletedRows = '¤w§R°£Äæ¼Æ:';
$strDeleting = '§R°£ %s';
-$strDelOld = '¥»­¶ªº°Ñ¦Ò¨ì¸ê®Æªí¤w¤£¦s¦b. ±z§Æ±æ§R°£³o¨Ç°Ñ¦Ò¶Ü?';
$strDescending = '»¼´î';
$strDescription = '»¡©ú';
$strDictionary = '¦r¨å';
-$strDisabled = '¥¼±Ò°Ê';
$strDisableForeignChecks = '¼È©w¥~¨ÓÁä (Foreign Key) Àˬd';
+$strDisabled = '¥¼±Ò°Ê';
$strDisplayFeat = '¥\¯àÅã¥Ü';
$strDisplayOrder = 'Åã¥Ü¦¸§Ç';
$strDisplayPDF = 'Åã¥Ü PDF ·§­n';
$strDoAQuery = '¥H½d¨Ò¬d¸ß (¸U¥Î¦r¤¸ : "%")';
-$strDocu = '»¡©ú¤å¥ó';
$strDoYouReally = '±z½T©w­n ';
+$strDocu = '»¡©ú¤å¥ó';
+$strDrop = '§R°£';
$strDropDatabaseStrongWarning = '±z±N·|§R°£¾ã­Ó¸ê®Æ®w!';
$strDropSelectedDatabases = '§R°£¤w¿ï¾Ü¤§¸ê®Æ®w';
$strDropUsersDb = '§R°£»P¨Ï¥ÎªÌ¬Û¦P¦WºÙ¤§¸ê®Æ®w.';
-$strDrop = '§R°£';
-$strDumpingData = '¦C¥X¥H¤U¸ê®Æ®wªº¼Æ¾Ú¡G';
$strDumpSaved = '³Æ¥÷¤wÀx¨ìÀÉ®× %s.';
$strDumpXRows = '³Æ¥÷ %s ¦æ, ¥Ñ %s ¦æ¶}©l.';
+$strDumpingData = '¦C¥X¥H¤U¸ê®Æ®wªº¼Æ¾Ú¡G';
$strDynamic = '°ÊºA';
+$strEdit = '½s¿è';
$strEditPDFPages = '½s¿è PDF ­¶½X';
$strEditPrivileges = '½s¿èÅv­­';
-$strEdit = '½s¿è';
$strEffective = '¹ê»Ú';
-$strEmptyResultSet = 'MySQL ¶Ç¦^ªº¬d¸ßµ²ªG¬°ªÅ (­ì¦]¥i¯à¬°¡G¨S¦³§ä¨ì²Å¦X±ø¥óªº°O¿ý)';
$strEmpty = '²MªÅ';
+$strEmptyResultSet = 'MySQL ¶Ç¦^ªº¬d¸ßµ²ªG¬°ªÅ (­ì¦]¥i¯à¬°¡G¨S¦³§ä¨ì²Å¦X±ø¥óªº°O¿ý)';
$strEnabled = '±Ò°Ê';
$strEncloseInTransaction = '¨Ï¥Î¨Æ°È¶ô (Transaction) ¤è¦¡';
+$strEnd = '³Ì«á¤@­¶';
$strEndCut = 'µ²§ô °Å¨ú';
$strEndRaw = 'µ²§ô ­ì©l¸ê®Æ';
-$strEnd = '³Ì«á¤@­¶';
-$strEnglishPrivileges = 'ª`·N: MySQL Åv­­¦WºÙ·|¥H­^»yÅã¥Ü';
$strEnglish = '­^»y';
+$strEnglishPrivileges = 'ª`·N: MySQL Åv­­¦WºÙ·|¥H­^»yÅã¥Ü';
$strError = '¿ù»~';
+$strEscapeWildcards = '¸U¥Î²Å¸¹ _ ¤Î % À³¥¿½T¦a¥[¤J \ ';
$strEstonian = '·R¨F¥§¨È»y';
$strExcelEdition = 'Excel ª©¥»';
$strExcelOptions = 'Excel ¿ï¶µ';
@@ -237,34 +250,34 @@ $strExtendedInserts = '¦ù©µ·s¼W¼Ò¦¡';
$strExtra = 'ªþ¥[';
$strFailedAttempts = '¹Á¸Õ¥¢±Ñ';
+$strField = 'Äæ¦ì';
$strFieldHasBeenDropped = '¸ê®Æªí %s ¤w³Q§R°£';
+$strFields = 'Äæ¦ì';
$strFieldsEmpty = ' Äæ¦ìÁ`¼Æ¬OªÅªº! ';
$strFieldsEnclosedBy = '¡uÄæ¦ì¡v¨Ï¥Î¦r¤¸¡G';
$strFieldsEscapedBy = '¡uESCAPE¡v¨Ï¥Î¦r¤¸¡G';
$strFieldsTerminatedBy = '¡uÄæ¦ì¤À¹j¡v¨Ï¥Î¦r¤¸¡G';
-$strFields = 'Äæ¦ì';
-$strField = 'Äæ¦ì';
$strFileAlreadyExists = 'ÀÉ®× %s ¤w¦s¦b,½Ð§ó§ïÀɮצWºÙ©Î¿ï¾Ü¡uÂмg¤v¦s¦bÀɮסv¿ï¶µ.';
$strFileCouldNotBeRead = 'Ū®×µLªkŪ¨ú';
+$strFileNameTemplate = 'ÀɮצWºÙ¼Ë¦¡';
$strFileNameTemplateHelp = '¨Ï¥Î __DB__ §@¬°¸ê®Æ®w¦WºÙ, __TABLE__ ¬°¸ê®Æªí¦WºÙ. %s¥ô¦ó strftime%s ¤ºÃö©ó®É¶¡¤Îªþ¥[¿ï¶µ·|¦Û°Ê¥[¤J. ¨ä¥L¤å¦r±N·|«O¯d.';
$strFileNameTemplateRemember = '«O¯d¼Ë¦¡¦WºÙ';
-$strFileNameTemplate = 'ÀɮצWºÙ¼Ë¦¡';
$strFixed = '©T©w';
$strFlushPrivilegesNote = 'µù: phpMyAdmin ª½±µ¥Ñ MySQL Åv­­¸ê®Æªí¨ú±o¨Ï¥ÎªÌÅv­­. ¦pªG¨Ï¥ÎªÌ¦Û¦æ§ó§ï¸ê®Æªí, ¸ê®Æªí¤º®e±N¥i¯à»P¹ê»Ú¨Ï¥ÎªÌ±¡ªp¦³²§. ¦b³o±¡ªp¤U, ±zÀ³¦bÄ~Äò«e %s­«·s¸ü¤J%s Åv­­¸ê®Æªí.';
$strFlushTable = '±j­¢§ó·s¸ê®Æªí ("FLUSH")';
-$strFormat = '®æ¦¡';
$strFormEmpty = 'ªí®æ¤ºº|¶ñ¤@¨Ç¸ê®Æ!';
+$strFormat = '®æ¦¡';
$strFullText = 'Åã¥Ü§¹¾ã¤å¦r';
$strFunction = '¨ç¼Æ';
$strGenBy = '«Ø¥ß';
-$strGeneralRelationFeat = '¤@¯ëÃöÁp¥\¯à';
$strGenTime = '«Ø¥ß¤é´Á';
+$strGeneralRelationFeat = '¤@¯ëÃöÁp¥\¯à';
$strGeorgian = '®æ¾|¦N¨È»y';
$strGerman = '¼w»y';
+$strGlobal = '¾ãÅé';
$strGlobalPrivileges = '¾ãÅéÅv­­';
$strGlobalValue = '¾ãÅé­È';
-$strGlobal = '¾ãÅé';
$strGo = '°õ¦æ';
$strGrantOption = '±ÂÅv';
$strGreek = '§Æþ»y';
@@ -275,59 +288,64 @@ $strHasBeenCreated = '¤w¸g«Ø¥ß';
$strHaveToShow = '±z»Ý­n¿ï¾Ü³Ì¤ÖÅã¥Ü¤@¦æÄæ¦ì';
$strHebrew = '§Æ§B¨Ó»y';
$strHexForBinary = '¥H¤Q¤»¶i¨î¼Æ­ÈÅã¥Ü¤G¶i¨îÄæ¦ì';
-$strHomepageOfficial = 'phpMyAdmin ©x¤èºô¯¸';
$strHome = '¥D¥Ø¿ý';
-$strHostEmpty = '½Ð¿é¤J¥D¾÷¦WºÙ!';
+$strHomepageOfficial = 'phpMyAdmin ©x¤èºô¯¸';
$strHost = '¥D¾÷';
+$strHostEmpty = '½Ð¿é¤J¥D¾÷¦WºÙ!';
$strHungarian = '¦I¤ú§Q»y';
$strIcelandic = '¦B®q»y';
$strId = 'ID'; // use eng
$strIdxFulltext = '¥þ¤åÀ˯Á';
$strIfYouWish = '¦pªG±z­n«ü©w¸ê®Æ¶×¤JªºÄæ¦ì¡A½Ð¿é¤J¥Î³r¸¹¹j¶}ªºÄæ¦ì¦WºÙ';
-$strIgnoreInserts = '¨Ï¥Î©¿²¤¥[¤J (insert)';
$strIgnore = '©¿²¤';
+$strIgnoreInserts = '¨Ï¥Î©¿²¤¥[¤J (insert)';
$strIgnoringFile = '©¿²¤ÀÉ®× %s';
$strImportDocSQL = 'Ū¨ú docSQL ÀÉ®×';
$strImportFiles = '¿é¤JÀÉ®×';
$strImportFinished = '¿é¤J§¹¦¨';
-$strIndexes = '¯Á¤Þ';
+$strInUse = '¨Ï¥Î¤¤';
+$strIndex = '¯Á¤ÞÁä INDEX';
$strIndexHasBeenDropped = '¯Á¤Þ %s ¤w³Q§R°£';
$strIndexName = '¯Á¤Þ¦WºÙ&nbsp;:';
$strIndexType = '¯Á¤ÞÃþ«¬&nbsp;:';
-$strIndex = '¯Á¤Þ';
+$strIndexWarningMultiple = '¦h¹L¤@­Ó %s Áä¤w«Ø¥ß¨ìÄæ¦ì `%s` ¤¤';
+$strIndexWarningPrimary = '¥DÁä PRIMARY ¤Î ¯Á¤ÞÁä INDEX ¤£À³¦P®É¶¡³]©wÄæ¦ì `%s` ¤¤';
+$strIndexWarningTable = '©ó¸ê®Æªí `%s` ¤¤¦³¯Á¤Þ°ÝÃD';
+$strIndexWarningUnique = '°ß¤@Áä UNIQUE ¤Î ¯Á¤ÞÁä INDEX ¤£À³¦P®É¶¡³]©wÄæ¦ì `%s` ¤¤';
+$strIndexes = '¯Á¤Þ';
$strInnodbStat = 'InnoDB ª¬ºA';
$strInsecureMySQL = '³]©wÀɤº¦³Ãö³]©w (rootµn¤J¤Î¨S¦³±K½X) »P¹w³]ªº MySQL Åv­­¤á¤f¬Û¦P¡C MySQL ¦øªA¾¹¦b³o¹w³]ªº³]©w¹B¦æªº¸Ü·|«Ü®e©ö³Q¤J«I¡A±zÀ³§ó§ï¦³Ãö³]©w¥h¨¾¤î¦w¥þº|¬}¡C';
+$strInsert = '·s¼W';
$strInsertAsNewRow = 'Àx¦s¬°·s°O¿ý';
-$strInsertedRowId = '·s¼W¸ê®Æ¦C id:';
-$strInsertedRows = '·s¼W¦C¼Æ:';
+$strInsertBookmarkTitle = '½Ð¿é¤J®ÑÅÒ¼ÐÃD';
$strInsertNewRow = '·s¼W¤@µ§°O¿ý';
$strInsertTextfiles = '±N¤å¦rÀɸê®Æ¶×¤J¸ê®Æªí';
-$strInsert = '·s¼W';
+$strInsertedRowId = '·s¼W¸ê®Æ¦C id:';
+$strInsertedRows = '·s¼W¦C¼Æ:';
$strInstructions = '«ü¥O';
$strInternalNotNecessary = '* ·í¤º³¡ÃöÁp¦b InnoDB ¤w¦s¦b®É¬OµL»Ý­nªº.';
$strInternalRelations = '¤º³¡ÃöÁp';
-$strInUse = '¨Ï¥Î¤¤';
$strJapanese = '¤é»y';
$strJumpToDB = '¸õ¨ì¸ê®Æ®w &quot;%s&quot;.';
-$strJustDeleteDescr = ' &quot;§R°£&quot; ªº¨Ï¥ÎªÌ¤´µM¯à°÷µn¤J¸ê®Æ®wª½¦Ü­«·s¸ü¤J¸ê®Æ®w¬°¤î.';
$strJustDelete = '¥u±qÅv­­¸ê®Æ®w§R°£¨Ï¥ÎªÌ.';
+$strJustDeleteDescr = ' &quot;§R°£&quot; ªº¨Ï¥ÎªÌ¤´µM¯à°÷µn¤J¸ê®Æ®wª½¦Ü­«·s¸ü¤J¸ê®Æ®w¬°¤î.';
$strKeepPass = '½Ð¤£­n§ó§ï±K½X';
$strKeyname = 'Áä¦W';
$strKill = 'Kill'; //should expressed in English
$strKorean = 'Áú»y';
+$strLaTeX = 'LaTeX'; // use eng
+$strLaTeXOptions = 'LaTeX ¿ï¶µ';
$strLandscape = '¾î¦V';
$strLatexCaption = '¸ê®Æªí¼ÐÃD';
$strLatexContent = '¸ê®Æªí __TABLE__ ¤º®e';
-$strLatexContinuedCaption = '³sÄò¸ê®Æªí¼ÐÃD';
$strLatexContinued = '(³sÄò)';
+$strLatexContinuedCaption = '³sÄò¸ê®Æªí¼ÐÃD';
$strLatexIncludeCaption = '¥]¬A¸ê®Æªí¼ÐÃD';
$strLatexLabel = '¼Ð°OÁä¦W';
-$strLaTeX = 'LaTeX'; // use eng
-$strLaTeXOptions = 'LaTeX ¿ï¶µ';
$strLatexStructure = '¸ê®Æªí __TABLE__ µ²ºc';
$strLatvian = '©Ô²æºû¨È»y';
$strLengthSet = 'ªø«×/¶°¦X*';
@@ -341,32 +359,32 @@ $strLoadExplanation = '³Ì¨Î¼Ò¦¡¬O¥Ñ¨t²Î¦Û°ÊÀˬd, ¦pªG¿ù»~, ±z¥i¦Û¥Ñ§ó§ï.';
$strLoadMethod = 'LOAD ¼Ò¦¡';
$strLocalhost = '¥»¦a';
$strLocationTextfile = '¤å¦rÀɮתº¦ì¸m';
-$strLoginInformation = 'µn¤J¸ê°T';
-$strLogin = 'µn¤J';
-$strLogout = 'µn¥X¨t²Î';
$strLogPassword = '±K½X:';
$strLogServer = '¦øªA¾¹';
$strLogUsername = 'µn¤J¦WºÙ:';
+$strLogin = 'µn¤J';
+$strLoginInformation = 'µn¤J¸ê°T';
+$strLogout = 'µn¥X¨t²Î';
-$strMaximumSize = '³Ì¤j®e¶q: %s%s';
+$strMIMETypesForTable = 'MIME TYPES FOR TABLE'; // keep in SQL statement
+$strMIME_MIMEtype = 'MIME Ãþ«¬';
$strMIME_available_mime = '¥i¨Ï¥Î MIME Ãþ«¬';
$strMIME_available_transform = '¥i¨Ï¥ÎÂà´«¤è¦¡';
$strMIME_description = '»¡©ú';
-$strMIME_MIMEtype = 'MIME Ãþ«¬';
$strMIME_nodescription = '³o­ÓÂà´«¤è¦¡¨S¦³»¡©ú.<br />½Ð¦V§@ªÌ¬d¸ß %s ¬O¬Æ»ò¥Î³~.';
+$strMIME_transformation = 'ÂsÄý¾¹Âà´«¤è¦¡';
$strMIME_transformation_note = '¦³Ãö¥i¨Ï¥Î¤§Âà´«¤è¦¡¿ï¶µ¤Î MINE Ãþ«¬Âà´«¿ï¶µ, ½Ð¬d¬Ý %sÂà´«¤è¦¡»¡©ú%s';
-$strMIME_transformation_options_note = '½Ð¥Î¥H¤Uªº®æ¦¡¿é¤JÂà´«¿ï¶µ­È: \'a\',\'b\',\'c\'...<br />¦p±z»Ý­n¿é¤J¤Ï±×½u ("\") ©Î³æ¤Þ¸¹ ("\'") ½Ð¦A¥[¤W¤Ï±×½u (¨Ò¦p \'\\\\xyz\' or \'a\\\'b\').';
$strMIME_transformation_options = 'Âà´«¤è¦¡¿ï¶µ';
-$strMIME_transformation = 'ÂsÄý¾¹Âà´«¤è¦¡';
-$strMIMETypesForTable = 'MIME TYPES FOR TABLE'; // keep in SQL statement
+$strMIME_transformation_options_note = '½Ð¥Î¥H¤Uªº®æ¦¡¿é¤JÂà´«¿ï¶µ­È: \'a\',\'b\',\'c\'...<br />¦p±z»Ý­n¿é¤J¤Ï±×½u ("\") ©Î³æ¤Þ¸¹ ("\'") ½Ð¦A¥[¤W¤Ï±×½u (¨Ò¦p \'\\\\xyz\' or \'a\\\'b\').';
$strMIME_without = 'MIME Ãþ«¬¥H±×ÅéÅã¥Ü¬O¨S¦³¤À¹jÂà´«¥\¯à';
+$strMaximumSize = '³Ì¤j®e¶q: %s%s';
$strModifications = '­×§ï¤wÀx¦s';
-$strModifyIndexTopic = '­×§ï¯Á¤Þ';
$strModify = '­×§ï';
+$strModifyIndexTopic = '­×§ï¯Á¤Þ';
$strMoreStatusVars = '§ó¦hª¬ªp¸ê°T';
+$strMoveTable = '²¾°Ê¸ê®Æªí¨ì¡G(®æ¦¡¬° ¸ê®Æ®w¦WºÙ<b>.</b>¸ê®Æªí¦WºÙ)';
$strMoveTableOK = '¸ê®Æªí %s ¤w¸g²¾°Ê¨ì %s.';
$strMoveTableSameNames = 'µLªk²¾°Ê¨ì¬Û¦P¸ê®Æªí!';
-$strMoveTable = '²¾°Ê¸ê®Æªí¨ì¡G(®æ¦¡¬° ¸ê®Æ®w¦WºÙ<b>.</b>¸ê®Æªí¦WºÙ)';
$strMultilingual = '¦h»y¨¥';
$strMustSelectFile = '±zÀ³¿ï¾Ü»Ý­n·s¼WªºÀÉ®×.';
$strMySQLCharset = 'MySQL ¤å¦r½s½X';
@@ -381,16 +399,17 @@ $strMySQLShowVars = 'Åã¥Ü MySQL ¨t²ÎÅܼÆ';
$strName = '¦WºÙ';
$strNeedPrimaryKey = '±z»Ý­n¦b¦¹¸ê®Æªí³]©w¥DÁä (Primary Key)';
$strNext = '¤U¤@­Ó';
-$strNoDatabasesSelected = '¨S¦³¸ê®Æ®w¿ï¾Ü.';
+$strNo = ' §_ ';
+$strNoActivity = '¥Ñ©ó¤w¶¢¸m¤F¹F %s ¬í, ½Ð­«·sµn¤J';
$strNoDatabases = '¨S¦³¸ê®Æ®w';
+$strNoDatabasesSelected = '¨S¦³¸ê®Æ®w¿ï¾Ü.';
$strNoDescription = '¨S¦³»¡©ú';
$strNoDropDatabases = '"DROP DATABASE" «ü¥O¤w¸g°±¥Î.';
$strNoExplain = '²¤¹L»¡©ú SQL';
$strNoFrames = 'phpMyAdmin ¸û¬°¾A¦X¨Ï¥Î¦b¤ä´©<b>­¶®Ø</b>ªºÂsÄý¾¹.';
-$strNoIndexPartsDefined = '³¡¥÷¯Á¤Þ¸ê®ÆÁÙ¥¼©w¸q!';
$strNoIndex = '¨S¦³¤w©w¸qªº¯Á¤Þ!';
+$strNoIndexPartsDefined = '³¡¥÷¯Á¤Þ¸ê®ÆÁÙ¥¼©w¸q!';
$strNoModification = '¨S¦³Åܧó';
-$strNone = '¤£¾A¥Î';
$strNoOptions = '³oºØ®æ¦¡¨ÃµL¿ï¶µ';
$strNoPassword = '¤£¥Î±K½X';
$strNoPermission = 'Web ¦øªA¾¹¨S¦³Åv­­Àx¦sÀÉ®× %s.';
@@ -401,20 +420,21 @@ $strNoRights = '±z²{¦b¨S¦³¨¬°÷ªºÅv­­!';
$strNoRowsSelected = '¨ÃµL¸ê®Æ¦C¤w¿ï¾Ü';
$strNoSpace = 'ªÅ¶¡¤£¨¬Àx¦sÀÉ®× %s.';
$strNoTablesFound = '¸ê®Æ®w¤¤¨S¦³¸ê®Æªí';
+$strNoThemeSupport = '¤£¤ä´©´Ú¦¡¥\¯à, ½Ð¬d¬Ý³]©w®×¤ÎÀx¦s´Ú¦¡Àɮתº¸ê®Æ§¨ %s.';
+$strNoUsersFound = '§ä¤£¨ì¨Ï¥ÎªÌ';
+$strNoValidateSQL = '²¤¹LÀˬd SQL';
+$strNone = '¤£¾A¥Î';
$strNotNumber = '³o¤£¬O¤@­Ó¼Æ¦r!';
$strNotOK = '¥¼¯à½T©w';
$strNotSet = '<b>%s</b> ¸ê®Æªí§ä¤£¨ì©ÎÁÙ¥¼¦b %s ³]©w';
$strNotValidNumber = '¤£¬O¦³®Äªº¦C¼Æ!';
-$strNoUsersFound = '§ä¤£¨ì¨Ï¥ÎªÌ';
-$strNoValidateSQL = '²¤¹LÀˬd SQL';
-$strNo = ' §_ ';
$strNull = 'Null'; //should expressed in English
$strNumSearchResultsInTable = '%s ¶µ¸ê®Æ²Å¦X - ©ó¸ê®Æªí <i>%s</i>';
$strNumSearchResultsTotal = '<b>Á`­p:</b> <i>%s</i> ¶µ¸ê®Æ²Å¦X';
$strNumTables = '­Ó¸ê®Æªí';
-$strOftenQuotation = '³Ì±`¥Îªº¬O¤Þ¸¹¡A¡u«D¥²¶·¡vªí¥Ü¥u¦³ char ©M varchar Äæ¦ì·|³Q¥]¬A°_¨Ó';
$strOK = '½T©w';
+$strOftenQuotation = '³Ì±`¥Îªº¬O¤Þ¸¹¡A¡u«D¥²¶·¡vªí¥Ü¥u¦³ char ©M varchar Äæ¦ì·|³Q¥]¬A°_¨Ó';
$strOperations = 'ºÞ²z';
$strOperator = '¾Þ§@­û';
$strOptimizeTable = '³Ì¨Î¤Æ¸ê®Æªí';
@@ -424,13 +444,16 @@ $strOr = '©Î';
$strOverhead = '¦h¾l';
$strOverwriteExisting = 'Âмg¤w¦s¦bÀÉ®×';
+$strPHP40203 = '±z¥¿¨Ï¥Î PHP ª©¥» 4.2.3, ³oª©¥»¦³¤@­ÓÂù¦r¸`¦r¤¸ªºÄY­«¿ù»~(mbstring). ½Ð°Ñ¾\ PHP ¯äÂγø§i½s¸¹ 19404. phpMyAdmin ¨Ã¤£«Øij¨Ï¥Î³o­Óª©¥»ªº PHP .';
+$strPHPVersion = 'PHP ª©¥»';
$strPageNumber = '­¶½X:';
$strPaperSize = '¯È±i¤j¤p';
$strPartialText = 'Åã¥Ü³¡¥÷¤å¦r';
+$strPassword = '±K½X';
$strPasswordChanged = '%s ªº±K½X¤w¦¨¥\§ó§ï.';
$strPasswordEmpty = '½Ð¿é¤J±K½X!';
+$strPasswordHashing = '±K½XÂø´ê';
$strPasswordNotSame = '²Ä¤G¦¸¿é¤Jªº±K½X¤£¦P!';
-$strPassword = '±K½X';
$strPdfDbSchema = '"%s" ¸ê®Æ®w·§­n - ²Ä %s ­¶';
$strPdfInvalidTblName = '¸ê®Æªí "%s" ¤£¦s¦b!';
$strPdfNoTables = '¨S¦³¸ê®Æªí';
@@ -439,22 +462,20 @@ $strPerMinute = '¨C¤ÀÄÁ';
$strPerSecond = '¨C¬í';
$strPersian = 'ªi´µ»y';
$strPhoneBook = '¹q¸Üï';
-$strPHP40203 = '±z¥¿¨Ï¥Î PHP ª©¥» 4.2.3, ³oª©¥»¦³¤@­ÓÂù¦r¸`¦r¤¸ªºÄY­«¿ù»~(mbstring). ½Ð°Ñ¾\ PHP ¯äÂγø§i½s¸¹ 19404. phpMyAdmin ¨Ã¤£«Øij¨Ï¥Î³o­Óª©¥»ªº PHP .';
-$strPHPVersion = 'PHP ª©¥»';
$strPhp = '«Ø¥ß PHP µ{¦¡½X';
$strPmaDocumentation = 'phpMyAdmin »¡©ú¤å¥ó';
-$strPmaUriError = ' ¥²¶·³]©w <tt>$cfg[\'PmaAbsoluteUri\']</tt> ¦b³]©wÀɤº!';
+$strPmaUriError = ' ¥²¶·¦b³]©wÀɤº³]©w <tt>$cfg[\'PmaAbsoluteUri\']</tt> !';
$strPolish = 'ªiÄõ»y';
$strPortrait = 'ª½¦V';
$strPos1 = '²Ä¤@­¶';
$strPrevious = '«e¤@­¶';
+$strPrimary = '¥DÁä PRIMARY';
$strPrimaryKeyHasBeenDropped = '¥DÁä¤w³Q§R°£';
$strPrimaryKeyName = '¥DÁ䪺¦WºÙ¥²¶·ºÙ¬° PRIMARY!';
$strPrimaryKeyWarning = '("PRIMARY" <b>¥²¶·</b>¬O¥DÁ䪺¦WºÙ¥H¤Î¬O<b>°ß¤@</b>¤@²Õ¥DÁä!)';
-$strPrimary = '¥DÁä';
-$strPrintViewFull = '¦C¦LÀ˵ø (Åã¥Ü§¹¾ã¤å¦r)';
-$strPrintView = '¦C¦LÀ˵ø';
$strPrint = '¦C¦L';
+$strPrintView = '¦C¦LÀ˵ø';
+$strPrintViewFull = '¦C¦LÀ˵ø (Åã¥Ü§¹¾ã¤å¦r)';
$strPrivDescAllPrivileges = '¥]¬A©Ò¦³Åv­­°£¤F±ÂÅv (GRNANT).';
$strPrivDescAlter = '®e³\­×§ï²{¦³¸ê®Æªíªºµ²ºc.';
$strPrivDescCreateDb = '®e³\«Ø¥ß·s¸ê®Æ®w¤Î¸ê®Æªí.';
@@ -484,14 +505,14 @@ $strPrivDescShutdown = '®e³\°±¤î¦øªA¾¹.';
$strPrivDescSuper = '®e³\³s½u, ´Nºâ¶W¹L¤F³Ì¤j³s½u­­¨î; ¥Î©ó³Ì°ª¨t²ÎºÞ²z¦p³]©w¾ãÅéÅv­­©Î¤¤¤î¨ä¥L¨Ï¥ÎªÌ«ü¥O.';
$strPrivDescUpdate = '®e³\§ó·s¼Æ¾Ú.';
$strPrivDescUsage = '¨S¦³Åv­­.';
-$strPrivilegesReloaded = 'Åv­­¤w¦¨¥\­«·sŪ¨ú.';
$strPrivileges = 'Åv­­';
+$strPrivilegesReloaded = 'Åv­­¤w¦¨¥\­«·sŪ¨ú.';
$strProcesslist = '¨t²Î°õ¦æ²M³æ';
$strPutColNames = '±NÄæ¦ì¦WºÙ©ñ¦b­º¦æ';
+$strQBE = '¨Ì½d¨Ò¬d¸ß (QBE)';
$strQBEDel = '²¾°£';
$strQBEIns = '·s¼W';
-$strQBE = '¨Ì½d¨Ò¬d¸ß (QBE)';
$strQueryFrame = '¬d¸ßµøµ¡';
$strQueryOnDb = '¦b¸ê®Æ®w <b>%s</b> °õ¦æ SQL »yªk:';
$strQuerySQLHistory = 'SQL ¾úµ{';
@@ -500,51 +521,62 @@ $strQueryTime = '¬d¸ß»Ý®É %01.4f ¬í';
$strQueryType = '¬d¸ß¤è¦¡';
$strQueryWindowLock = '¤£­n±N³o»yªkÂл\¨ì¥»µøµ¡¥~ªºSQL»yªk';
+$strReType = '½T»{±K½X';
$strReceived = '±µ¦¬';
$strRecords = '°O¿ý';
$strReferentialIntegrity = 'Àˬd«ü¥Ü§¹¾ã©Ê:';
$strRefresh = '§ó·s';
-$strRelationalSchema = 'ÃöÁp·§­n';
$strRelationNotWorking = 'ÃöÁp¸ê®Æªíªºªþ¥[¥\¯à¥¼¯à±Ò°Ê, %s½Ð«ö¦¹%s ¬d¥X°ÝÃD­ì¦].';
-$strRelationsForTable = 'RELATIONS FOR TABLE'; // keep in SQL statement
-$strRelations = 'ÃöÁp';
$strRelationView = 'ÃöÁpÀ˵ø';
+$strRelationalSchema = 'ÃöÁp·§­n';
+$strRelations = 'ÃöÁp';
+$strRelationsForTable = 'RELATIONS FOR TABLE'; // keep in SQL statement
$strReloadFailed = '­«·s¸ü¤JMySQL¥¢±Ñ';
-$strReloadingThePrivileges = '­«·sŪ¨úÅv­­';
$strReloadMySQL = '­«·s¸ü¤J MySQL';
+$strReloadingThePrivileges = '­«·sŪ¨úÅv­­';
$strRemoveSelectedUsers = '²¾°£¤w¿ï¾Ü¨Ï¥ÎªÌ';
$strRenameDatabaseOK = '¸ê®Æ®w %s ¤w§ó§ï¦WºÙ¬° %s';
-$strRenameTableOK = '¤w¸g±N¸ê®Æªí %s §ï¦W¦¨ %s';
$strRenameTable = '±N¸ê®Æªí§ï¦W¬°';
+$strRenameTableOK = '¤w¸g±N¸ê®Æªí %s §ï¦W¦¨ %s';
$strRepairTable = '­×´_¸ê®Æªí';
+$strReplace = '¨ú¥N';
$strReplaceNULLBy = '±N NULL ¨ú¥N¬°';
$strReplaceTable = '¥HÀɮרú¥N¸ê®Æªí¸ê®Æ';
-$strReplace = '¨ú¥N';
$strReset = '­«¸m';
$strResourceLimits = '¸ê·½­­¨î';
-$strReType = '½T»{±K½X';
-$strRevokeAndDeleteDescr = '¨Ï¥ÎªÌ¤´µM¦³ USAGE Åv­­ª½¦ÜÅv­­¸ê®Æªí§ó·sŪ¨ú.';
+$strRevoke = '²¾°£';
$strRevokeAndDelete = '¼o°£¨Ï¥ÎªÌ©Ò¦³¦³®Ä¤§Åv­­¨Ã§R°£.';
+$strRevokeAndDeleteDescr = '¨Ï¥ÎªÌ¤´µM¦³ USAGE Åv­­ª½¦ÜÅv­­¸ê®Æªí§ó·sŪ¨ú.';
$strRevokeMessage = '±z¤w²¾°£³o¦ì¨Ï¥ÎªÌªºÅv­­: %s';
-$strRevoke = '²¾°£';
$strRomanian = 'ù°¨¥§¨È»y';
$strRowLength = '¸ê®Æ¦Cªø«×';
-$strRowsFrom = 'µ§°O¿ý¡A¶}©l¦C¼Æ:';
$strRowSize = '¸ê®Æ¦C¤j¤p';
+$strRows = '¸ê®Æ¦C¦C¼Æ';
+$strRowsFrom = 'µ§°O¿ý¡A¶}©l¦C¼Æ:';
$strRowsModeFlippedHorizontal = '««ª½ (±ÛÂà¼ÐÃD)';
$strRowsModeHorizontal = '¤ô¥­';
$strRowsModeOptions = 'Åã¥Ü¬° %s ¤è¦¡ ¤Î ¨C¹j %s ¦æÅã¥ÜÄæ¦W';
$strRowsModeVertical = '««ª½';
$strRowsStatistic = '¸ê®Æ¦C²Î­p¼Æ­È';
-$strRows = '¸ê®Æ¦C¦C¼Æ';
-$strRunning = '¦b %s °õ¦æ';
$strRunQuery = '°õ¦æ»yªk';
$strRunSQLQuery = '¦b¸ê®Æ®w %s °õ¦æ¥H¤U«ü¥O';
+$strRunning = '¦b %s °õ¦æ';
$strRussian = '«X»y';
-$strSaveOnServer = 'Àx¦s¨ì¦øªA¾¹©ó %s ¥Ø¿ý';
+$strSQL = 'SQL'; // should express in english
+$strSQLExportType = '¿é¥X¤è¦¡';
+$strSQLOptions = 'SQL ¿ï¶µ';
+$strSQLParserBugMessage = '³o¥i¯à¬O±z§ä¨ì¤F SQL ¤ÀªRµ{¦¡ªº¤@¨Çµ{¦¡¿ù»~¡A½Ð²Ó¤ß¬d¬Ý±zªº»yªk¡AÀˬd¤@¤U¤Þ¸¹¬O¥¿½T¤Î¨S¦³¿òº|¡A¨ä¥L¥i¯à¥X¿ùªº­ì¦]¥i¯à¨Ó¦Û±z¤W¸üÀɮ׮ɦb¤Þ¸¹¥~ªº¦a¤è¨Ï¥Î¤F¤G¶i¨î½X¡C±z¥i¥H¹Á¸Õ¦b MySQL ©R¥O¦C¤¶­±°õ¦æ¸Ó»yªk¡C¦p MySQL ¦øªA¾¹µo¥X¿ù»~«H®§¡A³o¥i¯àÀ°§U±z¥h§ä¥X°ÝÃD©Ò¦b¡C¦p±z¤´µM¥¼¯à¸Ñ¨M°ÝÃD¡A©Î¦b¤ÀªRµ{¦¡¥X²{¿ù»~¡A¦ý¦b©R¥O¦C¼Ò¦¡¯à¥¿±`°õ¦æ¡A½Ð±N¸Ó¥y¥X²{¿ù»~ªº SQL »yªk©â¥X¡A¨Ã±N¥H¤Uªº"°Å¨ú"³¡¥÷¤@¦P´£¥æ¨ì¯ä¦ä°Ï:';
+$strSQLParserUserError = '¥i¯à¬O±zªº SQL »yªk¥X²{¿ù»~¡A¦p MySQL ¦øªA¾¹µo¥X¿ù»~«H®§¡A³o¥i¯àÀ°§U±z¥h§ä¥X°ÝÃD©Ò¦b¡C';
+$strSQLQuery = 'SQL »yªk';
+$strSQLResult = 'SQL ¬d¸ßµ²ªG';
+$strSQPBugInvalidIdentifer = 'µL®ÄªºÃѧO½X (Invalid Identifer)';
+$strSQPBugUnclosedQuote = '¥¼§¹µ²ªº¤Þ¸¹ (Unclosed quote)';
+$strSQPBugUnknownPunctuation = '¤£ª¾©úªº¼ÐÂI²Å¸¹ (Unknown Punctuation String)';
$strSave = 'Àx¦s';
+$strSaveOnServer = 'Àx¦s¨ì¦øªA¾¹©ó %s ¥Ø¿ý';
$strScaleFactorSmall = '¤ñ¨Ò­¿¼Æ¤Ó²Ó, µLªk±N¹Ïªí©ñ¦b¤@­¶¤º';
+$strSearch = '·j¯Á';
$strSearchFormTitle = '·j¯Á¸ê®Æ®w';
$strSearchInTables = '©ó¥H¤U¸ê®Æªí:';
$strSearchNeedle = '´M§ä¤§¤å¦r©Î¼Æ­È (¸U¥Î¦r¤¸: "%"):';
@@ -554,62 +586,52 @@ $strSearchOption3 = '§¹¾ãµü»y';
$strSearchOption4 = '¥H³W«hªí¥Üªk (regular expression) ·j¯Á';
$strSearchResultsFor = '·j¯Á "<i>%s</i>" ªºµ²ªG %s:';
$strSearchType = '´M§ä:';
-$strSearch = '·j¯Á';
$strSecretRequired = '³]©wÀɮײ{¦b»Ý­n±K½X (passphrase) (blowfish_secret).';
$strSelectADb = '½Ð¿ï¾Ü¸ê®Æ®w';
$strSelectAll = '¥þ¿ï';
+$strSelectBinaryLog = '¿ï¾ÜÀ˵ø¤G¶i¨î°O¿ý';
$strSelectFields = '¿ï¾ÜÄæ¦ì (¦Ü¤Ö¤@­Ó)';
$strSelectNumRows = '¬d¸ß¤¤';
$strSelectTables = '¿ï¾Ü¸ê®Æªí';
$strSend = '¤U¸üÀx¦s';
$strSent = '°e¥X';
+$strServer = '¦øªA¾¹';
$strServerChoice = '¿ï¾Ü¦øªA¾¹';
$strServerNotResponding = '¦øªA¾¹¨ÃµL¦^À³';
-$strServerStatusUptime = '³o MySQL ¦øªA¾¹¤w±Ò°Ê¤F %s. ¦øªA¾¹©ó %s ±Ò°Ê.';
$strServerStatus = '¹B¦æ¸ê°T';
+$strServerStatusUptime = '³o MySQL ¦øªA¾¹¤w±Ò°Ê¤F %s. ¦øªA¾¹©ó %s ±Ò°Ê.';
$strServerTabProcesslist = '³B²z';
$strServerTabVariables = '¸ê°T';
$strServerTrafficNotes = '<b>¦øªA¾¹¬y¶q</b>: ³o¨ÇªíÅã¥Ü¤F¦¹ MySQL ¦øªA¾¹¦Û±Ò°Ê¥H¨Óªººôµ¸¬y¶q²Î­p¡C';
$strServerVars = '¦øªA¾¹¸ê°T¤Î³]©w';
$strServerVersion = '¦øªA¾¹ª©¥»';
-$strServer = '¦øªA¾¹';
$strSessionValue = 'µ{§Ç¼Æ­È';
$strSetEnumVal = '¦pÄæ¦ì®æ¦¡¬O "enum" ©Î "set", ½Ð¨Ï¥Î¥H¤Uªº®æ¦¡¿é¤J: \'a\',\'b\',\'c\'...<br />¦p¦b¼Æ­È¤W»Ý­n¿é¤J¤Ï±×½u (\) ©Î³æ¤Þ¸¹ (\') , ½Ð¦A¥[¤W¤Ï±×½u (¨Ò¦p \'\\\\xyz\' or \'a\\\'b\').';
+$strShow = 'Åã¥Ü';
$strShowAll = 'Åã¥Ü¥þ³¡';
$strShowColor = 'Åã¥ÜÃC¦â';
$strShowDatadictAs = '¼Æ¾Ú¦r¨å®æ¦¡';
$strShowFullQueries = 'Åã¥Ü§¹¾ã¬d¸ß';
$strShowGrid = 'Åã¥Ü®Ø®æ';
-$strShowingRecords = 'Åã¥Ü°O¿ý';
$strShowPHPInfo = 'Åã¥Ü PHP ¸ê°T';
$strShowTableDimension = 'Åã¥Üªí®æ¤j¤p';
$strShowTables = 'Åã¥Ü¸ê®Æªí';
$strShowThisQuery = '­«·sÅã¥Ü SQL »yªk ';
-$strShow = 'Åã¥Ü';
+$strShowingRecords = 'Åã¥Ü°O¿ý';
$strSimplifiedChinese = '²Å餤¤å';
$strSingly = '(¥u·|±Æ§Ç²{®Éªº°O¿ý)';
$strSize = '¤j¤p';
$strSlovak = '´µ¬¥¥ï§J»y';
$strSlovenian = '´µ¬¥¤å¥§¨È»y';
-$strSortByKey = '¨ÌÁä¦W±Æ§Ç';
$strSort = '±Æ§Ç';
+$strSortByKey = '¨ÌÁä¦W±Æ§Ç';
$strSpaceUsage = '¤w¨Ï¥ÎªÅ¶¡';
$strSpanish = '¦è¯Z¤ú»y';
$strSplitWordsWithSpace = '¨C²Õ¤å¦r¥HªÅ®æ (" ") ¤À¹j.';
-$strSQLExportType = '¿é¥X¤è¦¡';
-$strSQLOptions = 'SQL ¿ï¶µ';
-$strSQLParserBugMessage = '³o¥i¯à¬O±z§ä¨ì¤F SQL ¤ÀªRµ{¦¡ªº¤@¨Çµ{¦¡¿ù»~¡A½Ð²Ó¤ß¬d¬Ý±zªº»yªk¡AÀˬd¤@¤U¤Þ¸¹¬O¥¿½T¤Î¨S¦³¿òº|¡A¨ä¥L¥i¯à¥X¿ùªº­ì¦]¥i¯à¨Ó¦Û±z¤W¸üÀɮ׮ɦb¤Þ¸¹¥~ªº¦a¤è¨Ï¥Î¤F¤G¶i¨î½X¡C±z¥i¥H¹Á¸Õ¦b MySQL ©R¥O¦C¤¶­±°õ¦æ¸Ó»yªk¡C¦p MySQL ¦øªA¾¹µo¥X¿ù»~«H®§¡A³o¥i¯àÀ°§U±z¥h§ä¥X°ÝÃD©Ò¦b¡C¦p±z¤´µM¥¼¯à¸Ñ¨M°ÝÃD¡A©Î¦b¤ÀªRµ{¦¡¥X²{¿ù»~¡A¦ý¦b©R¥O¦C¼Ò¦¡¯à¥¿±`°õ¦æ¡A½Ð±N¸Ó¥y¥X²{¿ù»~ªº SQL »yªk©â¥X¡A¨Ã±N¥H¤Uªº"°Å¨ú"³¡¥÷¤@¦P´£¥æ¨ì¯ä¦ä°Ï:';
-$strSQLParserUserError = '¥i¯à¬O±zªº SQL »yªk¥X²{¿ù»~¡A¦p MySQL ¦øªA¾¹µo¥X¿ù»~«H®§¡A³o¥i¯àÀ°§U±z¥h§ä¥X°ÝÃD©Ò¦b¡C';
-$strSQLQuery = 'SQL »yªk';
-$strSQLResult = 'SQL ¬d¸ßµ²ªG';
-$strSQL = 'SQL'; // should express in english
-$strSQPBugInvalidIdentifer = 'µL®ÄªºÃѧO½X (Invalid Identifer)';
-$strSQPBugUnclosedQuote = '¥¼§¹µ²ªº¤Þ¸¹ (Unclosed quote)';
-$strSQPBugUnknownPunctuation = '¤£ª¾©úªº¼ÐÂI²Å¸¹ (Unknown Punctuation String)';
$strStatCheckTime = '³Ì«áÀˬd';
$strStatCreateTime = '«Ø¥ß';
-$strStatement = '±Ô­z';
$strStatUpdateTime = '³Ì«á§ó·s';
+$strStatement = '±Ô­z';
$strStatus = 'ª¬ºA';
$strStrucCSV = 'CSV ¸ê®Æ';
$strStrucData = 'µ²ºc»P¸ê®Æ';
@@ -623,8 +645,10 @@ $strSubmit = '°e¥X';
$strSuccess = '±zªºSQL»yªk¤w¶¶§Q°õ¦æ';
$strSum = 'Á`­p';
$strSwedish = '·ç¨å»y';
+$strSwitchToDatabase = 'Âಾ¨ì½Æ»s¤§¸ê®Æ®w';
$strSwitchToTable = '¸õ¨ì¤w½Æ»s¤§¸ê®Æªí';
+$strTable = '¸ê®Æªí';
$strTableComments = '¸ê®Æªíµù¸Ñ¤å¦r';
$strTableEmpty = '½Ð¿é¤J¸ê®Æªí¦WºÙ!';
$strTableHasBeenDropped = '¸ê®Æªí %s ¤w³Q§R°£';
@@ -633,25 +657,24 @@ $strTableHasBeenFlushed = '¸ê®Æªí %s ¤w³Q±j­¢§ó·s';
$strTableMaintenance = '¸ê®ÆªíºûÅ@';
$strTableOfContents = '¥Ø¿ý';
$strTableOptions = '¸ê®Æªí¿ï¶µ';
-$strTables = '%s ¸ê®Æªí';
$strTableStructure = '¸ê®Æªí®æ¦¡¡G';
$strTableType = '¸ê®ÆªíÃþ«¬';
-$strTable = '¸ê®Æªí';
+$strTables = '%s ¸ê®Æªí';
$strTakeIt = '¿ï¥Î';
$strTblPrivileges = '«ü©w¸ê®ÆªíÅv­­';
$strTextAreaLength = ' ¥Ñ©óªø«×­­¨î<br /> ¦¹Äæ¦ì¤£¯à½s¿è ';
$strThai = '®õ»y';
-$strTheContents = 'Àɮפº®e±N·|¨ú¥N¿ï©wªº¸ê®Æªí¤¤¨ã¦³¬Û¦P¥DÁä©Î°ß¤@Á䪺°O¿ý';
$strTheContent = 'Àɮפº®e¤w¸g¶×¤J¸ê®Æªí';
-$strTheme = '´Ú¦¡';
+$strTheContents = 'Àɮפº®e±N·|¨ú¥N¿ï©wªº¸ê®Æªí¤¤¨ã¦³¬Û¦P¥DÁä©Î°ß¤@Á䪺°O¿ý';
$strTheTerminator = '¤À¹jÄæ¦ìªº¦r¤¸';
+$strTheme = '´Ú¦¡';
$strThisHost = '«ü©w¥D¾÷';
$strThisNotDirectory = '³o¨Ã¤£¬O¤@­Ó¥Ø¿ý';
$strThreadSuccessfullyKilled = '«ü¥O %s ¤w¦¨¥\¤¤¤î.';
$strTime = '®É¶¡';
$strToggleScratchboard = 'Âà´««K±ø';
-$strTotalUC = 'Á`¦@';
$strTotal = 'Á`­p';
+$strTotalUC = 'Á`¦@';
$strTraditionalChinese = 'ÁcÅ餤¤å';
$strTraditionalSpanish = '¶Ç²Î¦è¯Z¤ú»y';
$strTraffic = '¬y¶q';
@@ -673,17 +696,22 @@ $strType = '«¬ºA';
$strUkrainian = '¯Q§JÄõ»y';
$strUncheckAll = '¥þ³¡¨ú®ø';
$strUnicode = '²Î¤@½X (Unicode)';
-$strUnique = '°ß¤@';
+$strUnique = '°ß¤@Áä UNIQUE';
$strUnknown = '¤£¸Ô';
$strUnselectAll = '¥þ³¡¨ú®ø';
+$strUpdComTab = '½Ð°Ñ¬Ý»¡©ú¤å¥ó¬d¸ß¦p¦ó§ó·s Column_comments ¸ê®Æªí';
$strUpdatePrivMessage = '±z¤w¸g§ó·s¤F %s ªºÅv­­.';
$strUpdateProfileMessage = '¸ê®Æ¤v¸g§ó·s.';
$strUpdateQuery = '§ó·s»yªk';
-$strUpdComTab = '½Ð°Ñ¬Ý»¡©ú¤å¥ó¬d¸ß¦p¦ó§ó·s Column_comments ¸ê®Æªí';
$strUpgrade = '±zÀ³¸Ó§ó·s¨ì %s %s ©Î¤§«á.';
$strUsage = '¨Ï¥Î';
$strUseBackquotes = '¦b¸ê®Æªí¤ÎÄæ¦ì¨Ï¥Î¤Þ¸¹';
$strUseHostTable = '¨Ï¥Î¥D¾÷¸ê®Æªí';
+$strUseTabKey = '«ö TAB Áä¸õ¨ì¤U¤@­Ó¼Æ­È, ©Î CTRL+¤è¦VÁä §@ÀH·N²¾°Ê';
+$strUseTables = '¨Ï¥Î¸ê®Æªí';
+$strUseTextField = '¤å¦r¿é¤J';
+$strUseThisValue = '¨Ï¥Î¦¹­È';
+$strUser = '¨Ï¥ÎªÌ';
$strUserAlreadyExists = '¨Ï¥ÎªÌ %s ¤v¦s¦b!';
$strUserEmpty = '½Ð¿é¤J¨Ï¥ÎªÌ¦WºÙ!';
$strUserName = '¨Ï¥ÎªÌ¦WºÙ';
@@ -691,21 +719,17 @@ $strUserNotFound = '¿ï¾Üªº¨Ï¥ÎªÌ¦bÅv­­¸ê®Æªí¤º§ä¤£¨ì.';
$strUserOverview = '¨Ï¥ÎªÌ¤@Äý';
$strUsersDeleted = '¿ï¾Üªº¨Ï¥ÎªÌ¤w¦¨¥\§R°£.';
$strUsersHavingAccessToDb = '¥iŪ¨ú &quot;%s&quot; ¤§¨Ï¥ÎªÌ';
-$strUser = '¨Ï¥ÎªÌ';
-$strUseTables = '¨Ï¥Î¸ê®Æªí';
-$strUseTextField = '¤å¦r¿é¤J';
-$strUseThisValue = '¨Ï¥Î¦¹­È';
$strValidateSQL = 'Àˬd SQL';
$strValidatorError = 'SQL ¤ÀªRµ{¦¡¥¼¯à±Ò°Ê¡A½ÐÀˬd¬O§_¤w±N %s¤å¥ó%s ¤ºªº PHP Àɮצw¸Ë¡C';
$strValue = '­È';
$strVar = '¸ê°T';
-$strViewDumpDatabases = 'Åã¥Ü¸ê®Æ®w·§­n (schema)';
-$strViewDumpDB = 'À˵ø¸ê®Æ®wªº³Æ¥÷·§­n (dump schema)';
$strViewDump = 'À˵ø¸ê®Æªíªº³Æ¥÷·§­n (dump schema)';
+$strViewDumpDB = 'À˵ø¸ê®Æ®wªº³Æ¥÷·§­n (dump schema)';
+$strViewDumpDatabases = 'Åã¥Ü¸ê®Æ®w·§­n (schema)';
-$strWebServerUploadDirectoryError = '³]©w¤§¤W¸ü¥Ø¿ý¿ù»~¡A¥¼¯à¨Ï¥Î';
$strWebServerUploadDirectory = 'Web ¦øªA¾¹¤W¸ü¥Ø¿ý';
+$strWebServerUploadDirectoryError = '³]©w¤§¤W¸ü¥Ø¿ý¿ù»~¡A¥¼¯à¨Ï¥Î';
$strWelcome = 'Åwªï¨Ï¥Î %s';
$strWestEuropean = '¦è¼Ú»y¤å';
$strWildcard = '¸U¥Î¦r¤¸';
@@ -722,26 +746,8 @@ $strYes = ' ¬O ';
$strZeroRemovesTheLimit = 'µù: ³]©w³o¨Ç¿ï¶µ¬° 0 (¹s) ¥i¸Ñ°£­­¨î.';
$strZip = '"zipped"';
-$strAddFields = 'Add %s field(s)'; //to translate
-$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
-$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php
index add5552c94..08b48d4bd6 100644
--- a/lang/chinese_traditional-utf-8.inc.php
+++ b/lang/chinese_traditional-utf-8.inc.php
@@ -8,9 +8,6 @@
$charset = 'utf-8';
$allow_recoding = TRUE;
-$allow_recoding = TRUE;
-$allow_recoding = TRUE;
-$allow_recoding = TRUE;
$text_dir = 'ltr';
$left_font_family = 'verdana, arial, helvetica, geneva, sans-serif';
$right_font_family = 'helvetica, sans-serif';
@@ -27,18 +24,18 @@ $datefmt = '%B %d, %Y, %I:%M %p';
$timespanfmt = '%s æ—¥, %s å°æ™‚, %s åˆ†é˜ %s 秒';
+$strAPrimaryKey = '主éµå·²ç¶“新增到 %s';
$strAbortedClients = 'å–消';
$strAbsolutePathToDocSqlDir = '請輸入 docSQL 目錄於網é ä¼ºæœå™¨çš„絕å°è·¯å¾‘';
-$strAccessDeniedExplanation = 'phpMyAdmin 嘗試連線到 MySQL 伺æœå™¨, 但伺æœå™¨æ‹’絕了連線. 您應於 config.inc.php 內檢查主機å稱, 登入å稱åŠå¯†ç¢¼åŠç¢ºä¿é€™äº›è³‡æ–™æ˜¯èˆ‡ç³»çµ±ç®¡ç†äººå“¡æ‰€æ供的 MySQL 伺æœå™¨è³‡æ–™ç›¸åŒ';
$strAccessDenied = '拒絕存å–';
+$strAccessDeniedExplanation = 'phpMyAdmin 嘗試連線到 MySQL 伺æœå™¨, 但伺æœå™¨æ‹’絕了連線. 您應於 config.inc.php 內檢查主機å稱, 登入å稱åŠå¯†ç¢¼åŠç¢ºä¿é€™äº›è³‡æ–™æ˜¯èˆ‡ç³»çµ±ç®¡ç†äººå“¡æ‰€æ供的 MySQL 伺æœå™¨è³‡æ–™ç›¸åŒ';
$strAction = '執行';
$strAddAutoIncrement = "新增 AUTO_INCREMENT 數值";
$strAddConstraints = '加入é™åˆ¶';
$strAddDeleteColumn = '新增/減少 é¸æ“‡æ¬„';
$strAddDeleteRow = '新增/減少 篩é¸åˆ—';
$strAddDropDatabase = '加入 \'刪除資料表\' 語法';
-$strAddedColumnComment = '於以下欄ä½åŠ å…¥è¨»è§£æ–‡å­—';
-$strAddedColumnRelation = '於以下欄ä½åŠ å…¥é—œè¯';
+$strAddFields = '新增 %s 個欄ä½';
$strAddHeaderComment = '於標題加入個人註解 (\\n 開新行)';
$strAddIfNotExists = '加入 IF NOT EXISTS';
$strAddIntoComments = '加入註解文字';
@@ -47,24 +44,26 @@ $strAddPrivilegesOnDb = '於以下資料庫加入權é™';
$strAddPrivilegesOnTbl = '於以下資料表加入權é™';
$strAddSearchConditions = '增加檢索æ¢ä»¶ ("where" å­å¥çš„主體)';
$strAddToIndex = '新增 &nbsp;%s&nbsp; 組索引欄';
-$strAddUserMessage = '您已新增了一個新使用者.';
$strAddUser = '新增使用者';
+$strAddUserMessage = '您已新增了一個新使用者.';
+$strAddedColumnComment = '於以下欄ä½åŠ å…¥è¨»è§£æ–‡å­—';
+$strAddedColumnRelation = '於以下欄ä½åŠ å…¥é—œè¯';
$strAdministration = '系統管ç†';
$strAffectedRows = '影響列數: ';
+$strAfter = '在 %s 之後';
$strAfterInsertBack = '返回';
$strAfterInsertNewInsert = '新增一筆記錄';
$strAfterInsertSame = '返回這é ';
-$strAfter = '在 %s 之後';
-$strAllTableSameWidth = '以相åŒå¯¬åº¦é¡¯ç¤ºæ‰€æœ‰è³‡æ–™è¡¨?';
$strAll = '全部';
+$strAllTableSameWidth = '以相åŒå¯¬åº¦é¡¯ç¤ºæ‰€æœ‰è³‡æ–™è¡¨?';
$strAlterOrderBy = '根據欄ä½å…§å®¹æŽ’åºè¨˜éŒ„';
+$strAnIndex = '索引已經新增到 %s';
$strAnalyzeTable = '分æžè³‡æ–™è¡¨';
$strAnd = '與';
-$strAnIndex = '索引已經新增到 %s';
+$strAny = '任何';
$strAnyHost = '任何主機';
$strAnyUser = '任何使用者';
-$strAny = '任何';
-$strAPrimaryKey = '主éµå·²ç¶“新增到 %s';
+$strApproximateCount = 'å¯èƒ½æŽ¥è¿‘. è«‹åƒçœ‹ FAQ 3.11';
$strArabic = '阿拉伯語';
$strArmenian = '美å¼è‹±èªž';
$strAscending = 'éžå¢ž';
@@ -78,8 +77,15 @@ $strBack = '回上一é ';
$strBaltic = '波羅的海語';
$strBeginCut = '開始 剪å–';
$strBeginRaw = '開始 原始資料';
-$strBinaryDoNotEdit = '二進制碼 - ä¸èƒ½ç·¨è¼¯';
+$strBinLogEventType = '事件方å¼';
+$strBinLogInfo = '資料';
+$strBinLogName = '記錄檔案稱';
+$strBinLogOriginalPosition = '原有ä½ç½®';
+$strBinLogPosition = 'ä½ç½®';
+$strBinLogServerId = '伺æœå™¨ ID';
$strBinary = '二進制碼';
+$strBinaryDoNotEdit = '二進制碼 - ä¸èƒ½ç·¨è¼¯';
+$strBinaryLog = '二進制記錄';
$strBookmarkAllUsers = '所有用者å¯è®€å–此書籤';
$strBookmarkDeleted = '書籤已經刪除.';
$strBookmarkLabel = '書籤å稱';
@@ -87,16 +93,17 @@ $strBookmarkOptions = '書籤é¸é …';
$strBookmarkQuery = 'SQL 語法書籤';
$strBookmarkThis = '將此 SQL 語法加入書籤';
$strBookmarkView = '查看';
-$strBrowseForeignValues = 'ç€è¦½å¤–來值';
$strBrowse = 'ç€è¦½';
+$strBrowseForeignValues = 'ç€è¦½å¤–來值';
$strBulgarian = 'ä¿åŠ åˆ©äºžèªž';
$strBzError = 'phpMyAdmin 無法壓縮因於這個 php 版本的 Bz2 模組錯誤. 強列è¦æ±‚æ–¼ phpMyAdmin 設定檔設定 <code>$cfg[\'BZipDump\']</code> 為<code>FALSE</code>. 如果想使用 Bz2 壓縮功能,è«‹æ›´æ–° php 到最新版本. 詳情請åƒçœ‹ php 錯誤報報 %s .';
$strBzip = '"bzipped"';
+$strCSVOptions = 'CSV é¸é …';
$strCalendar = '日曆';
$strCannotLogin = '無法登入 MySQL 伺æœå™¨';
-$strCantLoadRecodeIconv = 'æœªèƒ½è®€å– iconv 或é‡æ–°ç·¨ç¢¼ç¨‹å¼ä¾†ä½œæ–‡å­—編碼轉æ›, 請設定 php 來啟動這些模組或å–消 phpMyAdmin 使用文字編碼轉æ›åŠŸèƒ½.';
$strCantLoad = 'ç„¡æ³•è®€å– %s 模組,<br />請檢查 PHP 設定';
+$strCantLoadRecodeIconv = 'æœªèƒ½è®€å– iconv 或é‡æ–°ç·¨ç¢¼ç¨‹å¼ä¾†ä½œæ–‡å­—編碼轉æ›, 請設定 php 來啟動這些模組或å–消 phpMyAdmin 使用文字編碼轉æ›åŠŸèƒ½.';
$strCantRenameIdxToPrimary = '無法將索引更å為 PRIMARY!';
$strCantUseRecodeIconv = '當文編碼模組讀å–後,未能使用 iconv, libiconv 或 recode_string 功能. 請檢查您的 php 設定.';
$strCardinality = '組別';
@@ -104,23 +111,23 @@ $strCarriage = 'æ­¸ä½: \\r';
$strCaseInsensitive = '大å°å¯«ä¸ç›¸ç¬¦';
$strCaseSensitive = '大å°å¯«ç›¸ç¬¦';
$strCentralEuropean = '中æ­èªž';
+$strChange = '修改';
+$strChangeCopyMode = '建立新使用者åŠä½¿ç”¨ç›¸åŒä¹‹æ¬Šé™, åŠ ...';
$strChangeCopyModeCopy = '... ä¿ç•™èˆŠä½¿ç”¨è€….';
$strChangeCopyModeDeleteAndReload = ' ... 刪除舊使用者åŠé‡æ–°è®€å–權é™è³‡æ–™è¡¨.';
$strChangeCopyModeJustDelete = ' ... 刪除舊使用者.';
$strChangeCopyModeRevoke = ' ... 廢除所有舊使用者有效之權é™ä¸¦åˆªé™¤.';
-$strChangeCopyMode = '建立新使用者åŠä½¿ç”¨ç›¸åŒä¹‹æ¬Šé™, åŠ ...';
$strChangeCopyUser = '更改登入資訊 / 複製使用者';
$strChangeDisplay = 'é¸æ“‡é¡¯ç¤ºä¹‹æ¬„ä½';
$strChangePassword = '更改密碼';
-$strChange = '修改';
+$strCharset = 'æ–‡å­—æ ¼å¼ (Charset)';
$strCharsetOfFile = '字元表檔案:';
-$strCharsetsAndCollations = '字元集åŠæ ¡å°';
$strCharsets = '字元集';
-$strCharset = 'æ–‡å­—æ ¼å¼ (Charset)';
+$strCharsetsAndCollations = '字元集åŠæ ¡å°';
$strCheckAll = 'å…¨é¸';
$strCheckOverhead = '檢查é¡å¤–記錄 (overheaded)'; // nor sure yet.
-$strCheckPrivsLong = '查詢資料庫 &quot;%s&quot; 之權é™.';
$strCheckPrivs = '查詢權é™';
+$strCheckPrivsLong = '查詢資料庫 &quot;%s&quot; 之權é™.';
$strCheckTable = '檢查資料表';
$strChoosePage = 'è«‹é¸æ“‡éœ€è¦ç·¨è¼¯çš„é ç¢¼';
$strColComFeat = '顯示欄ä½è¨»è§£';
@@ -128,8 +135,9 @@ $strCollation = 'æ ¡å°';
$strColumnNames = '欄ä½å稱';
$strColumnPrivileges = '指定欄ä½æ¬Šé™';
$strCommand = '指令';
-$strCommentsForTable = 'COMMENTS FOR TABLE'; // keep in SQL statement
$strComments = '註解';
+$strCommentsForTable = 'COMMENTS FOR TABLE'; // keep in SQL statement
+$strCompatibleHashing = 'MySQL&nbsp;4.0 相容';
$strCompleteInserts = '使用完整新增指令';
$strCompression = '壓縮';
$strConfigFileError = 'phpMyAdmin 未能讀å–您的設定檔! 這å¯èƒ½æ˜¯å› ç‚º php 找到語法上的錯誤或 php 未能找到檔案而æˆ.<br />請嘗試直接按下下方的連çµé–‹å•Ÿä¸¦æŸ¥çœ‹ php 的錯誤信æ¯. 通常的錯誤都來自æŸè™•æ¼äº†å¼•è™Ÿæˆ–分別.<br />如果按下連çµå¾Œå‡ºç¾ç©ºç™½é , å³ä»£è¡¨æ²’有任何å•é¡Œ.';
@@ -139,43 +147,29 @@ $strConnections = '連線';
$strConstraintsForDumped = '備份資料表é™åˆ¶';
$strConstraintsForTable = '資料表é™åˆ¶';
$strCookiesRequired = 'Cookies 必須啟動æ‰èƒ½ç™»å…¥.';
+$strCopyDatabaseOK = '資料庫 %s 已複製到 %s';
+$strCopyTable = '複製資料表到: (æ ¼å¼ç‚º 資料庫å稱<b>.</b>資料表å稱):';
$strCopyTableOK = '已經將資料表 %s 複製為 %s.';
$strCopyTableSameNames = '無法複製到相åŒè³‡æ–™è¡¨!';
-$strCopyTable = '複製資料表到: (æ ¼å¼ç‚º 資料庫å稱<b>.</b>資料表å稱):';
$strCouldNotKill = 'phpMyAdmin 無法中斷指令 %s. å¯èƒ½é€™æŒ‡ä»¤å·²ç¶“çµæŸ.';
-$strCreateIndexTopic = '新增一組索引';
+$strCreate = '建立';
$strCreateIndex = '新增 &nbsp;%s&nbsp; 組索引欄';
+$strCreateIndexTopic = '新增一組索引';
$strCreateNewDatabase = '建立新資料庫';
$strCreateNewTable = '建立新資料表於資料庫 %s';
$strCreatePage = '建立新一é ';
$strCreatePdfFeat = '建立 PDF';
-$strCreate = '建立';
$strCreationDates = '建立/更新/檢查 日期';
$strCriteria = '篩é¸';
$strCroatian = '克羅西亞語';
-$strCSVOptions = 'CSV é¸é …';
$strCyrillic = '西里爾語';
-$strCzechSlovak = 'æ·å…‹èªž';
$strCzech = 'æ·å…‹èªž';
+$strCzechSlovak = 'æ·å…‹èªž';
-$strDanish = '丹麥語';
-$strDatabaseEmpty = '資料庫å稱並未輸入!!';
-$strDatabaseExportOptions = '資料庫輸出é¸é …';
-$strDatabaseHasBeenDropped = '資料庫 %s 已被刪除';
-$strDatabaseNoTable = '這資料庫沒有資料表!';
-$strDatabasesDropped = '%s 個資料庫已æˆåŠŸåˆªé™¤.';
-$strDatabasesStatsDisable = 'åœæ­¢çµ±è¨ˆæ•¸æ“š';
-$strDatabasesStatsEnable = '啟動統計數據';
-$strDatabasesStatsHeavyTraffic = '註: 啟動資料庫統計數據å¯èƒ½æœƒç”¢ç”Ÿå¤§é‡ç”± Web 伺æœå™¨åŠ MySQL 之間的æµé‡.';
-$strDatabasesStats = '資料庫統計';
-$strDatabases = '資料庫';
-$strDatabase = '資料庫';
-$strDataDict = '數據字典';
-$strDataOnly = 'åªæœ‰è³‡æ–™';
-$strData = '資料';
$strDBComment = '資料庫註解文字: ';
-$strDBGContextID = '本文 (Context) ID';
+$strDBCopy = '複製資料庫到';
$strDBGContext = '本文 (Context)';
+$strDBGContextID = '本文 (Context) ID';
$strDBGHits = '次數';
$strDBGLine = '行';
$strDBGMaxTimeMs = '最大時間, ms';
@@ -183,54 +177,70 @@ $strDBGMinTimeMs = '最å°æ™‚é–“, ms';
$strDBGModule = '模組';
$strDBGTimePerHitMs = '時間/次, ms';
$strDBGTotalTimeMs = '總時間, ms';
-$strDbPrivileges = '指定資料庫權é™';
$strDBRename = '更改資料庫å稱到';
+$strDanish = '丹麥語';
+$strData = '資料';
+$strDataDict = '數據字典';
+$strDataOnly = 'åªæœ‰è³‡æ–™';
+$strDatabase = '資料庫';
+$strDatabaseEmpty = '資料庫å稱並未輸入!!';
+$strDatabaseExportOptions = '資料庫輸出é¸é …';
+$strDatabaseHasBeenDropped = '資料庫 %s 已被刪除';
+$strDatabaseNoTable = '這資料庫沒有資料表!';
+$strDatabases = '資料庫';
+$strDatabasesDropped = '%s 個資料庫已æˆåŠŸåˆªé™¤.';
+$strDatabasesStats = '資料庫統計';
+$strDatabasesStatsDisable = 'åœæ­¢çµ±è¨ˆæ•¸æ“š';
+$strDatabasesStatsEnable = '啟動統計數據';
+$strDatabasesStatsHeavyTraffic = '註: 啟動資料庫統計數據å¯èƒ½æœƒç”¢ç”Ÿå¤§é‡ç”± Web 伺æœå™¨åŠ MySQL 之間的æµé‡.';
+$strDbPrivileges = '指定資料庫權é™';
$strDbSpecific = '指定資料庫';
-$strDefaultValueHelp = 'é è¨­å€¼: è«‹åªè¼¸å…¥è©²é è¨­å€¼, 無需加上任何å斜線或引號';
$strDefault = 'é è¨­å€¼';
+$strDefaultValueHelp = 'é è¨­å€¼: è«‹åªè¼¸å…¥è©²é è¨­å€¼, 無需加上任何å斜線或引號';
$strDefragment = 'æ•´ç†è³‡æ–™è¡¨';
+$strDelOld = '本é çš„åƒè€ƒåˆ°è³‡æ–™è¡¨å·²ä¸å­˜åœ¨. 您希望刪除這些åƒè€ƒå—Ž?';
$strDelayedInserts = '使用延é²å¼æ–°å¢ž';
-$strDeleteAndFlushDescr = '這是一個最清潔的åšæ³•,但é‡æ–°è®€å–權é™éœ€ä¸€æ®µæ™‚é–“.';
+$strDelete = '刪除';
$strDeleteAndFlush = '刪除使用者åŠé‡æ–°è®€å–權é™.';
-$strDeletedRows = '已刪除欄數:';
+$strDeleteAndFlushDescr = '這是一個最清潔的åšæ³•,但é‡æ–°è®€å–權é™éœ€ä¸€æ®µæ™‚é–“.';
$strDeleted = '記錄已被刪除';
-$strDelete = '刪除';
+$strDeletedRows = '已刪除欄數:';
$strDeleting = '刪除 %s';
-$strDelOld = '本é çš„åƒè€ƒåˆ°è³‡æ–™è¡¨å·²ä¸å­˜åœ¨. 您希望刪除這些åƒè€ƒå—Ž?';
$strDescending = 'éžæ¸›';
$strDescription = '說明';
$strDictionary = 'å­—å…¸';
-$strDisabled = '未啟動';
$strDisableForeignChecks = 'æš«å®šå¤–ä¾†éµ (Foreign Key) 檢查';
+$strDisabled = '未啟動';
$strDisplayFeat = '功能顯示';
$strDisplayOrder = '顯示次åº';
$strDisplayPDF = '顯示 PDF 概è¦';
$strDoAQuery = '以範例查詢 (è¬ç”¨å­—å…ƒ : "%")';
-$strDocu = '說明文件';
$strDoYouReally = 'æ‚¨ç¢ºå®šè¦ ';
+$strDocu = '說明文件';
+$strDrop = '刪除';
$strDropDatabaseStrongWarning = '您將會刪除整個資料庫!';
$strDropSelectedDatabases = '刪除已é¸æ“‡ä¹‹è³‡æ–™åº«';
$strDropUsersDb = '刪除與使用者相åŒå稱之資料庫.';
-$strDrop = '刪除';
-$strDumpingData = '列出以下資料庫的數據:';
$strDumpSaved = '備份已儲到檔案 %s.';
$strDumpXRows = '備份 %s 行, 由 %s 行開始.';
+$strDumpingData = '列出以下資料庫的數據:';
$strDynamic = 'å‹•æ…‹';
+$strEdit = '編輯';
$strEditPDFPages = '編輯 PDF é ç¢¼';
$strEditPrivileges = '編輯權é™';
-$strEdit = '編輯';
$strEffective = '實際';
-$strEmptyResultSet = 'MySQL 傳回的查詢çµæžœç‚ºç©º (原因å¯èƒ½ç‚ºï¼šæ²’有找到符åˆæ¢ä»¶çš„記錄)';
$strEmpty = '清空';
+$strEmptyResultSet = 'MySQL 傳回的查詢çµæžœç‚ºç©º (原因å¯èƒ½ç‚ºï¼šæ²’有找到符åˆæ¢ä»¶çš„記錄)';
$strEnabled = 'å•Ÿå‹•';
$strEncloseInTransaction = '使用事務塊 (Transaction) æ–¹å¼';
+$strEnd = '最後一é ';
$strEndCut = 'çµæŸ 剪å–';
$strEndRaw = 'çµæŸ 原始資料';
-$strEnd = '最後一é ';
-$strEnglishPrivileges = '注æ„: MySQL 權é™å稱會以英語顯示';
$strEnglish = '英語';
+$strEnglishPrivileges = '注æ„: MySQL 權é™å稱會以英語顯示';
$strError = '錯誤';
+$strEscapeWildcards = 'è¬ç”¨ç¬¦è™Ÿ _ åŠ % 應正確地加入 \ ';
$strEstonian = '愛沙尼亞語';
$strExcelEdition = 'Excel 版本';
$strExcelOptions = 'Excel é¸é …';
@@ -241,34 +251,34 @@ $strExtendedInserts = '伸延新增模å¼';
$strExtra = '附加';
$strFailedAttempts = '嘗試失敗';
+$strField = '欄ä½';
$strFieldHasBeenDropped = '資料表 %s 已被刪除';
+$strFields = '欄ä½';
$strFieldsEmpty = ' 欄ä½ç¸½æ•¸æ˜¯ç©ºçš„! ';
$strFieldsEnclosedBy = '「欄ä½ã€ä½¿ç”¨å­—元:';
$strFieldsEscapedBy = '「ESCAPEã€ä½¿ç”¨å­—元:';
$strFieldsTerminatedBy = '「欄ä½åˆ†éš”ã€ä½¿ç”¨å­—元:';
-$strFields = '欄ä½';
-$strField = '欄ä½';
$strFileAlreadyExists = '檔案 %s 已存在,請更改檔案å稱或é¸æ“‡ã€Œè¦†å¯«å·±å­˜åœ¨æª”案ã€é¸é ….';
$strFileCouldNotBeRead = '讀案無法讀å–';
+$strFileNameTemplate = '檔案å稱樣å¼';
$strFileNameTemplateHelp = '使用 __DB__ 作為資料庫å稱, __TABLE__ 為資料表å稱. %s任何 strftime%s 內關於時間åŠé™„加é¸é …會自動加入. 其他文字將會ä¿ç•™.';
$strFileNameTemplateRemember = 'ä¿ç•™æ¨£å¼å稱';
-$strFileNameTemplate = '檔案å稱樣å¼';
$strFixed = '固定';
$strFlushPrivilegesNote = '註: phpMyAdmin 直接由 MySQL 權é™è³‡æ–™è¡¨å–得使用者權é™. 如果使用者自行更改資料表, 資料表內容將å¯èƒ½èˆ‡å¯¦éš›ä½¿ç”¨è€…情æ³æœ‰ç•°. 在這情æ³ä¸‹, æ‚¨æ‡‰åœ¨ç¹¼çºŒå‰ %sé‡æ–°è¼‰å…¥%s 權é™è³‡æ–™è¡¨.';
$strFlushTable = '強迫更新資料表 ("FLUSH")';
-$strFormat = 'æ ¼å¼';
$strFormEmpty = '表格內æ¼å¡«ä¸€äº›è³‡æ–™!';
+$strFormat = 'æ ¼å¼';
$strFullText = '顯示完整文字';
$strFunction = '函數';
$strGenBy = '建立';
-$strGeneralRelationFeat = '一般關è¯åŠŸèƒ½';
$strGenTime = '建立日期';
+$strGeneralRelationFeat = '一般關è¯åŠŸèƒ½';
$strGeorgian = '格魯å‰äºžèªž';
$strGerman = '德語';
+$strGlobal = 'æ•´é«”';
$strGlobalPrivileges = '整體權é™';
$strGlobalValue = '整體值';
-$strGlobal = 'æ•´é«”';
$strGo = '執行';
$strGrantOption = '授權';
$strGreek = '希臘語';
@@ -279,59 +289,64 @@ $strHasBeenCreated = '已經建立';
$strHaveToShow = '您需è¦é¸æ“‡æœ€å°‘顯示一行欄ä½';
$strHebrew = '希伯來語';
$strHexForBinary = '以å六進制數值顯示二進制欄ä½';
-$strHomepageOfficial = 'phpMyAdmin 官方網站';
$strHome = '主目錄';
-$strHostEmpty = '請輸入主機å稱!';
+$strHomepageOfficial = 'phpMyAdmin 官方網站';
$strHost = '主機';
+$strHostEmpty = '請輸入主機å稱!';
$strHungarian = '匈牙利語';
$strIcelandic = '冰島語';
$strId = 'ID'; // use eng
$strIdxFulltext = '全文檢索';
$strIfYouWish = '如果您è¦æŒ‡å®šè³‡æ–™åŒ¯å…¥çš„欄ä½ï¼Œè«‹è¼¸å…¥ç”¨é€—號隔開的欄ä½å稱';
-$strIgnoreInserts = '使用忽略加入 (insert)';
$strIgnore = '忽略';
+$strIgnoreInserts = '使用忽略加入 (insert)';
$strIgnoringFile = '忽略檔案 %s';
$strImportDocSQL = 'è®€å– docSQL 檔案';
$strImportFiles = '輸入檔案';
$strImportFinished = '輸入完æˆ';
-$strIndexes = '索引';
+$strInUse = '使用中';
+$strIndex = 'ç´¢å¼•éµ INDEX';
$strIndexHasBeenDropped = '索引 %s 已被刪除';
$strIndexName = '索引å稱&nbsp;:';
$strIndexType = '索引類型&nbsp;:';
-$strIndex = '索引';
+$strIndexWarningMultiple = '多éŽä¸€å€‹ %s éµå·²å»ºç«‹åˆ°æ¬„ä½ `%s` 中';
+$strIndexWarningPrimary = 'ä¸»éµ PRIMARY åŠ ç´¢å¼•éµ INDEX ä¸æ‡‰åŒæ™‚é–“è¨­å®šæ¬„ä½ `%s` 中';
+$strIndexWarningTable = '於資料表 `%s` 中有索引å•é¡Œ';
+$strIndexWarningUnique = 'å”¯ä¸€éµ UNIQUE åŠ ç´¢å¼•éµ INDEX ä¸æ‡‰åŒæ™‚é–“è¨­å®šæ¬„ä½ `%s` 中';
+$strIndexes = '索引';
$strInnodbStat = 'InnoDB 狀態';
$strInsecureMySQL = '設定檔內有關設定 (root登入åŠæ²’有密碼) 與é è¨­çš„ MySQL 權é™æˆ¶å£ç›¸åŒã€‚ MySQL 伺æœå™¨åœ¨é€™é è¨­çš„設定é‹è¡Œçš„話會很容易被入侵,您應更改有關設定去防止安全æ¼æ´žã€‚';
+$strInsert = '新增';
$strInsertAsNewRow = '儲存為新記錄';
-$strInsertedRowId = '新增資料列 id:';
-$strInsertedRows = '新增列數:';
+$strInsertBookmarkTitle = '請輸入書籤標題';
$strInsertNewRow = '新增一筆記錄';
$strInsertTextfiles = '將文字檔資料匯入資料表';
-$strInsert = '新增';
+$strInsertedRowId = '新增資料列 id:';
+$strInsertedRows = '新增列數:';
$strInstructions = '指令';
$strInternalNotNecessary = '* 當內部關è¯åœ¨ InnoDB 已存在時是無需è¦çš„.';
$strInternalRelations = '內部關è¯';
-$strInUse = '使用中';
$strJapanese = '日語';
$strJumpToDB = '跳到資料庫 &quot;%s&quot;.';
-$strJustDeleteDescr = ' &quot;刪除&quot; 的使用者ä»ç„¶èƒ½å¤ ç™»å…¥è³‡æ–™åº«ç›´è‡³é‡æ–°è¼‰å…¥è³‡æ–™åº«ç‚ºæ­¢.';
$strJustDelete = 'åªå¾žæ¬Šé™è³‡æ–™åº«åˆªé™¤ä½¿ç”¨è€….';
+$strJustDeleteDescr = ' &quot;刪除&quot; 的使用者ä»ç„¶èƒ½å¤ ç™»å…¥è³‡æ–™åº«ç›´è‡³é‡æ–°è¼‰å…¥è³‡æ–™åº«ç‚ºæ­¢.';
$strKeepPass = 'è«‹ä¸è¦æ›´æ”¹å¯†ç¢¼';
$strKeyname = 'éµå';
$strKill = 'Kill'; //should expressed in English
$strKorean = '韓語';
+$strLaTeX = 'LaTeX'; // use eng
+$strLaTeXOptions = 'LaTeX é¸é …';
$strLandscape = 'æ©«å‘';
$strLatexCaption = '資料表標題';
$strLatexContent = '資料表 __TABLE__ 內容';
-$strLatexContinuedCaption = '連續資料表標題';
$strLatexContinued = '(連續)';
+$strLatexContinuedCaption = '連續資料表標題';
$strLatexIncludeCaption = '包括資料表標題';
$strLatexLabel = '標記éµå';
-$strLaTeX = 'LaTeX'; // use eng
-$strLaTeXOptions = 'LaTeX é¸é …';
$strLatexStructure = '資料表 __TABLE__ çµæ§‹';
$strLatvian = '拉脫維亞語';
$strLengthSet = '長度/集åˆ*';
@@ -345,32 +360,32 @@ $strLoadExplanation = '最佳模å¼æ˜¯ç”±ç³»çµ±è‡ªå‹•æª¢æŸ¥, 如果錯誤, 您å
$strLoadMethod = 'LOAD 模å¼';
$strLocalhost = '本地';
$strLocationTextfile = '文字檔案的ä½ç½®';
-$strLoginInformation = '登入資訊';
-$strLogin = '登入';
-$strLogout = '登出系統';
$strLogPassword = '密碼:';
$strLogServer = '伺æœå™¨';
$strLogUsername = '登入å稱:';
+$strLogin = '登入';
+$strLoginInformation = '登入資訊';
+$strLogout = '登出系統';
-$strMaximumSize = '最大容é‡: %s%s';
+$strMIMETypesForTable = 'MIME TYPES FOR TABLE'; // keep in SQL statement
+$strMIME_MIMEtype = 'MIME é¡žåž‹';
$strMIME_available_mime = 'å¯ä½¿ç”¨ MIME é¡žåž‹';
$strMIME_available_transform = 'å¯ä½¿ç”¨è½‰æ›æ–¹å¼';
$strMIME_description = '說明';
-$strMIME_MIMEtype = 'MIME é¡žåž‹';
$strMIME_nodescription = '這個轉æ›æ–¹å¼æ²’有說明.<br />è«‹å‘作者查詢 %s 是甚麼用途.';
+$strMIME_transformation = 'ç€è¦½å™¨è½‰æ›æ–¹å¼';
$strMIME_transformation_note = '有關å¯ä½¿ç”¨ä¹‹è½‰æ›æ–¹å¼é¸é …åŠ MINE 類型轉æ›é¸é …, 請查看 %s轉æ›æ–¹å¼èªªæ˜Ž%s';
-$strMIME_transformation_options_note = '請用以下的格å¼è¼¸å…¥è½‰æ›é¸é …值: \'a\',\'b\',\'c\'...<br />如您需è¦è¼¸å…¥å斜線 ("\") 或單引號 ("\'") è«‹å†åŠ ä¸Šå斜線 (例如 \'\\\\xyz\' or \'a\\\'b\').';
$strMIME_transformation_options = '轉æ›æ–¹å¼é¸é …';
-$strMIME_transformation = 'ç€è¦½å™¨è½‰æ›æ–¹å¼';
-$strMIMETypesForTable = 'MIME TYPES FOR TABLE'; // keep in SQL statement
+$strMIME_transformation_options_note = '請用以下的格å¼è¼¸å…¥è½‰æ›é¸é …值: \'a\',\'b\',\'c\'...<br />如您需è¦è¼¸å…¥å斜線 ("\") 或單引號 ("\'") è«‹å†åŠ ä¸Šå斜線 (例如 \'\\\\xyz\' or \'a\\\'b\').';
$strMIME_without = 'MIME 類型以斜體顯示是沒有分隔轉æ›åŠŸèƒ½';
+$strMaximumSize = '最大容é‡: %s%s';
$strModifications = '修改已儲存';
-$strModifyIndexTopic = '修改索引';
$strModify = '修改';
+$strModifyIndexTopic = '修改索引';
$strMoreStatusVars = '更多狀æ³è³‡è¨Š';
+$strMoveTable = '移動資料表到:(æ ¼å¼ç‚º 資料庫å稱<b>.</b>資料表å稱)';
$strMoveTableOK = '資料表 %s 已經移動到 %s.';
$strMoveTableSameNames = '無法移動到相åŒè³‡æ–™è¡¨!';
-$strMoveTable = '移動資料表到:(æ ¼å¼ç‚º 資料庫å稱<b>.</b>資料表å稱)';
$strMultilingual = '多語言';
$strMustSelectFile = '您應é¸æ“‡éœ€è¦æ–°å¢žçš„檔案.';
$strMySQLCharset = 'MySQL 文字編碼';
@@ -385,16 +400,17 @@ $strMySQLShowVars = '顯示 MySQL 系統變數';
$strName = 'å稱';
$strNeedPrimaryKey = '您需è¦åœ¨æ­¤è³‡æ–™è¡¨è¨­å®šä¸»éµ (Primary Key)';
$strNext = '下一個';
-$strNoDatabasesSelected = '沒有資料庫é¸æ“‡.';
+$strNo = ' å¦ ';
+$strNoActivity = 'ç”±æ–¼å·²é–’ç½®äº†é” %s 秒, è«‹é‡æ–°ç™»å…¥';
$strNoDatabases = '沒有資料庫';
+$strNoDatabasesSelected = '沒有資料庫é¸æ“‡.';
$strNoDescription = '沒有說明';
$strNoDropDatabases = '"DROP DATABASE" 指令已經åœç”¨.';
$strNoExplain = 'ç•¥éŽèªªæ˜Ž SQL';
$strNoFrames = 'phpMyAdmin 較為é©åˆä½¿ç”¨åœ¨æ”¯æ´<b>é æ¡†</b>çš„ç€è¦½å™¨.';
-$strNoIndexPartsDefined = '部份索引資料還未定義!';
$strNoIndex = '沒有已定義的索引!';
+$strNoIndexPartsDefined = '部份索引資料還未定義!';
$strNoModification = '沒有變更';
-$strNone = 'ä¸é©ç”¨';
$strNoOptions = '這種格å¼ä¸¦ç„¡é¸é …';
$strNoPassword = 'ä¸ç”¨å¯†ç¢¼';
$strNoPermission = 'Web 伺æœå™¨æ²’有權é™å„²å­˜æª”案 %s.';
@@ -405,20 +421,21 @@ $strNoRights = '您ç¾åœ¨æ²’有足夠的權é™!';
$strNoRowsSelected = '並無資料列已é¸æ“‡';
$strNoSpace = '空間ä¸è¶³å„²å­˜æª”案 %s.';
$strNoTablesFound = '資料庫中沒有資料表';
+$strNoThemeSupport = 'ä¸æ”¯æ´æ¬¾å¼åŠŸèƒ½, 請查看設定案åŠå„²å­˜æ¬¾å¼æª”案的資料夾 %s.';
+$strNoUsersFound = '找ä¸åˆ°ä½¿ç”¨è€…';
+$strNoValidateSQL = 'ç•¥éŽæª¢æŸ¥ SQL';
+$strNone = 'ä¸é©ç”¨';
$strNotNumber = '這ä¸æ˜¯ä¸€å€‹æ•¸å­—!';
$strNotOK = '未能確定';
$strNotSet = '<b>%s</b> 資料表找ä¸åˆ°æˆ–還未在 %s 設定';
$strNotValidNumber = 'ä¸æ˜¯æœ‰æ•ˆçš„列數!';
-$strNoUsersFound = '找ä¸åˆ°ä½¿ç”¨è€…';
-$strNoValidateSQL = 'ç•¥éŽæª¢æŸ¥ SQL';
-$strNo = ' å¦ ';
$strNull = 'Null'; //should expressed in English
$strNumSearchResultsInTable = '%s é …è³‡æ–™ç¬¦åˆ - 於資料表 <i>%s</i>';
$strNumSearchResultsTotal = '<b>總計:</b> <i>%s</i> 項資料符åˆ';
$strNumTables = '個資料表';
-$strOftenQuotation = '最常用的是引號,「éžå¿…é ˆã€è¡¨ç¤ºåªæœ‰ char å’Œ varchar 欄ä½æœƒè¢«åŒ…括起來';
$strOK = '確定';
+$strOftenQuotation = '最常用的是引號,「éžå¿…é ˆã€è¡¨ç¤ºåªæœ‰ char å’Œ varchar 欄ä½æœƒè¢«åŒ…括起來';
$strOperations = '管ç†';
$strOperator = 'æ“作員';
$strOptimizeTable = '最佳化資料表';
@@ -428,13 +445,16 @@ $strOr = '或';
$strOverhead = '多餘';
$strOverwriteExisting = '覆寫已存在檔案';
+$strPHP40203 = '您正使用 PHP 版本 4.2.3, 這版本有一個雙字節字元的嚴é‡éŒ¯èª¤(mbstring). è«‹åƒé–± PHP 臭蟲報告編號 19404. phpMyAdmin 並ä¸å»ºè­°ä½¿ç”¨é€™å€‹ç‰ˆæœ¬çš„ PHP .';
+$strPHPVersion = 'PHP 版本';
$strPageNumber = 'é ç¢¼:';
$strPaperSize = '紙張大å°';
$strPartialText = '顯示部份文字';
+$strPassword = '密碼';
$strPasswordChanged = '%s 的密碼已æˆåŠŸæ›´æ”¹.';
$strPasswordEmpty = '請輸入密碼!';
+$strPasswordHashing = '密碼雜湊';
$strPasswordNotSame = '第二次輸入的密碼ä¸åŒ!';
-$strPassword = '密碼';
$strPdfDbSchema = '"%s" è³‡æ–™åº«æ¦‚è¦ - 第 %s é ';
$strPdfInvalidTblName = '資料表 "%s" ä¸å­˜åœ¨!';
$strPdfNoTables = '沒有資料表';
@@ -443,22 +463,20 @@ $strPerMinute = 'æ¯åˆ†é˜';
$strPerSecond = 'æ¯ç§’';
$strPersian = '波斯語';
$strPhoneBook = '電話簿';
-$strPHP40203 = '您正使用 PHP 版本 4.2.3, 這版本有一個雙字節字元的嚴é‡éŒ¯èª¤(mbstring). è«‹åƒé–± PHP 臭蟲報告編號 19404. phpMyAdmin 並ä¸å»ºè­°ä½¿ç”¨é€™å€‹ç‰ˆæœ¬çš„ PHP .';
-$strPHPVersion = 'PHP 版本';
$strPhp = '建立 PHP 程å¼ç¢¼';
$strPmaDocumentation = 'phpMyAdmin 說明文件';
-$strPmaUriError = ' 必須設定 <tt>$cfg[\'PmaAbsoluteUri\']</tt> 在設定檔內!';
+$strPmaUriError = ' 必須在設定檔內設定 <tt>$cfg[\'PmaAbsoluteUri\']</tt> !';
$strPolish = '波蘭語';
$strPortrait = 'ç›´å‘';
$strPos1 = '第一é ';
$strPrevious = 'å‰ä¸€é ';
+$strPrimary = 'ä¸»éµ PRIMARY';
$strPrimaryKeyHasBeenDropped = '主éµå·²è¢«åˆªé™¤';
$strPrimaryKeyName = '主éµçš„å稱必須稱為 PRIMARY!';
$strPrimaryKeyWarning = '("PRIMARY" <b>å¿…é ˆ</b>是主éµçš„å稱以åŠæ˜¯<b>唯一</b>一組主éµ!)';
-$strPrimary = '主éµ';
-$strPrintViewFull = '列å°æª¢è¦– (顯示完整文字)';
-$strPrintView = '列å°æª¢è¦–';
$strPrint = '列å°';
+$strPrintView = '列å°æª¢è¦–';
+$strPrintViewFull = '列å°æª¢è¦– (顯示完整文字)';
$strPrivDescAllPrivileges = '包括所有權é™é™¤äº†æŽˆæ¬Š (GRNANT).';
$strPrivDescAlter = '容許修改ç¾æœ‰è³‡æ–™è¡¨çš„çµæ§‹.';
$strPrivDescCreateDb = '容許建立新資料庫åŠè³‡æ–™è¡¨.';
@@ -488,14 +506,14 @@ $strPrivDescShutdown = '容許åœæ­¢ä¼ºæœå™¨.';
$strPrivDescSuper = '容許連線, 就算超éŽäº†æœ€å¤§é€£ç·šé™åˆ¶; 用於最高系統管ç†å¦‚設定整體權é™æˆ–中止其他使用者指令.';
$strPrivDescUpdate = '容許更新數據.';
$strPrivDescUsage = '沒有權é™.';
-$strPrivilegesReloaded = '權é™å·²æˆåŠŸé‡æ–°è®€å–.';
$strPrivileges = '權é™';
+$strPrivilegesReloaded = '權é™å·²æˆåŠŸé‡æ–°è®€å–.';
$strProcesslist = '系統執行清單';
$strPutColNames = '將欄ä½å稱放在首行';
+$strQBE = 'ä¾ç¯„例查詢 (QBE)';
$strQBEDel = '移除';
$strQBEIns = '新增';
-$strQBE = 'ä¾ç¯„例查詢 (QBE)';
$strQueryFrame = '查詢視窗';
$strQueryOnDb = '在資料庫 <b>%s</b> 執行 SQL 語法:';
$strQuerySQLHistory = 'SQL 歷程';
@@ -504,51 +522,62 @@ $strQueryTime = '查詢需時 %01.4f 秒';
$strQueryType = '查詢方å¼';
$strQueryWindowLock = 'ä¸è¦å°‡é€™èªžæ³•è¦†è“‹åˆ°æœ¬è¦–窗外的SQL語法';
+$strReType = '確èªå¯†ç¢¼';
$strReceived = '接收';
$strRecords = '記錄';
$strReferentialIntegrity = '檢查指示完整性:';
$strRefresh = 'æ›´æ–°';
-$strRelationalSchema = 'é—œè¯æ¦‚è¦';
$strRelationNotWorking = 'é—œè¯è³‡æ–™è¡¨çš„附加功能未能啟動, %s請按此%s 查出å•é¡ŒåŽŸå› .';
-$strRelationsForTable = 'RELATIONS FOR TABLE'; // keep in SQL statement
-$strRelations = 'é—œè¯';
$strRelationView = 'é—œè¯æª¢è¦–';
+$strRelationalSchema = 'é—œè¯æ¦‚è¦';
+$strRelations = 'é—œè¯';
+$strRelationsForTable = 'RELATIONS FOR TABLE'; // keep in SQL statement
$strReloadFailed = 'é‡æ–°è¼‰å…¥MySQL失敗';
-$strReloadingThePrivileges = 'é‡æ–°è®€å–權é™';
$strReloadMySQL = 'é‡æ–°è¼‰å…¥ MySQL';
+$strReloadingThePrivileges = 'é‡æ–°è®€å–權é™';
$strRemoveSelectedUsers = '移除已é¸æ“‡ä½¿ç”¨è€…';
$strRenameDatabaseOK = '資料庫 %s 已更改å稱為 %s';
-$strRenameTableOK = '已經將資料表 %s 改åæˆ %s';
$strRenameTable = '將資料表改å為';
+$strRenameTableOK = '已經將資料表 %s 改åæˆ %s';
$strRepairTable = '修復資料表';
+$strReplace = 'å–代';
$strReplaceNULLBy = 'å°‡ NULL å–代為';
$strReplaceTable = '以檔案å–代資料表資料';
-$strReplace = 'å–代';
$strReset = 'é‡ç½®';
$strResourceLimits = '資æºé™åˆ¶';
-$strReType = '確èªå¯†ç¢¼';
-$strRevokeAndDeleteDescr = '使用者ä»ç„¶æœ‰ USAGE 權é™ç›´è‡³æ¬Šé™è³‡æ–™è¡¨æ›´æ–°è®€å–.';
+$strRevoke = '移除';
$strRevokeAndDelete = '廢除使用者所有有效之權é™ä¸¦åˆªé™¤.';
+$strRevokeAndDeleteDescr = '使用者ä»ç„¶æœ‰ USAGE 權é™ç›´è‡³æ¬Šé™è³‡æ–™è¡¨æ›´æ–°è®€å–.';
$strRevokeMessage = '您已移除這ä½ä½¿ç”¨è€…的權é™: %s';
-$strRevoke = '移除';
$strRomanian = '羅馬尼亞語';
$strRowLength = '資料列長度';
-$strRowsFrom = '筆記錄,開始列數:';
$strRowSize = '資料列大å°';
+$strRows = '資料列列數';
+$strRowsFrom = '筆記錄,開始列數:';
$strRowsModeFlippedHorizontal = '垂直 (旋轉標題)';
$strRowsModeHorizontal = 'æ°´å¹³';
$strRowsModeOptions = '顯示為 %s æ–¹å¼ åŠ æ¯éš” %s 行顯示欄å';
$strRowsModeVertical = 'åž‚ç›´';
$strRowsStatistic = '資料列統計數值';
-$strRows = '資料列列數';
-$strRunning = '在 %s 執行';
$strRunQuery = '執行語法';
$strRunSQLQuery = '在資料庫 %s 執行以下指令';
+$strRunning = '在 %s 執行';
$strRussian = '俄語';
-$strSaveOnServer = '儲存到伺æœå™¨æ–¼ %s 目錄';
+$strSQL = 'SQL'; // should express in english
+$strSQLExportType = '輸出方å¼';
+$strSQLOptions = 'SQL é¸é …';
+$strSQLParserBugMessage = '這å¯èƒ½æ˜¯æ‚¨æ‰¾åˆ°äº† SQL 分æžç¨‹å¼çš„一些程å¼éŒ¯èª¤ï¼Œè«‹ç´°å¿ƒæŸ¥çœ‹æ‚¨çš„語法,檢查一下引號是正確åŠæ²’有éºæ¼ï¼Œå…¶ä»–å¯èƒ½å‡ºéŒ¯çš„原因å¯èƒ½ä¾†è‡ªæ‚¨ä¸Šè¼‰æª”案時在引號外的地方使用了二進制碼。您å¯ä»¥å˜—試在 MySQL 命令列介é¢åŸ·è¡Œè©²èªžæ³•ã€‚如 MySQL 伺æœå™¨ç™¼å‡ºéŒ¯èª¤ä¿¡æ¯ï¼Œé€™å¯èƒ½å¹«åŠ©æ‚¨åŽ»æ‰¾å‡ºå•é¡Œæ‰€åœ¨ã€‚如您ä»ç„¶æœªèƒ½è§£æ±ºå•é¡Œï¼Œæˆ–在分æžç¨‹å¼å‡ºç¾éŒ¯èª¤ï¼Œä½†åœ¨å‘½ä»¤åˆ—模å¼èƒ½æ­£å¸¸åŸ·è¡Œï¼Œè«‹å°‡è©²å¥å‡ºç¾éŒ¯èª¤çš„ SQL 語法抽出,並將以下的"剪å–"部份一åŒæ交到臭虫å€:';
+$strSQLParserUserError = 'å¯èƒ½æ˜¯æ‚¨çš„ SQL 語法出ç¾éŒ¯èª¤ï¼Œå¦‚ MySQL 伺æœå™¨ç™¼å‡ºéŒ¯èª¤ä¿¡æ¯ï¼Œé€™å¯èƒ½å¹«åŠ©æ‚¨åŽ»æ‰¾å‡ºå•é¡Œæ‰€åœ¨ã€‚';
+$strSQLQuery = 'SQL 語法';
+$strSQLResult = 'SQL 查詢çµæžœ';
+$strSQPBugInvalidIdentifer = '無效的識別碼 (Invalid Identifer)';
+$strSQPBugUnclosedQuote = '未完çµçš„引號 (Unclosed quote)';
+$strSQPBugUnknownPunctuation = 'ä¸çŸ¥æ˜Žçš„標點符號 (Unknown Punctuation String)';
$strSave = '儲存';
+$strSaveOnServer = '儲存到伺æœå™¨æ–¼ %s 目錄';
$strScaleFactorSmall = '比例å€æ•¸å¤ªç´°, 無法將圖表放在一é å…§';
+$strSearch = 'æœç´¢';
$strSearchFormTitle = 'æœç´¢è³‡æ–™åº«';
$strSearchInTables = '於以下資料表:';
$strSearchNeedle = '尋找之文字或數值 (è¬ç”¨å­—å…ƒ: "%"):';
@@ -558,62 +587,52 @@ $strSearchOption3 = '完整詞語';
$strSearchOption4 = '以è¦å‰‡è¡¨ç¤ºæ³• (regular expression) æœç´¢';
$strSearchResultsFor = 'æœç´¢ "<i>%s</i>" çš„çµæžœ %s:';
$strSearchType = '尋找:';
-$strSearch = 'æœç´¢';
$strSecretRequired = '設定檔案ç¾åœ¨éœ€è¦å¯†ç¢¼ (passphrase) (blowfish_secret).';
$strSelectADb = 'è«‹é¸æ“‡è³‡æ–™åº«';
$strSelectAll = 'å…¨é¸';
+$strSelectBinaryLog = 'é¸æ“‡æª¢è¦–二進制記錄';
$strSelectFields = 'é¸æ“‡æ¬„ä½ (至少一個)';
$strSelectNumRows = '查詢中';
$strSelectTables = 'é¸æ“‡è³‡æ–™è¡¨';
$strSend = '下載儲存';
$strSent = 'é€å‡º';
+$strServer = '伺æœå™¨';
$strServerChoice = 'é¸æ“‡ä¼ºæœå™¨';
$strServerNotResponding = '伺æœå™¨ä¸¦ç„¡å›žæ‡‰';
-$strServerStatusUptime = '這 MySQL 伺æœå™¨å·²å•Ÿå‹•äº† %s. 伺æœå™¨æ–¼ %s å•Ÿå‹•.';
$strServerStatus = 'é‹è¡Œè³‡è¨Š';
+$strServerStatusUptime = '這 MySQL 伺æœå™¨å·²å•Ÿå‹•äº† %s. 伺æœå™¨æ–¼ %s å•Ÿå‹•.';
$strServerTabProcesslist = '處ç†';
$strServerTabVariables = '資訊';
$strServerTrafficNotes = '<b>伺æœå™¨æµé‡</b>: 這些表顯示了此 MySQL 伺æœå™¨è‡ªå•Ÿå‹•ä»¥ä¾†çš„網絡æµé‡çµ±è¨ˆã€‚';
$strServerVars = '伺æœå™¨è³‡è¨ŠåŠè¨­å®š';
$strServerVersion = '伺æœå™¨ç‰ˆæœ¬';
-$strServer = '伺æœå™¨';
$strSessionValue = '程åºæ•¸å€¼';
$strSetEnumVal = '如欄ä½æ ¼å¼æ˜¯ "enum" 或 "set", 請使用以下的格å¼è¼¸å…¥: \'a\',\'b\',\'c\'...<br />如在數值上需è¦è¼¸å…¥å斜線 (\) 或單引號 (\') , è«‹å†åŠ ä¸Šå斜線 (例如 \'\\\\xyz\' or \'a\\\'b\').';
+$strShow = '顯示';
$strShowAll = '顯示全部';
$strShowColor = '顯示é¡è‰²';
$strShowDatadictAs = '數據字典格å¼';
$strShowFullQueries = '顯示完整查詢';
$strShowGrid = '顯示框格';
-$strShowingRecords = '顯示記錄';
$strShowPHPInfo = '顯示 PHP 資訊';
$strShowTableDimension = '顯示表格大å°';
$strShowTables = '顯示資料表';
$strShowThisQuery = 'é‡æ–°é¡¯ç¤º SQL 語法 ';
-$strShow = '顯示';
+$strShowingRecords = '顯示記錄';
$strSimplifiedChinese = '簡體中文';
$strSingly = '(åªæœƒæŽ’åºç¾æ™‚的記錄)';
$strSize = '大å°';
$strSlovak = '斯洛ä¼å…‹èªž';
$strSlovenian = '斯洛文尼亞語';
-$strSortByKey = 'ä¾éµå排åº';
$strSort = '排åº';
+$strSortByKey = 'ä¾éµå排åº';
$strSpaceUsage = '已使用空間';
$strSpanish = '西ç­ç‰™èªž';
$strSplitWordsWithSpace = 'æ¯çµ„文字以空格 (" ") 分隔.';
-$strSQLExportType = '輸出方å¼';
-$strSQLOptions = 'SQL é¸é …';
-$strSQLParserBugMessage = '這å¯èƒ½æ˜¯æ‚¨æ‰¾åˆ°äº† SQL 分æžç¨‹å¼çš„一些程å¼éŒ¯èª¤ï¼Œè«‹ç´°å¿ƒæŸ¥çœ‹æ‚¨çš„語法,檢查一下引號是正確åŠæ²’有éºæ¼ï¼Œå…¶ä»–å¯èƒ½å‡ºéŒ¯çš„原因å¯èƒ½ä¾†è‡ªæ‚¨ä¸Šè¼‰æª”案時在引號外的地方使用了二進制碼。您å¯ä»¥å˜—試在 MySQL 命令列介é¢åŸ·è¡Œè©²èªžæ³•ã€‚如 MySQL 伺æœå™¨ç™¼å‡ºéŒ¯èª¤ä¿¡æ¯ï¼Œé€™å¯èƒ½å¹«åŠ©æ‚¨åŽ»æ‰¾å‡ºå•é¡Œæ‰€åœ¨ã€‚如您ä»ç„¶æœªèƒ½è§£æ±ºå•é¡Œï¼Œæˆ–在分æžç¨‹å¼å‡ºç¾éŒ¯èª¤ï¼Œä½†åœ¨å‘½ä»¤åˆ—模å¼èƒ½æ­£å¸¸åŸ·è¡Œï¼Œè«‹å°‡è©²å¥å‡ºç¾éŒ¯èª¤çš„ SQL 語法抽出,並將以下的"剪å–"部份一åŒæ交到臭虫å€:';
-$strSQLParserUserError = 'å¯èƒ½æ˜¯æ‚¨çš„ SQL 語法出ç¾éŒ¯èª¤ï¼Œå¦‚ MySQL 伺æœå™¨ç™¼å‡ºéŒ¯èª¤ä¿¡æ¯ï¼Œé€™å¯èƒ½å¹«åŠ©æ‚¨åŽ»æ‰¾å‡ºå•é¡Œæ‰€åœ¨ã€‚';
-$strSQLQuery = 'SQL 語法';
-$strSQLResult = 'SQL 查詢çµæžœ';
-$strSQL = 'SQL'; // should express in english
-$strSQPBugInvalidIdentifer = '無效的識別碼 (Invalid Identifer)';
-$strSQPBugUnclosedQuote = '未完çµçš„引號 (Unclosed quote)';
-$strSQPBugUnknownPunctuation = 'ä¸çŸ¥æ˜Žçš„標點符號 (Unknown Punctuation String)';
$strStatCheckTime = '最後檢查';
$strStatCreateTime = '建立';
-$strStatement = '敘述';
$strStatUpdateTime = '最後更新';
+$strStatement = '敘述';
$strStatus = '狀態';
$strStrucCSV = 'CSV 資料';
$strStrucData = 'çµæ§‹èˆ‡è³‡æ–™';
@@ -627,8 +646,10 @@ $strSubmit = 'é€å‡º';
$strSuccess = '您的SQL語法已順利執行';
$strSum = '總計';
$strSwedish = '瑞典語';
+$strSwitchToDatabase = '轉移到複製之資料庫';
$strSwitchToTable = '跳到已複製之資料表';
+$strTable = '資料表';
$strTableComments = '資料表註解文字';
$strTableEmpty = '請輸入資料表å稱!';
$strTableHasBeenDropped = '資料表 %s 已被刪除';
@@ -637,25 +658,24 @@ $strTableHasBeenFlushed = '資料表 %s 已被強迫更新';
$strTableMaintenance = '資料表維護';
$strTableOfContents = '目錄';
$strTableOptions = '資料表é¸é …';
-$strTables = '%s 資料表';
$strTableStructure = '資料表格å¼ï¼š';
$strTableType = '資料表類型';
-$strTable = '資料表';
+$strTables = '%s 資料表';
$strTakeIt = 'é¸ç”¨';
$strTblPrivileges = '指定資料表權é™';
$strTextAreaLength = ' 由於長度é™åˆ¶<br /> 此欄ä½ä¸èƒ½ç·¨è¼¯ ';
$strThai = '泰語';
-$strTheContents = '檔案內容將會å–代é¸å®šçš„資料表中具有相åŒä¸»éµæˆ–唯一éµçš„記錄';
$strTheContent = '檔案內容已經匯入資料表';
-$strTheme = '款å¼';
+$strTheContents = '檔案內容將會å–代é¸å®šçš„資料表中具有相åŒä¸»éµæˆ–唯一éµçš„記錄';
$strTheTerminator = '分隔欄ä½çš„å­—å…ƒ';
+$strTheme = '款å¼';
$strThisHost = '指定主機';
$strThisNotDirectory = '這並ä¸æ˜¯ä¸€å€‹ç›®éŒ„';
$strThreadSuccessfullyKilled = '指令 %s å·²æˆåŠŸä¸­æ­¢.';
$strTime = '時間';
$strToggleScratchboard = '轉æ›ä¾¿æ¢';
-$strTotalUC = '總共';
$strTotal = '總計';
+$strTotalUC = '總共';
$strTraditionalChinese = 'ç¹é«”中文';
$strTraditionalSpanish = '傳統西ç­ç‰™èªž';
$strTraffic = 'æµé‡';
@@ -677,17 +697,22 @@ $strType = 'åž‹æ…‹';
$strUkrainian = 'çƒå…‹è˜­èªž';
$strUncheckAll = '全部å–消';
$strUnicode = '統一碼 (Unicode)';
-$strUnique = '唯一';
+$strUnique = 'å”¯ä¸€éµ UNIQUE';
$strUnknown = 'ä¸è©³';
$strUnselectAll = '全部å–消';
+$strUpdComTab = 'è«‹åƒçœ‹èªªæ˜Žæ–‡ä»¶æŸ¥è©¢å¦‚何更新 Column_comments 資料表';
$strUpdatePrivMessage = '您已經更新了 %s 的權é™.';
$strUpdateProfileMessage = '資料己經更新.';
$strUpdateQuery = '更新語法';
-$strUpdComTab = 'è«‹åƒçœ‹èªªæ˜Žæ–‡ä»¶æŸ¥è©¢å¦‚何更新 Column_comments 資料表';
$strUpgrade = '您應該更新到 %s %s 或之後.';
$strUsage = '使用';
$strUseBackquotes = '在資料表åŠæ¬„ä½ä½¿ç”¨å¼•è™Ÿ';
$strUseHostTable = '使用主機資料表';
+$strUseTabKey = '按 TAB éµè·³åˆ°ä¸‹ä¸€å€‹æ•¸å€¼, 或 CTRL+æ–¹å‘éµ ä½œéš¨æ„移動';
+$strUseTables = '使用資料表';
+$strUseTextField = '文字輸入';
+$strUseThisValue = '使用此值';
+$strUser = '使用者';
$strUserAlreadyExists = '使用者 %s 己存在!';
$strUserEmpty = '請輸入使用者å稱!';
$strUserName = '使用者å稱';
@@ -695,21 +720,17 @@ $strUserNotFound = 'é¸æ“‡çš„使用者在權é™è³‡æ–™è¡¨å…§æ‰¾ä¸åˆ°.';
$strUserOverview = '使用者一覽';
$strUsersDeleted = 'é¸æ“‡çš„使用者已æˆåŠŸåˆªé™¤.';
$strUsersHavingAccessToDb = 'å¯è®€å– &quot;%s&quot; 之使用者';
-$strUser = '使用者';
-$strUseTables = '使用資料表';
-$strUseTextField = '文字輸入';
-$strUseThisValue = '使用此值';
$strValidateSQL = '檢查 SQL';
$strValidatorError = 'SQL 分æžç¨‹å¼æœªèƒ½å•Ÿå‹•ï¼Œè«‹æª¢æŸ¥æ˜¯å¦å·²å°‡ %s文件%s 內的 PHP 檔案安è£ã€‚';
$strValue = '值';
$strVar = '資訊';
-$strViewDumpDatabases = 'é¡¯ç¤ºè³‡æ–™åº«æ¦‚è¦ (schema)';
-$strViewDumpDB = 'æª¢è¦–è³‡æ–™åº«çš„å‚™ä»½æ¦‚è¦ (dump schema)';
$strViewDump = 'æª¢è¦–è³‡æ–™è¡¨çš„å‚™ä»½æ¦‚è¦ (dump schema)';
+$strViewDumpDB = 'æª¢è¦–è³‡æ–™åº«çš„å‚™ä»½æ¦‚è¦ (dump schema)';
+$strViewDumpDatabases = 'é¡¯ç¤ºè³‡æ–™åº«æ¦‚è¦ (schema)';
-$strWebServerUploadDirectoryError = '設定之上載目錄錯誤,未能使用';
$strWebServerUploadDirectory = 'Web 伺æœå™¨ä¸Šè¼‰ç›®éŒ„';
+$strWebServerUploadDirectoryError = '設定之上載目錄錯誤,未能使用';
$strWelcome = '歡迎使用 %s';
$strWestEuropean = '西æ­èªžæ–‡';
$strWildcard = 'è¬ç”¨å­—å…ƒ';
@@ -726,26 +747,8 @@ $strYes = ' 是 ';
$strZeroRemovesTheLimit = '註: 設定這些é¸é …為 0 (零) å¯è§£é™¤é™åˆ¶.';
$strZip = '"zipped"';
-$strAddFields = 'Add %s field(s)'; //to translate
-$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
-$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/croatian-iso-8859-2.inc.php b/lang/croatian-iso-8859-2.inc.php
index 11cd89bc1a..10ed2ec387 100644
--- a/lang/croatian-iso-8859-2.inc.php
+++ b/lang/croatian-iso-8859-2.inc.php
@@ -766,4 +766,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php
index df7a7ac73f..9b82e1d104 100644
--- a/lang/croatian-utf-8.inc.php
+++ b/lang/croatian-utf-8.inc.php
@@ -767,4 +767,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/croatian-windows-1250.inc.php b/lang/croatian-windows-1250.inc.php
index b033b08ec8..13d59859fd 100644
--- a/lang/croatian-windows-1250.inc.php
+++ b/lang/croatian-windows-1250.inc.php
@@ -766,4 +766,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/czech-iso-8859-2.inc.php b/lang/czech-iso-8859-2.inc.php
index c54f18888a..5713beb1a6 100644
--- a/lang/czech-iso-8859-2.inc.php
+++ b/lang/czech-iso-8859-2.inc.php
@@ -23,18 +23,17 @@ $datefmt = '%a %d. %b %Y, %H:%M';
$timespanfmt = '%s dnù, %s hodin, %s minut a %s sekund';
+$strAPrimaryKey = 'V&nbsp;tabulce %s byl vytvoøen primární klíè';
$strAbortedClients = 'Pøeru¹ené';
$strAbsolutePathToDocSqlDir = 'docSQL adresáø';
-$strAccessDeniedExplanation = 'phpMyAdmin se pokusil pøipojit k&nbsp;MySQL serveru, a ten odmítl pøipojení. Zkontrolujte jméno serveru, u¾ivatelské jméno a heslo v&nbsp;souboru config.inc.php a ujistìte se, ¾e jsou toto¾né s&nbsp;tìmi, které máte od administrátora MySQL serveru.';
$strAccessDenied = 'Pøístup odepøen';
+$strAccessDeniedExplanation = 'phpMyAdmin se pokusil pøipojit k&nbsp;MySQL serveru, a ten odmítl pøipojení. Zkontrolujte jméno serveru, u¾ivatelské jméno a heslo v&nbsp;souboru config.inc.php a ujistìte se, ¾e jsou toto¾né s&nbsp;tìmi, které máte od administrátora MySQL serveru.';
$strAction = 'Akce';
$strAddAutoIncrement = 'Pøidat hodnotu AUTO_INCREMENT';
$strAddConstraints = 'Pøidat integritní omezení';
$strAddDeleteColumn = 'Pøidat nebo odebrat sloupec';
$strAddDeleteRow = 'Pøidat nebo odebrat øádek';
$strAddDropDatabase = 'Pøidat DROP DATABASE';
-$strAddedColumnComment = 'Pøidán komentáø ke sloupci';
-$strAddedColumnRelation = 'Pøidána relace pro sloupec';
$strAddFields = 'Pøidat %s polo¾ek';
$strAddHeaderComment = 'Pøidat vlastní komentáø do hlavièky (\\n oddìluje øádky)';
$strAddIfNotExists = 'Pøidat IF NOT EXISTS';
@@ -44,24 +43,27 @@ $strAddPrivilegesOnDb = 'Pøidat oprávnìní pro databázi';
$strAddPrivilegesOnTbl = 'Pøidat oprávnìní pro tabulku';
$strAddSearchConditions = 'Pøidat vyhledávací parametry (èást dotazu po pøíkazu "WHERE"):';
$strAddToIndex = 'Pøidat %s sloupcù do indexu';
-$strAddUserMessage = 'U¾ivatel byl pøidán.';
$strAddUser = 'Pøidat nového u¾ivatele';
+$strAddUserMessage = 'U¾ivatel byl pøidán.';
+$strAddedColumnComment = 'Pøidán komentáø ke sloupci';
+$strAddedColumnRelation = 'Pøidána relace pro sloupec';
$strAdministration = 'Správa';
$strAffectedRows = 'Ovlivnìné øádky:';
+$strAfter = 'Po %s';
$strAfterInsertBack = 'Návrat na pøedchozí stránku';
$strAfterInsertNewInsert = 'Vlo¾it dal¹í øádek';
+$strAfterInsertNext = 'Upravit následující øádek';
$strAfterInsertSame = 'Návrat na tuto stránku';
-$strAfter = 'Po %s';
-$strAllTableSameWidth = 'Pou¾ít pro v¹echny tabulky stejnou ¹íøku';
$strAll = 'V¹echno';
+$strAllTableSameWidth = 'Pou¾ít pro v¹echny tabulky stejnou ¹íøku';
$strAlterOrderBy = 'Zmìnit poøadí tabulky podle';
+$strAnIndex = 'K&nbsp;tabulce %s byl pøidán index';
$strAnalyzeTable = 'Analyzovat tabulku';
$strAnd = 'a';
-$strAnIndex = 'K&nbsp;tabulce %s byl pøidán index';
-$strAnyHost = 'Jakýkoliv poèítaè';
$strAny = 'Jakýkoliv';
+$strAnyHost = 'Jakýkoliv poèítaè';
$strAnyUser = 'Jakýkoliv u¾ivatel';
-$strAPrimaryKey = 'V&nbsp;tabulce %s byl vytvoøen primární klíè';
+$strApproximateCount = 'Mù¾e být nepøesné, viz FAQ 3.11';
$strArabic = 'Arab¹tina';
$strArmenian = 'Armén¹tina';
$strAscending = 'Vzestupnì';
@@ -75,15 +77,15 @@ $strBack = 'Zpìt';
$strBaltic = 'Baltické';
$strBeginCut = 'ZAÈÁTEK VÝPISU';
$strBeginRaw = 'ZAÈÁTEK VÝPISU';
-$strBinary = ' Binární ';
-$strBinaryDoNotEdit = ' Binární - neupravujte ';
-$strBinaryLog = 'Binární log';
$strBinLogEventType = 'Typ události';
$strBinLogInfo = 'Informace';
$strBinLogName = 'Jméno logu';
$strBinLogOriginalPosition = 'Pùvodní pozice';
$strBinLogPosition = 'Pozice';
$strBinLogServerId = 'ID serveru';
+$strBinary = ' Binární ';
+$strBinaryDoNotEdit = ' Binární - neupravujte ';
+$strBinaryLog = 'Binární log';
$strBookmarkAllUsers = 'Umo¾nit v¹em u¾ivatelùm pou¾ívat tuto polo¾ku';
$strBookmarkDeleted = 'Polo¾ka byla smazána z&nbsp;oblíbených.';
$strBookmarkLabel = 'Název';
@@ -91,12 +93,13 @@ $strBookmarkOptions = 'Nastavení oblíbeného dotazu';
$strBookmarkQuery = 'Oblíbený SQL dotaz';
$strBookmarkThis = 'Pøidat tento SQL dotaz do oblíbených';
$strBookmarkView = 'Jen zobrazit';
-$strBrowseForeignValues = 'Projít hodnoty cizích klíèù';
$strBrowse = 'Projít';
+$strBrowseForeignValues = 'Projít hodnoty cizích klíèù';
$strBulgarian = 'Bulhar¹tina';
$strBzError = 'phpMyAdminovi se nepodaøilo zkomprimovat výpis, proto¾e roz¹íøení pro kompresi bz2 je v&nbsp;této verzi PHP chybné. Doporuèujeme tuto kompresi vypnout (nastavit <code>$cfg[\'BZipDump\']</code> v&nbsp;nastaveních phpMyAdmina na <code>FALSE</code>). Pokud chcete pou¾ívat kompresi bz2, mìli byste nainstalovat novìj¹í verzi PHP. Více informací o&nbsp;tomto problému je u popisu chyby %s.';
$strBzip = '"zabzipováno"';
+$strCSVOptions = 'Nastavení CSV exportu';
$strCalendar = 'Kalendáø';
$strCannotLogin = 'Nepodaøilo se pøihlá¹ení k MySQL serveru';
$strCantLoad = 'nelze nahrát roz¹íøení %s,<br />zkontrolujte prosím nastavení PHP';
@@ -108,23 +111,23 @@ $strCarriage = 'Návrat vozíku (CR): \\r';
$strCaseInsensitive = 'nerozli¹ovat velká a malá písmena';
$strCaseSensitive = 'rozli¹ovat velká a malá písmena';
$strCentralEuropean = 'Støední Evropa';
+$strChange = 'Zmìnit';
+$strChangeCopyMode = 'Vytvoøit nového u¾ivatele se stejnými oprávnìními a ...';
$strChangeCopyModeCopy = '... zachovat pùvodního u¾ivatele.';
$strChangeCopyModeDeleteAndReload = ' ... smazat u¾ivatele a poté znovu naèíst oprávnìní.';
$strChangeCopyModeJustDelete = ' ... smazat pùvodního u¾ivatele ze v¹ech tabulek.';
$strChangeCopyModeRevoke = ' ... odebrat v¹echna oprávnìní pùvodnímu u¾ivateli a poté ho smazat.';
-$strChangeCopyMode = 'Vytvoøit nového u¾ivatele se stejnými oprávnìními a ...';
$strChangeCopyUser = 'Zmìnit informace o&nbsp;u¾ivateli / Kopírovat u¾ivatele';
$strChangeDisplay = 'Zvolte které sloupce zobrazit';
$strChangePassword = 'Zmìnit heslo';
-$strChange = 'Zmìnit';
+$strCharset = 'Znaková sada';
$strCharsetOfFile = 'Znaková sada souboru:';
-$strCharsetsAndCollations = 'Znakové sady a porovnávání';
$strCharsets = 'Znakové sady';
-$strCharset = 'Znaková sada';
+$strCharsetsAndCollations = 'Znakové sady a porovnávání';
$strCheckAll = 'Za¹krtnout v¹e';
$strCheckOverhead = 'Za¹krtnout neoptimální';
-$strCheckPrivsLong = 'Zkontrolovat oprávnìní pro databázi &quot;%s&quot;.';
$strCheckPrivs = 'Zkontrolovat oprávnìní';
+$strCheckPrivsLong = 'Zkontrolovat oprávnìní pro databázi &quot;%s&quot;.';
$strCheckTable = 'Zkontrolovat tabulku';
$strChoosePage = 'Zvolte stránku, kterou chcete zmìnit';
$strColComFeat = 'Zobrazuji komentáøe sloupcù';
@@ -132,8 +135,9 @@ $strCollation = 'Porovnávání';
$strColumnNames = 'Názvy sloupcù';
$strColumnPrivileges = 'Oprávnìní pro jednotlivé sloupce';
$strCommand = 'Pøíkaz';
-$strCommentsForTable = 'KOMENTÁØE PRO TABULKU';
$strComments = 'Komentáøe';
+$strCommentsForTable = 'KOMENTÁØE PRO TABULKU';
+$strCompatibleHashing = 'Kompatibilní s&nbsp;MySQL&nbsp;4.0';
$strCompleteInserts = 'Úplné inserty';
$strCompression = 'Komprese';
$strConfigFileError = 'phpMyAdmin nemohl naèíst konfiguraèní soubor!<br />Tato chyba mù¾e nastat pokud v&nbsp;nìm PHP najde chybu nebo nemù¾e tento soubor najít.<br />Po kliknutí na následující odkaz se PHP pokusí pøímo interpretovat tento soubor a zobrazí informace o&nbsp;chybì, ke které do¹lo. Pak opravte tuto chybu (nejèastìji se jedná o&nbsp;chybìjící støedník).<br />Pokud získáte prázdnou stránku, v¹echno je v&nbsp;poøádku.';
@@ -148,22 +152,36 @@ $strCopyTable = 'Kopírovat tabulku do (databáze<b>.</b>tabulka):';
$strCopyTableOK = 'Tabulka %s byla zkopírována do %s.';
$strCopyTableSameNames = 'Nelze kopírovat tabulku na sebe samu!';
$strCouldNotKill = 'phpMyAdminovi se nepodaøilo ukonèit vlákno %s. Pravdìpodobnì jeho bìh ji¾ skonèil.';
-$strCreateIndexTopic = 'Vytvoøit nový index';
+$strCreate = 'Vytvoøit';
$strCreateIndex = 'Vytvoøit index na&nbsp;%s&nbsp;sloupcích';
+$strCreateIndexTopic = 'Vytvoøit nový index';
$strCreateNewDatabase = 'Vytvoøit novou databázi';
$strCreateNewTable = 'Vytvoøit novou tabulku v&nbsp;databázi %s';
$strCreatePage = 'Vytvoøit novou stránku';
$strCreatePdfFeat = 'Vytváøení PDF';
-$strCreate = 'Vytvoøit';
$strCreationDates = 'Datum vytvoøení, poslední zmìny a kontroly';
$strCriteria = 'Podmínka';
$strCroatian = 'Chorvat¹tina';
-$strCSVOptions = 'Nastavení CSV exportu';
$strCyrillic = 'Cyrilika';
$strCzech = 'Èe¹tina';
$strCzechSlovak = 'Èe¹tina/Sloven¹tina';
+$strDBComment = 'Komentáø k databázi: ';
+$strDBCopy = 'Zkopírovat databázi na';
+$strDBGContext = 'Kontext';
+$strDBGContextID = 'Kontext ID';
+$strDBGHits = 'Zásahù';
+$strDBGLine = 'Øádka';
+$strDBGMaxTimeMs = 'Min. èas, ms';
+$strDBGMinTimeMs = 'Max. èas, ms';
+$strDBGModule = 'Modul';
+$strDBGTimePerHitMs = 'Èas/Zásah, ms';
+$strDBGTotalTimeMs = 'Celkový èas, ms';
+$strDBRename = 'Pøejmenovat databázi na';
$strDanish = 'Dán¹tina';
+$strData = 'Data';
+$strDataDict = 'Datový slovník';
+$strDataOnly = ' Jen data';
$strDatabase = 'Databáze';
$strDatabaseEmpty = 'Jméno databáze je prázdné!';
$strDatabaseExportOptions = 'Nastavení exportu databází';
@@ -171,68 +189,53 @@ $strDatabaseHasBeenDropped = 'Databáze %s byla zru¹ena.';
$strDatabaseNoTable = 'Tato databáze neobsahuje ¾ádné tabulky!';
$strDatabases = 'Databáze';
$strDatabasesDropped = '%s databáze byla úspì¹nì zru¹ena.';
+$strDatabasesStats = 'Statistiky databází';
$strDatabasesStatsDisable = 'Skrýt podrobnosti';
$strDatabasesStatsEnable = 'Zobrazit podrobnosti';
$strDatabasesStatsHeavyTraffic = 'Poznámka: Zobrazení podrobností o&nbsp;databázích mù¾e zpùsobit znaèné zvý¹ení provozu mezi webserverem a MySQL serverem.';
-$strDatabasesStats = 'Statistiky databází';
-$strData = 'Data';
-$strDataDict = 'Datový slovník';
-$strDataOnly = ' Jen data';
-$strDBComment = 'Komentáø k databázi: ';
-$strDBCopy = 'Zkopírovat databázi na';
-$strDBGContextID = 'Kontext ID';
-$strDBGContext = 'Kontext';
-$strDBGHits = 'Zásahù';
-$strDBGLine = 'Øádka';
-$strDBGMaxTimeMs = 'Min. èas, ms';
-$strDBGMinTimeMs = 'Max. èas, ms';
-$strDBGModule = 'Modul';
-$strDBGTimePerHitMs = 'Èas/Zásah, ms';
-$strDBGTotalTimeMs = 'Celkový èas, ms';
$strDbPrivileges = 'Oprávnìní pro jednotlivé databáze';
-$strDBRename = 'Pøejmenovat databázi na';
$strDbSpecific = 'závislé na databázi';
-$strDefaultValueHelp = 'Výchozí hodnotu zadejte jen jednu hodnotu bez uvozovek a escapování znakù, napøíklad: a';
$strDefault = 'Výchozí';
+$strDefaultValueHelp = 'Výchozí hodnotu zadejte jen jednu hodnotu bez uvozovek a escapování znakù, napøíklad: a';
$strDefragment = 'Defragmentovat tabulku';
+$strDelOld = 'Aktuální stránka se odkazuje na tabulky, které ji¾ neexistují. Chcete odstranit tyto odkazy?';
$strDelayedInserts = 'Pou¾ívat zpo¾dìné inserty';
-$strDeleteAndFlushDescr = 'Toto je nejèist¹í øe¹ení, ale naèítání oprávnìní mù¾e trvat dlouho.';
+$strDelete = 'Smazat';
$strDeleteAndFlush = 'Odstranit u¾ivatele a znovunaèíst oprávnìní.';
+$strDeleteAndFlushDescr = 'Toto je nejèist¹í øe¹ení, ale naèítání oprávnìní mù¾e trvat dlouho.';
$strDeleted = 'Øádek byl smazán';
$strDeletedRows = 'Smazané øádky:';
-$strDelete = 'Smazat';
$strDeleting = 'Odstraòuji %s';
-$strDelOld = 'Aktuální stránka se odkazuje na tabulky, které ji¾ neexistují. Chcete odstranit tyto odkazy?';
$strDescending = 'Sestupnì';
$strDescription = 'Popis';
$strDictionary = 'slovník';
-$strDisabled = 'Vypnuto';
$strDisableForeignChecks = 'Vypnout kontrolu cizích klíèù';
+$strDisabled = 'Vypnuto';
$strDisplayFeat = 'Zobrazení funkcí';
$strDisplayOrder = 'Seøadit podle:';
$strDisplayPDF = 'Zobrazit jako schéma v&nbsp;PDF';
$strDoAQuery = 'Provést "dotaz podle pøíkladu" (zástupný znak: "%")';
-$strDocu = 'Dokumentace';
$strDoYouReally = 'Opravdu si pøejete vykonat pøíkaz';
-$strDropDatabaseStrongWarning = 'Chystáte se ZRU©IT celou databázi!';
+$strDocu = 'Dokumentace';
$strDrop = 'Odstranit';
+$strDropDatabaseStrongWarning = 'Chystáte se ZRU©IT celou databázi!';
$strDropSelectedDatabases = 'Zru¹it vybranou databázi';
$strDropUsersDb = 'Odstranit databáze se stejnými jmény jako u¾ivatelé.';
-$strDumpingData = 'Vypisuji data pro tabulku';
$strDumpSaved = 'Výpis byl ulo¾en do souboru %s.';
$strDumpXRows = 'Vypsat %s øádkù od %s.';
+$strDumpingData = 'Vypisuji data pro tabulku';
$strDynamic = 'dynamický';
+$strEdit = 'Upravit';
$strEditPDFPages = 'Upravit PDF stránky';
$strEditPrivileges = 'Upravit oprávnìní';
-$strEdit = 'Upravit';
$strEffective = 'Efektivní';
-$strEmptyResultSet = 'MySQL vrátil prázdný výsledek (tj. nulový poèet øádkù).';
$strEmpty = 'Vyprázdnit';
+$strEmptyResultSet = 'MySQL vrátil prázdný výsledek (tj. nulový poèet øádkù).';
$strEnabled = 'Zapnuto';
$strEncloseInTransaction = 'Uzavøít pøíkazy v&nbsp;transakci';
-$strEndCut = 'KONEC VÝPISU';
$strEnd = 'Konec';
+$strEndCut = 'KONEC VÝPISU';
$strEndRaw = 'KONEC VÝPISU';
$strEnglish = 'Anglicky';
$strEnglishPrivileges = 'Poznámka: názvy oprávnìní v&nbsp;MySQL jsou uvádìny anglicky';
@@ -248,29 +251,29 @@ $strExtendedInserts = 'Roz¹íøené inserty';
$strExtra = 'Extra';
$strFailedAttempts = 'Nepovedených pokusù';
+$strField = 'Sloupec';
$strFieldHasBeenDropped = 'Sloupec %s byl odstranìn';
+$strFields = 'Sloupce';
$strFieldsEmpty = ' Nebyl zadán poèet sloupcù! ';
$strFieldsEnclosedBy = 'Názvy sloupcù uzavøené do';
$strFieldsEscapedBy = 'Názvy sloupcù escapovány';
-$strField = 'Sloupec';
-$strFields = 'Sloupce';
$strFieldsTerminatedBy = 'Sloupce oddìlené';
$strFileAlreadyExists = 'Soubor %s ji¾ na serveru existuje, zmìòte jméno souboru, nebo zvolte pøepsání souboru.';
$strFileCouldNotBeRead = 'Soubor nelze pøeèíst';
+$strFileNameTemplate = 'Vzor pro jméno souboru';
$strFileNameTemplateHelp = 'Pou¾ijte __DB__ pro jméno databáze, __TABLE__ pro jméno tabulky a jakékoliv parametry pro %sfunkci strftime%s pro vlo¾ení data. Pøípona souboru bude automaticky pøidána podle typu. Jakýkoliv jiný text bude zachován.';
$strFileNameTemplateRemember = 'zapamatovat si hodnotu';
-$strFileNameTemplate = 'Vzor pro jméno souboru';
$strFixed = 'pevný';
$strFlushPrivilegesNote = 'Poznámka: phpMyAdmin získává oprávnìní pøímo z&nbsp;tabulek MySQL. Obsah tìchto tabulek se mù¾e li¹it od oprávnìní, která server právì pou¾ívá, pokud byly tyto tabulky upravovány. V&nbsp;tomto pøípadì je vhodné provést %sznovunaètení oprávnìní%s pøed pokraèováním.';
$strFlushTable = 'Vyprázdnit vyrovnávací pamì» pro tabulku ("FLUSH")';
-$strFormat = 'Formát';
$strFormEmpty = 'Chybìjící hodnota ve formuláøi!';
+$strFormat = 'Formát';
$strFullText = 'Celé texty';
$strFunction = 'Funkce';
$strGenBy = 'Vygeneroval';
-$strGeneralRelationFeat = 'Obecné funkce relací';
$strGenTime = 'Vygenerováno';
+$strGeneralRelationFeat = 'Obecné funkce relací';
$strGeorgian = 'Gruzín¹tina';
$strGerman = 'Nìmecky';
$strGlobal = 'globální';
@@ -288,8 +291,8 @@ $strHebrew = 'Hebrej¹tina';
$strHexForBinary = 'Binarní pole vypisovat ¹estnáctkovì';
$strHome = 'Hlavní strana';
$strHomepageOfficial = 'Oficiální stránka phpMyAdmina';
-$strHostEmpty = 'Jméno poèítaèe je prázdné!';
$strHost = 'Poèítaè';
+$strHostEmpty = 'Jméno poèítaèe je prázdné!';
$strHungarian = 'Maïar¹tina';
$strIcelandic = 'Island¹tina';
@@ -302,44 +305,48 @@ $strIgnoringFile = 'Ignoruji soubor %s';
$strImportDocSQL = 'Importovat soubory docSQL';
$strImportFiles = 'Importovat soubory';
$strImportFinished = 'Import ukonèen';
-$strIndexes = 'Indexy';
-$strIndexHasBeenDropped = 'Index %s byl odstranìn';
+$strInUse = 'právì se pou¾ívá';
$strIndex = 'Index';
+$strIndexHasBeenDropped = 'Index %s byl odstranìn';
$strIndexName = 'Jméno indexu&nbsp;:';
$strIndexType = 'Typ indexu&nbsp;:';
+$strIndexWarningMultiple = 'Pro sloupec `%s` je vytvoøeno více indexù';
+$strIndexWarningPrimary = 'Sloupec `%s` by nemìl být zárovìò obsa¾en v&nbsp;PRIMARY a INDEX klíèi';
+$strIndexWarningTable = 'Problémy s&nbsp;indexy v&nbsp;tabulce `%s`';
+$strIndexWarningUnique = 'Sloupec `%s` by nemìl být zárovìò obsa¾en v&nbsp;PRIMARY a UNIQUE klíèi';
+$strIndexes = 'Indexy';
$strInnodbStat = 'Stav InnoDB';
$strInsecureMySQL = 'Máte standardní nastavení hesla u¾ivatele root v&nbsp;MySQL. Doporuèujeme zmìnit toto nastavení a tím podstatnì zvý¹it bezpeènost Va¹eho serveru.';
+$strInsert = 'Vlo¾it';
$strInsertAsNewRow = 'Vlo¾it jako nový øádek';
$strInsertBookmarkTitle = 'Prosím zadejte název oblíbené polo¾ky';
-$strInsertedRowId = 'Id vlo¾eného øádku:';
-$strInsertedRows = 'Vlo¾eno øádkù:';
$strInsertNewRow = 'Vlo¾it nový øádek';
$strInsertTextfiles = 'Vlo¾it textové soubory do tabulky';
-$strInsert = 'Vlo¾it';
+$strInsertedRowId = 'Id vlo¾eného øádku:';
+$strInsertedRows = 'Vlo¾eno øádkù:';
$strInstructions = 'Instrukce';
$strInternalNotNecessary = '* Interní relace není potøebná, pokud ji¾ relace existuje v InnoDB.';
$strInternalRelations = 'Interní relace';
-$strInUse = 'právì se pou¾ívá';
$strJapanese = 'Japon¹tina';
$strJumpToDB = 'Na databázi &quot;%s&quot;.';
-$strJustDeleteDescr = 'Odstranìní u¾ivatelé stále budou mít pøistup na server dokud nebudou znovunaètena oprávnìní.';
$strJustDelete = 'Jen odstranit u¾ivatele z tabulek s oprávnìními.';
+$strJustDeleteDescr = 'Odstranìní u¾ivatelé stále budou mít pøistup na server dokud nebudou znovunaètena oprávnìní.';
$strKeepPass = 'Nemìnit heslo';
$strKeyname = 'Klíèový název';
$strKill = 'Ukonèit';
$strKorean = 'Korej¹tina';
+$strLaTeX = 'LaTeX';
+$strLaTeXOptions = 'Nastavení exportu do LaTeXu';
$strLandscape = 'Na ¹íøku';
$strLatexCaption = 'Titulek tabulky';
$strLatexContent = 'Obsah tabulky __TABLE__';
-$strLatexContinuedCaption = 'Titulek pokraèování tabulky';
$strLatexContinued = '(pokraèování)';
+$strLatexContinuedCaption = 'Titulek pokraèování tabulky';
$strLatexIncludeCaption = 'Pou¾ít titulek tabulky';
$strLatexLabel = 'Návìstí';
-$strLaTeX = 'LaTeX';
-$strLaTeXOptions = 'Nastavení exportu do LaTeXu';
$strLatexStructure = 'Struktura tabulky __TABLE__';
$strLatvian = 'Loty¹¹tina';
$strLengthSet = 'Délka/Mno¾ina*';
@@ -353,31 +360,33 @@ $strLoadExplanation = 'Automaticky jsou zvoleny nejvhodnìj¹í parametry, pokud to
$strLoadMethod = 'Parametry pro pøíkaz LOAD';
$strLocalhost = 'Lokální';
$strLocationTextfile = 'textový soubor';
-$strLoginInformation = 'Pøihla¹ování';
-$strLogin = 'Pøihlá¹ení';
-$strLogout = 'Odhlásit se';
$strLogPassword = 'Heslo:';
$strLogServer = 'Server';
$strLogUsername = 'Jméno:';
+$strLogin = 'Pøihlá¹ení';
+$strLoginInformation = 'Pøihla¹ování';
+$strLogout = 'Odhlásit se';
-$strMaximumSize = 'Maximální velikost: %s%s';
+$strMIMETypesForTable = 'MIME TYPY PRO TABULKU';
+$strMIME_MIMEtype = 'MIME typ';
$strMIME_available_mime = 'Dostupné MIME typy';
$strMIME_available_transform = 'Dostupné transformace';
$strMIME_description = 'Popis';
-$strMIME_MIMEtype = 'MIME typ';
$strMIME_nodescription = 'Pro tuto transformaci není dostupný ¾ádný popis.<br />Zeptejte se autora co %s dìlá.';
+$strMIME_transformation = 'Transformace pøi prohlí¾ení';
$strMIME_transformation_note = 'Pro seznam dostupných parametrù transformací a jejich MIME typù kliknìte na %spopisy transformací%s';
-$strMIME_transformation_options_note = 'Zadejte parametry transformací v&nbsp;následujícím tvaru: \'a\',\'b\',\'c\'...<br />Pokud potøebujete pou¾ít zpìtné lomítko ("\") nebo jednoduché uvozovky ("\'") mezi tìmito hodnotami, vlo¾te pøed nì zpìtné lomítko (napøíklad \'\\\\xyz\' nebo \'a\\\'b\').';
$strMIME_transformation_options = 'Parametry transformace';
-$strMIME_transformation = 'Transformace pøi prohlí¾ení';
-$strMIMETypesForTable = 'MIME TYPY PRO TABULKU';
+$strMIME_transformation_options_note = 'Zadejte parametry transformací v&nbsp;následujícím tvaru: \'a\',\'b\',\'c\'...<br />Pokud potøebujete pou¾ít zpìtné lomítko ("\") nebo jednoduché uvozovky ("\'") mezi tìmito hodnotami, vlo¾te pøed nì zpìtné lomítko (napøíklad \'\\\\xyz\' nebo \'a\\\'b\').';
$strMIME_without = 'MIME typy zobrazené kurzívou nemají vlastní transformaèní funkci';
+$strMaximumSize = 'Maximální velikost: %s%s';
+$strMbExtensionMissing = 'Roz¹íøení mbstring pro PHP nebylo nalezeno a zdá se, ¾e po¾íváte vícebajtovou znakovou sadu. Bez roz¹íøení mbstring neumí phpMyAdmin správnì rozdìlovat øetìzce a proto to mù¾e mít neèekané následky.';
+$strMbOverloadWarning = 'V&nbsp;nastavení PHP máte zapnuto mbstring.func_overload. Toto nastavení není kompatibilní s&nbsp;phpMyAdminem a mù¾e zpùsobit po¹kození dat!';
$strModifications = 'Zmìny byly ulo¾eny';
-$strModifyIndexTopic = 'Upravit index';
$strModify = 'Úpravy';
+$strModifyIndexTopic = 'Upravit index';
$strMoreStatusVars = 'Dal¹í informace o&nbsp;stavu';
-$strMoveTableOK = 'Tabulka %s byla pøesunuta do %s.';
$strMoveTable = 'Pøesunout tabulku do (databáze<b>.</b>tabulka):';
+$strMoveTableOK = 'Tabulka %s byla pøesunuta do %s.';
$strMoveTableSameNames = 'Nelze pøesunout tabulku na sebe samu!';
$strMultilingual = 'mnohojazyèný';
$strMustSelectFile = 'Zvolte soubor, který chcete vlo¾it.';
@@ -393,17 +402,17 @@ $strMySQLShowVars = 'Ukázat systémové promìnné MySQL';
$strName = 'Název';
$strNeedPrimaryKey = 'Pro tuto tabulku byste mìli definovat primární klíè.';
$strNext = 'Dal¹í';
-$strNoDatabasesSelected = 'Nebyla vybrána ¾ádná databáze.';
+$strNo = 'Ne';
+$strNoActivity = 'Byli jste pøíli¹ dlouho neaktivní (déle ne¾ %s sekund), prosím pøihla¹te se znovu';
$strNoDatabases = '®ádné databáze';
+$strNoDatabasesSelected = 'Nebyla vybrána ¾ádná databáze.';
$strNoDescription = '¾ádný popisek';
$strNoDropDatabases = 'Pøíkaz "DROP DATABASE" je vypnutý.';
$strNoExplain = 'Bez vysvìtlení (EXPLAIN) SQL';
$strNoFrames = 'phpMyAdmin se lépe pou¾ívá v&nbsp;prohlí¾eèi podporujícím rámy ("FRAME").';
-$strNoIndexPartsDefined = '®ádná èást indexu nebyla definována!';
$strNoIndex = '®ádný index nebyl definován!';
+$strNoIndexPartsDefined = '®ádná èást indexu nebyla definována!';
$strNoModification = '®ádná zmìna';
-$strNo = 'Ne';
-$strNone = '®ádná';
$strNoOptions = 'Tento formát nemá ¾ádná nastavení';
$strNoPassword = '®ádné heslo';
$strNoPermission = 'Web server nemá oprávnìní ulo¾it výpis do souboru %s.';
@@ -415,19 +424,20 @@ $strNoRowsSelected = 'Nebyla vybrán ¾ádný øádek';
$strNoSpace = 'Nedostatek místa pro ulo¾ení souboru %s.';
$strNoTablesFound = 'V&nbsp;databázi nebyla nalezena ¾ádná tabulka.';
$strNoThemeSupport = 'Není podporována zmìna tématu, zkontrolujte nastavení a témata v adresáøi %s.';
+$strNoUsersFound = '®ádný u¾ivatel nenalezen.';
+$strNoValidateSQL = 'Bez kontroly SQL';
+$strNone = '®ádná';
$strNotNumber = 'Nebylo zadáno èíslo!';
$strNotOK = 'není v poøádku';
$strNotSet = '<b>%s</b> tabulka nenalezena nebo není nastavena v&nbsp;%s';
$strNotValidNumber = ' není platné èíslo øádku!';
-$strNoUsersFound = '®ádný u¾ivatel nenalezen.';
-$strNoValidateSQL = 'Bez kontroly SQL';
$strNull = 'Nulový';
$strNumSearchResultsInTable = '%s odpovídající(ch) záznam(ù) v&nbsp;tabulce <i>%s</i>';
$strNumSearchResultsTotal = '<b>Celkem:</b> <i>%s</i> odpovídající(ch) záznam(ù)';
$strNumTables = 'Tabulek';
-$strOftenQuotation = 'Èasto uvozující znaky. Volitelnì znamená, ¾e pouze polo¾ky u kterých je to nutné (obvykle typu CHAR a VARCHAR) jsou uzavøeny do uzavíracích znakù.';
$strOK = 'OK';
+$strOftenQuotation = 'Èasto uvozující znaky. Volitelnì znamená, ¾e pouze polo¾ky u kterých je to nutné (obvykle typu CHAR a VARCHAR) jsou uzavøeny do uzavíracích znakù.';
$strOperations = 'Úpravy';
$strOperator = 'Operátor';
$strOptimizeTable = 'Optimalizovat tabulku';
@@ -437,12 +447,15 @@ $strOr = 'nebo';
$strOverhead = 'Navíc';
$strOverwriteExisting = 'Pøepsat existující soubor(y)';
+$strPHP40203 = 'Pou¾íváte PHP 4.2.3, které má záva¾nou chybu pøi práci s&nbsp;vícebajtovými znaky (mbstring), jedná se o&nbsp;chybu PHP èíslo 19404. Nedoporuèujeme pou¾ívat tuto verzi PHP s&nbsp;phpMyAdminem.';
+$strPHPVersion = 'Verze PHP';
$strPageNumber = 'Strana èíslo:';
$strPaperSize = 'Velikost stránky';
$strPartialText = 'Zkrácené texty';
+$strPassword = 'Heslo';
$strPasswordChanged = 'Heslo pro %s bylo úspì¹nì zmìnìno.';
$strPasswordEmpty = 'Heslo je prázdné!';
-$strPassword = 'Heslo';
+$strPasswordHashing = 'Ha¹ovací funkce pro heslo';
$strPasswordNotSame = 'Hesla nejsou stejná!';
$strPdfDbSchema = 'Schéma databáze "%s" - Strana %s';
$strPdfInvalidTblName = 'Tabulka "%s" neexistuje!';
@@ -452,8 +465,6 @@ $strPerMinute = 'za minutu';
$strPerSecond = 'za sekundu';
$strPersian = 'Per¹tina';
$strPhoneBook = 'adresáø';
-$strPHP40203 = 'Pou¾íváte PHP 4.2.3, které má záva¾nou chybu pøi práci s&nbsp;vícebajtovými znaky (mbstring), jedná se o&nbsp;chybu PHP èíslo 19404. Nedoporuèujeme pou¾ívat tuto verzi PHP s&nbsp;phpMyAdminem.';
-$strPHPVersion = 'Verze PHP';
$strPhp = 'Zobrazit PHP kód';
$strPmaDocumentation = 'Dokumentace phpMyAdmina';
$strPmaUriError = 'Parametr <tt>$cfg[\'PmaAbsoluteUri\']</tt> MUSÍ být nastaven v&nbsp;konfiguraèním souboru!';
@@ -461,13 +472,13 @@ $strPolish = 'Pol¹tina';
$strPortrait = 'Na vý¹ku';
$strPos1 = 'Zaèátek';
$strPrevious = 'Pøedchozí';
+$strPrimary = 'Primární';
$strPrimaryKeyHasBeenDropped = 'Primární klíè byl odstranìn';
$strPrimaryKeyName = 'Jméno primárního klíèe musí být "PRIMARY"!';
$strPrimaryKeyWarning = '("PRIMARY" <b>musí</b> být jméno <b>pouze</b> primárního klíèe!)';
-$strPrimary = 'Primární';
-$strPrintViewFull = 'Náhled k vyti¹tìní (s&nbsp;kompletními texty)';
-$strPrintView = 'Náhled k vyti¹tìní';
$strPrint = 'Vytisknout';
+$strPrintView = 'Náhled k vyti¹tìní';
+$strPrintViewFull = 'Náhled k vyti¹tìní (s&nbsp;kompletními texty)';
$strPrivDescAllPrivileges = 'V¹echna oprávnìní kromì GRANT.';
$strPrivDescAlter = 'Umo¾òuje mìnit strukturu existujících tabulek.';
$strPrivDescCreateDb = 'Umo¾òuje vytváøet nové databáze a tabulky.';
@@ -502,8 +513,8 @@ $strPrivilegesReloaded = 'Oprávnìní byla znovunaètena úspì¹nì.';
$strProcesslist = 'Seznam procesù';
$strPutColNames = 'Pøidat jména sloupcù na první øádek';
-$strQBEDel = 'smazat';
$strQBE = 'Dotaz';
+$strQBEDel = 'smazat';
$strQBEIns = 'pøidat';
$strQueryFrame = 'SQL okno';
$strQueryOnDb = 'SQL dotaz na databázi <b>%s</b>:';
@@ -513,51 +524,63 @@ $strQueryTime = 'Dotaz zabral %01.4f sekund';
$strQueryType = 'Typ dotazu';
$strQueryWindowLock = 'Nepøepisovat tento dotaz z&nbsp;hlavního okna';
+$strReType = 'Heslo znovu';
$strReceived = 'Pøijato';
$strRecords = 'Záznamù';
$strReferentialIntegrity = 'Zkontrolovat integritu odkazù:';
$strRefresh = 'Obnovit';
-$strRelationalSchema = 'Relaèní schéma';
$strRelationNotWorking = 'Nìkteré z&nbsp;roz¹íøených funkcí phpMyAdmina nelze pou¾ívat. %sZde%s zjistíte proè.';
-$strRelationsForTable = 'RELACE PRO TABULKU';
-$strRelations = 'Relace';
$strRelationView = 'Zobrazit relace';
+$strRelationalSchema = 'Relaèní schéma';
+$strRelations = 'Relace';
+$strRelationsForTable = 'RELACE PRO TABULKU';
$strReloadFailed = 'Znovunaètení MySQL selhalo.';
-$strReloadingThePrivileges = 'Znovunaèítám oprávnìní';
$strReloadMySQL = 'Znovunaètení MySQL';
+$strReloadingThePrivileges = 'Znovunaèítám oprávnìní';
$strRemoveSelectedUsers = 'Odstranit vybrané u¾ivatele';
$strRenameDatabaseOK = 'Databáze %s byla pøejmenována na %s';
-$strRenameTableOK = 'Tabulka %s byla pøejmenována na %s';
$strRenameTable = 'Pøejmenovat tabulku na';
+$strRenameTableOK = 'Tabulka %s byla pøejmenována na %s';
$strRepairTable = 'Opravit tabulku';
-$strReplaceNULLBy = 'Nahradit NULL hodnoty';
$strReplace = 'Pøepsat';
+$strReplaceNULLBy = 'Nahradit NULL hodnoty';
$strReplaceTable = 'Pøepsat data tabulky souborem';
$strReset = 'Pùvodní';
$strResourceLimits = 'Omezení zdrojù';
-$strReType = 'Heslo znovu';
-$strRevokeAndDeleteDescr = 'U¾ivatelé budou mít oprávnìní "USAGE" (pou¾ívání) dokud nebudou znovunaètena oprávnìní.';
+$strRevoke = 'Zru¹it';
$strRevokeAndDelete = 'Odebrat u¾ivatelùm ve¹kerá oprávnìní a poté je odstranit z tabulek.';
+$strRevokeAndDeleteDescr = 'U¾ivatelé budou mít oprávnìní "USAGE" (pou¾ívání) dokud nebudou znovunaètena oprávnìní.';
$strRevokeMessage = 'Byla zru¹ena práva pro %s';
-$strRevoke = 'Zru¹it';
$strRomanian = 'Rumun¹tina';
$strRowLength = 'Délka øádku';
-$strRowsFrom = 'øádkù zaèínající od';
$strRowSize = ' Velikost øádku ';
+$strRows = 'Øádkù';
+$strRowsFrom = 'øádkù zaèínající od';
$strRowsModeFlippedHorizontal = 'vodorovném (otoèené hlavièky)';
$strRowsModeHorizontal = 'vodorovném';
$strRowsModeOptions = 've %s re¾imu a opakovat hlavièky po %s øádcích.';
$strRowsModeVertical = 'svislém';
-$strRows = 'Øádkù';
$strRowsStatistic = 'Statistika øádkù';
-$strRunning = 'na %s';
$strRunQuery = 'Provést dotaz';
$strRunSQLQuery = 'Spustit SQL dotaz(y) na databázi %s';
+$strRunning = 'na %s';
$strRussian = 'Ru¹tina';
-$strSaveOnServer = 'Ulo¾it na serveru v adresáøi %s';
+$strSQL = 'SQL';
+$strSQLExportCompatibility = 'Kompatibilita SQL exportu';
+$strSQLExportType = 'Typ vytvoøených dotazù';
+$strSQLOptions = 'Nastavení SQL exportu';
+$strSQLParserBugMessage = 'Je mo¾né, ¾e jste na¹li chybu v&nbsp;SQL parseru. Prosím prozkoumejte podrobnì SQL dotaz, pøedev¹ím jestli jsou správnì uvozovky a jestli nejsou proházené. Dal¹í mo¾nost selhání je pokud nahráváte soubor s&nbsp;binárními daty nezapsanými v&nbsp;uvozovkách. Mù¾ete také vyzkou¹et pøíkazovou øádku MySQL. Ní¾e uvedený výstup z&nbsp;MySQL serveru (pokud je nìjaký) Vám také mù¾e pomoci pøi zkoumání problému. Pokud stále máte problémy nebo pokud SQL parser ohlásí chybu u dotazu, který na pøíkazové øádce funguje, prosím pokuste se zredukovat dotaz na co nejmen¹í, ve kterém se problém je¹tì vyskytne, a ohlaste chybu na stránkách phpMyAdmina spolu se sekcí VÝPIS uvedenou ní¾e:';
+$strSQLParserUserError = 'Pravdìpodobnì máte v&nbsp;SQL dotazu chybu. Ní¾e uvedený výstup MySQL serveru (pokud je nìjaký) Vám také mù¾e pomoci pøi zkoumání problému';
+$strSQLQuery = 'SQL-dotaz';
+$strSQLResult = 'Výsledek SQL dotazu';
+$strSQPBugInvalidIdentifer = 'Chybný identifikátor';
+$strSQPBugUnclosedQuote = 'Neuzavøené uvozovky';
+$strSQPBugUnknownPunctuation = 'Neznámé interpunkèní znaménko';
$strSave = 'Ulo¾';
+$strSaveOnServer = 'Ulo¾it na serveru v adresáøi %s';
$strScaleFactorSmall = 'Mìøítko je pøíli¹ malé, aby se schéma ve¹lo na jednu stránku';
+$strSearch = 'Vyhledávání';
$strSearchFormTitle = 'Vyhledávání v&nbsp;databázi';
$strSearchInTables = 'V&nbsp;tabulkách:';
$strSearchNeedle = 'Slova nebo hodnoty, které chcete vyhledat (zástupný znak: "%"):';
@@ -567,7 +590,6 @@ $strSearchOption3 = 'pøesnou frázi';
$strSearchOption4 = 'jako regulární výraz';
$strSearchResultsFor = 'Výsledky vyhledávání pro "<i>%s</i>" %s:';
$strSearchType = 'Najít:';
-$strSearch = 'Vyhledávání';
$strSecretRequired = 'Nastavte klíè pro ¹ifrování cookies (blowfish_secret) v&nbsp;konfiguraèním souboru (config.inc.php).';
$strSelectADb = 'Prosím vyberte databázi';
$strSelectAll = 'Vybrat v¹e';
@@ -577,9 +599,9 @@ $strSelectNumRows = 'v&nbsp;dotazu';
$strSelectTables = 'Vybrat tabulky';
$strSend = 'Do souboru';
$strSent = 'Odesláno';
+$strServer = 'Server';
$strServerChoice = 'Výbìr serveru';
$strServerNotResponding = 'Server neodpovídá';
-$strServer = 'Server';
$strServerStatus = 'Stav serveru';
$strServerStatusUptime = 'Tento MySQL server bì¾í %s. Èas spu¹tìní: %s.';
$strServerTabProcesslist = 'Procesy';
@@ -589,41 +611,31 @@ $strServerVars = 'Promìnné a nastavení serveru';
$strServerVersion = 'Verze MySQL';
$strSessionValue = 'Hodnota sezení';
$strSetEnumVal = 'Pokud je sloupec typu "enum" nebo "set", zadávejte hodnoty v&nbsp;následujícím formátu: \'a\',\'b\',\'c\'...<br />Pokud potøebujete zadat zpìtné lomítko ("\") nebo jednoduché uvozovky ("\'") mezi tìmito hodnotami, napi¹te pøed nì zpìtné lomítko (pøíklad: \'\\\\xyz\' nebo \'a\\\'b\').';
+$strShow = 'Zobrazit';
$strShowAll = 'Zobrazit v¹e';
$strShowColor = 'Barevné ¹ipky';
$strShowDatadictAs = 'Formát datového slovníku';
$strShowFullQueries = 'Zobrazit celé dotazy';
$strShowGrid = 'Zobrazit møí¾ku';
-$strShowingRecords = 'Zobrazeny záznamy';
$strShowPHPInfo = 'Zobrazit informace o&nbsp;PHP';
$strShowTableDimension = 'Rozmìry tabulek';
$strShowTables = 'Zobrazit tabulky';
$strShowThisQuery = 'Zobrazit zde tento dotaz znovu';
-$strShow = 'Zobrazit';
+$strShowingRecords = 'Zobrazeny záznamy';
$strSimplifiedChinese = 'Zjednodu¹ená èín¹tina';
$strSingly = '(po jednom)';
$strSize = 'Velikost';
$strSlovak = 'Sloven¹tina';
$strSlovenian = 'Slovin¹tina';
-$strSortByKey = 'Setøídit podle klíèe';
$strSort = 'Øadit';
+$strSortByKey = 'Setøídit podle klíèe';
$strSpaceUsage = 'Vyu¾ití místa';
$strSpanish = '©panìl¹tina';
$strSplitWordsWithSpace = 'Slova jsou oddìlena mezerou (" ").';
-$strSQLExportType = 'Typ vytvoøených dotazù';
-$strSQLOptions = 'Nastavení SQL exportu';
-$strSQLParserBugMessage = 'Je mo¾né, ¾e jste na¹li chybu v&nbsp;SQL parseru. Prosím prozkoumejte podrobnì SQL dotaz, pøedev¹ím jestli jsou správnì uvozovky a jestli nejsou proházené. Dal¹í mo¾nost selhání je pokud nahráváte soubor s&nbsp;binárními daty nezapsanými v&nbsp;uvozovkách. Mù¾ete také vyzkou¹et pøíkazovou øádku MySQL. Ní¾e uvedený výstup z&nbsp;MySQL serveru (pokud je nìjaký) Vám také mù¾e pomoci pøi zkoumání problému. Pokud stále máte problémy nebo pokud SQL parser ohlásí chybu u dotazu, který na pøíkazové øádce funguje, prosím pokuste se zredukovat dotaz na co nejmen¹í, ve kterém se problém je¹tì vyskytne, a ohlaste chybu na stránkách phpMyAdmina spolu se sekcí VÝPIS uvedenou ní¾e:';
-$strSQLParserUserError = 'Pravdìpodobnì máte v&nbsp;SQL dotazu chybu. Ní¾e uvedený výstup MySQL serveru (pokud je nìjaký) Vám také mù¾e pomoci pøi zkoumání problému';
-$strSQLQuery = 'SQL-dotaz';
-$strSQLResult = 'Výsledek SQL dotazu';
-$strSQL = 'SQL';
-$strSQPBugInvalidIdentifer = 'Chybný identifikátor';
-$strSQPBugUnclosedQuote = 'Neuzavøené uvozovky';
-$strSQPBugUnknownPunctuation = 'Neznámé interpunkèní znaménko';
$strStatCheckTime = 'Poslední kontrola';
$strStatCreateTime = 'Vytvoøení';
-$strStatement = 'Údaj';
$strStatUpdateTime = 'Poslední zmìna';
+$strStatement = 'Údaj';
$strStatus = 'Stav';
$strStrucCSV = 'CSV data';
$strStrucData = 'Strukturu a data';
@@ -640,6 +652,7 @@ $strSwedish = '©véd¹tina';
$strSwitchToDatabase = 'Pøepnout na zkopírovanou databázi';
$strSwitchToTable = 'Pøepnout na zkopírovanou tabulku';
+$strTable = 'Tabulka';
$strTableComments = 'Komentáø k tabulce';
$strTableEmpty = 'Jméno tabulky je prázdné!';
$strTableHasBeenDropped = 'Tabulka %s byla odstranìna';
@@ -648,18 +661,17 @@ $strTableHasBeenFlushed = 'Vyrovnávací pamì» pro tabulku %s byla vyprázdnìna';
$strTableMaintenance = ' Údr¾ba tabulky ';
$strTableOfContents = 'Obsah';
$strTableOptions = 'Parametry tabulky';
-$strTables = '%s tabulek';
$strTableStructure = 'Struktura tabulky';
-$strTable = 'Tabulka';
$strTableType = 'Typ tabulky';
+$strTables = '%s tabulek';
$strTakeIt = 'zvolit';
$strTblPrivileges = 'Oprávnìní pro jednotlivé tabulky';
$strTextAreaLength = 'Tento sloupec mo¾ná nepùjde <br />(kvùli délce) upravit ';
$strThai = 'Thaj¹tina';
$strTheContent = 'Obsah souboru byl vlo¾en';
$strTheContents = 'Obsah souboru pøepí¹e obsah zvolené tabulky v&nbsp;tìch øádcích, kde je stejný primární nebo unikátní klíè.';
-$strTheme = 'Vzhled';
$strTheTerminator = 'Sloupce jsou oddìleny tímto znakem.';
+$strTheme = 'Vzhled';
$strThisHost = 'Tento poèítaè';
$strThisNotDirectory = 'Nebyl zadán adresáø';
$strThreadSuccessfullyKilled = 'Vlákno %s bylo úspì¹nì zabito.';
@@ -691,14 +703,19 @@ $strUnicode = 'Unicode';
$strUnique = 'Unikátní';
$strUnknown = 'neznámý';
$strUnselectAll = 'Odznaèit v¹e';
+$strUpdComTab = 'Podívejte se prosím do dokumentace, jak aktualizovat tabulku s&nbsp;informacemi o&nbsp; sloupcích (tabulka column_comments)';
$strUpdatePrivMessage = 'Byla aktualizována oprávnìní pro %s.';
$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¹¹í.';
$strUsage = 'Pou¾ívá';
$strUseBackquotes = 'Pou¾ít zpìtné uvozovky u&nbsp;jmen tabulek a sloupcù';
$strUseHostTable = 'Pou¾ít tabulku s&nbsp;poèítaèi';
+$strUseTabKey = 'Pou¾ijte klávesu TAB pro pohyb mezi hodnotami nebo CTRL+¹ipky po pohyb v¹emi smìry.';
+$strUseTables = 'Pou¾ít tabulky';
+$strUseTextField = 'Pou¾ít textové pole';
+$strUseThisValue = 'Pou¾ít tuto hodnotu';
+$strUser = 'U¾ivatel';
$strUserAlreadyExists = 'U¾ivatel %s ji¾ existuje!';
$strUserEmpty = 'Jméno u¾ivatele je prázdné!';
$strUserName = 'Jméno u¾ivatele';
@@ -706,22 +723,17 @@ $strUserNotFound = 'Zvolený u¾ivatel nebyl nalezen v&nbsp;tabulce oprávnìní.';
$strUserOverview = 'Pøehled u¾ivatelù';
$strUsersDeleted = 'Vybraní u¾ivatelé byli úspì¹nì odstranìni.';
$strUsersHavingAccessToDb = 'U¾ivatelé mající pøístup k&nbsp;&quot;%s&quot;';
-$strUser = 'U¾ivatel';
-$strUseTabKey = 'Pou¾ijte klávesu TAB pro pohyb mezi hodnotami nebo CTRL+¹ipky po pohyb v¹emi smìry.';
-$strUseTables = 'Pou¾ít tabulky';
-$strUseTextField = 'Pou¾ít textové pole';
-$strUseThisValue = 'Pou¾ít tuto hodnotu';
$strValidateSQL = 'Zkontrolovat SQL';
$strValidatorError = 'SQL validátor nemohl být inicializován. Prosím zkontrolujte, jestli máte po¾adovaná roz¹íøení PHP, která jsou uvedena v&nbsp;%sdokumentaci%s.';
$strValue = 'Hodnota';
$strVar = 'Promìnná';
-$strViewDumpDatabases = 'Export databází';
-$strViewDumpDB = 'Export databáze';
$strViewDump = 'Export tabulky';
+$strViewDumpDB = 'Export databáze';
+$strViewDumpDatabases = 'Export databází';
-$strWebServerUploadDirectoryError = 'Adresáø urèený pro upload souborù nemohl být otevøen';
$strWebServerUploadDirectory = 'soubor z&nbsp;adresáøe pro upload';
+$strWebServerUploadDirectoryError = 'Adresáø urèený pro upload souborù nemohl být otevøen';
$strWelcome = 'Vítejte v&nbsp;%s';
$strWestEuropean = 'Západní Evropa';
$strWildcard = 'maska';
@@ -738,10 +750,4 @@ $strYes = 'Ano';
$strZeroRemovesTheLimit = 'Poznámka: Nastavení tìchto parametrù na 0 (nulu) odstraní omezení.';
$strZip = '"zazipováno"';
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
?>
diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php
index b5caa0e211..71935f961d 100644
--- a/lang/czech-utf-8.inc.php
+++ b/lang/czech-utf-8.inc.php
@@ -24,18 +24,17 @@ $datefmt = '%a %d. %b %Y, %H:%M';
$timespanfmt = '%s dnů, %s hodin, %s minut a %s sekund';
+$strAPrimaryKey = 'V&nbsp;tabulce %s byl vytvoÅ™en primární klíÄ';
$strAbortedClients = 'Přerušené';
$strAbsolutePathToDocSqlDir = 'docSQL adresář';
-$strAccessDeniedExplanation = 'phpMyAdmin se pokusil připojit k&nbsp;MySQL serveru, a ten odmítl připojení. Zkontrolujte jméno serveru, uživatelské jméno a heslo v&nbsp;souboru config.inc.php a ujistěte se, že jsou totožné s&nbsp;těmi, které máte od administrátora MySQL serveru.';
$strAccessDenied = 'Přístup odepřen';
+$strAccessDeniedExplanation = 'phpMyAdmin se pokusil připojit k&nbsp;MySQL serveru, a ten odmítl připojení. Zkontrolujte jméno serveru, uživatelské jméno a heslo v&nbsp;souboru config.inc.php a ujistěte se, že jsou totožné s&nbsp;těmi, které máte od administrátora MySQL serveru.';
$strAction = 'Akce';
$strAddAutoIncrement = 'Přidat hodnotu AUTO_INCREMENT';
$strAddConstraints = 'Přidat integritní omezení';
$strAddDeleteColumn = 'Přidat nebo odebrat sloupec';
$strAddDeleteRow = 'Přidat nebo odebrat řádek';
$strAddDropDatabase = 'Přidat DROP DATABASE';
-$strAddedColumnComment = 'Přidán komentář ke sloupci';
-$strAddedColumnRelation = 'Přidána relace pro sloupec';
$strAddFields = 'Přidat %s položek';
$strAddHeaderComment = 'PÅ™idat vlastní komentář do hlaviÄky (\\n oddÄ›luje řádky)';
$strAddIfNotExists = 'Přidat IF NOT EXISTS';
@@ -45,24 +44,27 @@ $strAddPrivilegesOnDb = 'Přidat oprávnění pro databázi';
$strAddPrivilegesOnTbl = 'Přidat oprávnění pro tabulku';
$strAddSearchConditions = 'PÅ™idat vyhledávací parametry (Äást dotazu po příkazu "WHERE"):';
$strAddToIndex = 'Přidat %s sloupců do indexu';
-$strAddUserMessage = 'Uživatel byl přidán.';
$strAddUser = 'Přidat nového uživatele';
+$strAddUserMessage = 'Uživatel byl přidán.';
+$strAddedColumnComment = 'Přidán komentář ke sloupci';
+$strAddedColumnRelation = 'Přidána relace pro sloupec';
$strAdministration = 'Správa';
$strAffectedRows = 'Ovlivněné řádky:';
+$strAfter = 'Po %s';
$strAfterInsertBack = 'Návrat na předchozí stránku';
$strAfterInsertNewInsert = 'Vložit další řádek';
+$strAfterInsertNext = 'Upravit následující řádek';
$strAfterInsertSame = 'Návrat na tuto stránku';
-$strAfter = 'Po %s';
-$strAllTableSameWidth = 'Použít pro všechny tabulky stejnou šířku';
$strAll = 'VÅ¡echno';
+$strAllTableSameWidth = 'Použít pro všechny tabulky stejnou šířku';
$strAlterOrderBy = 'Změnit pořadí tabulky podle';
+$strAnIndex = 'K&nbsp;tabulce %s byl přidán index';
$strAnalyzeTable = 'Analyzovat tabulku';
$strAnd = 'a';
-$strAnIndex = 'K&nbsp;tabulce %s byl přidán index';
-$strAnyHost = 'Jakýkoliv poÄítaÄ';
$strAny = 'Jakýkoliv';
+$strAnyHost = 'Jakýkoliv poÄítaÄ';
$strAnyUser = 'Jakýkoliv uživatel';
-$strAPrimaryKey = 'V&nbsp;tabulce %s byl vytvoÅ™en primární klíÄ';
+$strApproximateCount = 'Může být nepřesné, viz FAQ 3.11';
$strArabic = 'Arabština';
$strArmenian = 'Arménština';
$strAscending = 'VzestupnÄ›';
@@ -76,15 +78,15 @@ $strBack = 'Zpět';
$strBaltic = 'Baltické';
$strBeginCut = 'ZAÄŒÃTEK VÃPISU';
$strBeginRaw = 'ZAÄŒÃTEK VÃPISU';
-$strBinary = ' Binární ';
-$strBinaryDoNotEdit = ' Binární - neupravujte ';
-$strBinaryLog = 'Binární log';
$strBinLogEventType = 'Typ události';
$strBinLogInfo = 'Informace';
$strBinLogName = 'Jméno logu';
$strBinLogOriginalPosition = 'Původní pozice';
$strBinLogPosition = 'Pozice';
$strBinLogServerId = 'ID serveru';
+$strBinary = ' Binární ';
+$strBinaryDoNotEdit = ' Binární - neupravujte ';
+$strBinaryLog = 'Binární log';
$strBookmarkAllUsers = 'Umožnit všem uživatelům používat tuto položku';
$strBookmarkDeleted = 'Položka byla smazána z&nbsp;oblíbených.';
$strBookmarkLabel = 'Název';
@@ -92,12 +94,13 @@ $strBookmarkOptions = 'Nastavení oblíbeného dotazu';
$strBookmarkQuery = 'Oblíbený SQL dotaz';
$strBookmarkThis = 'Přidat tento SQL dotaz do oblíbených';
$strBookmarkView = 'Jen zobrazit';
-$strBrowseForeignValues = 'Projít hodnoty cizích klíÄů';
$strBrowse = 'Projít';
+$strBrowseForeignValues = 'Projít hodnoty cizích klíÄů';
$strBulgarian = 'Bulharština';
$strBzError = 'phpMyAdminovi se nepodaÅ™ilo zkomprimovat výpis, protože rozšíření pro kompresi bz2 je v&nbsp;této verzi PHP chybné. DoporuÄujeme tuto kompresi vypnout (nastavit <code>$cfg[\'BZipDump\']</code> v&nbsp;nastaveních phpMyAdmina na <code>FALSE</code>). Pokud chcete používat kompresi bz2, mÄ›li byste nainstalovat novÄ›jší verzi PHP. Více informací o&nbsp;tomto problému je u popisu chyby %s.';
$strBzip = '"zabzipováno"';
+$strCSVOptions = 'Nastavení CSV exportu';
$strCalendar = 'Kalendář';
$strCannotLogin = 'Nepodařilo se přihlášení k MySQL serveru';
$strCantLoad = 'nelze nahrát rozšíření %s,<br />zkontrolujte prosím nastavení PHP';
@@ -109,23 +112,23 @@ $strCarriage = 'Návrat vozíku (CR): \\r';
$strCaseInsensitive = 'nerozlišovat velká a malá písmena';
$strCaseSensitive = 'rozlišovat velká a malá písmena';
$strCentralEuropean = 'Střední Evropa';
+$strChange = 'Změnit';
+$strChangeCopyMode = 'Vytvořit nového uživatele se stejnými oprávněními a ...';
$strChangeCopyModeCopy = '... zachovat původního uživatele.';
$strChangeCopyModeDeleteAndReload = ' ... smazat uživatele a poté znovu naÄíst oprávnÄ›ní.';
$strChangeCopyModeJustDelete = ' ... smazat původního uživatele ze všech tabulek.';
$strChangeCopyModeRevoke = ' ... odebrat všechna oprávnění původnímu uživateli a poté ho smazat.';
-$strChangeCopyMode = 'Vytvořit nového uživatele se stejnými oprávněními a ...';
$strChangeCopyUser = 'Změnit informace o&nbsp;uživateli / Kopírovat uživatele';
$strChangeDisplay = 'Zvolte které sloupce zobrazit';
$strChangePassword = 'Změnit heslo';
-$strChange = 'Změnit';
+$strCharset = 'Znaková sada';
$strCharsetOfFile = 'Znaková sada souboru:';
-$strCharsetsAndCollations = 'Znakové sady a porovnávání';
$strCharsets = 'Znakové sady';
-$strCharset = 'Znaková sada';
+$strCharsetsAndCollations = 'Znakové sady a porovnávání';
$strCheckAll = 'Zaškrtnout vše';
$strCheckOverhead = 'Zaškrtnout neoptimální';
-$strCheckPrivsLong = 'Zkontrolovat oprávnění pro databázi &quot;%s&quot;.';
$strCheckPrivs = 'Zkontrolovat oprávnění';
+$strCheckPrivsLong = 'Zkontrolovat oprávnění pro databázi &quot;%s&quot;.';
$strCheckTable = 'Zkontrolovat tabulku';
$strChoosePage = 'Zvolte stránku, kterou chcete změnit';
$strColComFeat = 'Zobrazuji komentáře sloupců';
@@ -133,8 +136,9 @@ $strCollation = 'Porovnávání';
$strColumnNames = 'Názvy sloupců';
$strColumnPrivileges = 'Oprávnění pro jednotlivé sloupce';
$strCommand = 'Příkaz';
-$strCommentsForTable = 'KOMENTÃŘE PRO TABULKU';
$strComments = 'Komentáře';
+$strCommentsForTable = 'KOMENTÃŘE PRO TABULKU';
+$strCompatibleHashing = 'Kompatibilní s&nbsp;MySQL&nbsp;4.0';
$strCompleteInserts = 'Úplné inserty';
$strCompression = 'Komprese';
$strConfigFileError = 'phpMyAdmin nemohl naÄíst konfiguraÄní soubor!<br />Tato chyba může nastat pokud v&nbsp;nÄ›m PHP najde chybu nebo nemůže tento soubor najít.<br />Po kliknutí na následující odkaz se PHP pokusí přímo interpretovat tento soubor a zobrazí informace o&nbsp;chybÄ›, ke které doÅ¡lo. Pak opravte tuto chybu (nejÄastÄ›ji se jedná o&nbsp;chybÄ›jící stÅ™edník).<br />Pokud získáte prázdnou stránku, vÅ¡echno je v&nbsp;pořádku.';
@@ -149,22 +153,36 @@ $strCopyTable = 'Kopírovat tabulku do (databáze<b>.</b>tabulka):';
$strCopyTableOK = 'Tabulka %s byla zkopírována do %s.';
$strCopyTableSameNames = 'Nelze kopírovat tabulku na sebe samu!';
$strCouldNotKill = 'phpMyAdminovi se nepodaÅ™ilo ukonÄit vlákno %s. PravdÄ›podobnÄ› jeho bÄ›h již skonÄil.';
-$strCreateIndexTopic = 'Vytvořit nový index';
+$strCreate = 'Vytvořit';
$strCreateIndex = 'Vytvořit index na&nbsp;%s&nbsp;sloupcích';
+$strCreateIndexTopic = 'Vytvořit nový index';
$strCreateNewDatabase = 'Vytvořit novou databázi';
$strCreateNewTable = 'Vytvořit novou tabulku v&nbsp;databázi %s';
$strCreatePage = 'Vytvořit novou stránku';
$strCreatePdfFeat = 'Vytváření PDF';
-$strCreate = 'Vytvořit';
$strCreationDates = 'Datum vytvoření, poslední změny a kontroly';
$strCriteria = 'Podmínka';
$strCroatian = 'Chorvatština';
-$strCSVOptions = 'Nastavení CSV exportu';
$strCyrillic = 'Cyrilika';
$strCzech = 'Čeština';
$strCzechSlovak = 'Čeština/Slovenština';
+$strDBComment = 'Komentář k databázi: ';
+$strDBCopy = 'Zkopírovat databázi na';
+$strDBGContext = 'Kontext';
+$strDBGContextID = 'Kontext ID';
+$strDBGHits = 'Zásahů';
+$strDBGLine = 'Řádka';
+$strDBGMaxTimeMs = 'Min. Äas, ms';
+$strDBGMinTimeMs = 'Max. Äas, ms';
+$strDBGModule = 'Modul';
+$strDBGTimePerHitMs = 'Čas/Zásah, ms';
+$strDBGTotalTimeMs = 'Celkový Äas, ms';
+$strDBRename = 'Přejmenovat databázi na';
$strDanish = 'Dánština';
+$strData = 'Data';
+$strDataDict = 'Datový slovník';
+$strDataOnly = ' Jen data';
$strDatabase = 'Databáze';
$strDatabaseEmpty = 'Jméno databáze je prázdné!';
$strDatabaseExportOptions = 'Nastavení exportu databází';
@@ -172,68 +190,53 @@ $strDatabaseHasBeenDropped = 'Databáze %s byla zrušena.';
$strDatabaseNoTable = 'Tato databáze neobsahuje žádné tabulky!';
$strDatabases = 'Databáze';
$strDatabasesDropped = '%s databáze byla úspěšně zrušena.';
+$strDatabasesStats = 'Statistiky databází';
$strDatabasesStatsDisable = 'Skrýt podrobnosti';
$strDatabasesStatsEnable = 'Zobrazit podrobnosti';
$strDatabasesStatsHeavyTraffic = 'Poznámka: Zobrazení podrobností o&nbsp;databázích může způsobit znaÄné zvýšení provozu mezi webserverem a MySQL serverem.';
-$strDatabasesStats = 'Statistiky databází';
-$strData = 'Data';
-$strDataDict = 'Datový slovník';
-$strDataOnly = ' Jen data';
-$strDBComment = 'Komentář k databázi: ';
-$strDBCopy = 'Zkopírovat databázi na';
-$strDBGContextID = 'Kontext ID';
-$strDBGContext = 'Kontext';
-$strDBGHits = 'Zásahů';
-$strDBGLine = 'Řádka';
-$strDBGMaxTimeMs = 'Min. Äas, ms';
-$strDBGMinTimeMs = 'Max. Äas, ms';
-$strDBGModule = 'Modul';
-$strDBGTimePerHitMs = 'Čas/Zásah, ms';
-$strDBGTotalTimeMs = 'Celkový Äas, ms';
$strDbPrivileges = 'Oprávnění pro jednotlivé databáze';
-$strDBRename = 'Přejmenovat databázi na';
$strDbSpecific = 'závislé na databázi';
-$strDefaultValueHelp = 'Výchozí hodnotu zadejte jen jednu hodnotu bez uvozovek a escapování znaků, například: a';
$strDefault = 'Výchozí';
+$strDefaultValueHelp = 'Výchozí hodnotu zadejte jen jednu hodnotu bez uvozovek a escapování znaků, například: a';
$strDefragment = 'Defragmentovat tabulku';
+$strDelOld = 'Aktuální stránka se odkazuje na tabulky, které již neexistují. Chcete odstranit tyto odkazy?';
$strDelayedInserts = 'Používat zpožděné inserty';
-$strDeleteAndFlushDescr = 'Toto je nejÄistší Å™eÅ¡ení, ale naÄítání oprávnÄ›ní může trvat dlouho.';
+$strDelete = 'Smazat';
$strDeleteAndFlush = 'Odstranit uživatele a znovunaÄíst oprávnÄ›ní.';
+$strDeleteAndFlushDescr = 'Toto je nejÄistší Å™eÅ¡ení, ale naÄítání oprávnÄ›ní může trvat dlouho.';
$strDeleted = 'Řádek byl smazán';
$strDeletedRows = 'Smazané řádky:';
-$strDelete = 'Smazat';
$strDeleting = 'Odstraňuji %s';
-$strDelOld = 'Aktuální stránka se odkazuje na tabulky, které již neexistují. Chcete odstranit tyto odkazy?';
$strDescending = 'SestupnÄ›';
$strDescription = 'Popis';
$strDictionary = 'slovník';
-$strDisabled = 'Vypnuto';
$strDisableForeignChecks = 'Vypnout kontrolu cizích klíÄů';
+$strDisabled = 'Vypnuto';
$strDisplayFeat = 'Zobrazení funkcí';
$strDisplayOrder = 'Seřadit podle:';
$strDisplayPDF = 'Zobrazit jako schéma v&nbsp;PDF';
$strDoAQuery = 'Provést "dotaz podle příkladu" (zástupný znak: "%")';
-$strDocu = 'Dokumentace';
$strDoYouReally = 'Opravdu si přejete vykonat příkaz';
-$strDropDatabaseStrongWarning = 'Chystáte se ZRUŠIT celou databázi!';
+$strDocu = 'Dokumentace';
$strDrop = 'Odstranit';
+$strDropDatabaseStrongWarning = 'Chystáte se ZRUŠIT celou databázi!';
$strDropSelectedDatabases = 'Zrušit vybranou databázi';
$strDropUsersDb = 'Odstranit databáze se stejnými jmény jako uživatelé.';
-$strDumpingData = 'Vypisuji data pro tabulku';
$strDumpSaved = 'Výpis byl uložen do souboru %s.';
$strDumpXRows = 'Vypsat %s řádků od %s.';
+$strDumpingData = 'Vypisuji data pro tabulku';
$strDynamic = 'dynamický';
+$strEdit = 'Upravit';
$strEditPDFPages = 'Upravit PDF stránky';
$strEditPrivileges = 'Upravit oprávnění';
-$strEdit = 'Upravit';
$strEffective = 'Efektivní';
-$strEmptyResultSet = 'MySQL vrátil prázdný výsledek (tj. nulový poÄet řádků).';
$strEmpty = 'Vyprázdnit';
+$strEmptyResultSet = 'MySQL vrátil prázdný výsledek (tj. nulový poÄet řádků).';
$strEnabled = 'Zapnuto';
$strEncloseInTransaction = 'Uzavřít příkazy v&nbsp;transakci';
-$strEndCut = 'KONEC VÃPISU';
$strEnd = 'Konec';
+$strEndCut = 'KONEC VÃPISU';
$strEndRaw = 'KONEC VÃPISU';
$strEnglish = 'Anglicky';
$strEnglishPrivileges = 'Poznámka: názvy oprávnění v&nbsp;MySQL jsou uváděny anglicky';
@@ -249,29 +252,29 @@ $strExtendedInserts = 'Rozšířené inserty';
$strExtra = 'Extra';
$strFailedAttempts = 'Nepovedených pokusů';
+$strField = 'Sloupec';
$strFieldHasBeenDropped = 'Sloupec %s byl odstraněn';
+$strFields = 'Sloupce';
$strFieldsEmpty = ' Nebyl zadán poÄet sloupců! ';
$strFieldsEnclosedBy = 'Názvy sloupců uzavřené do';
$strFieldsEscapedBy = 'Názvy sloupců escapovány';
-$strField = 'Sloupec';
-$strFields = 'Sloupce';
$strFieldsTerminatedBy = 'Sloupce oddělené';
$strFileAlreadyExists = 'Soubor %s již na serveru existuje, změňte jméno souboru, nebo zvolte přepsání souboru.';
$strFileCouldNotBeRead = 'Soubor nelze pÅ™eÄíst';
+$strFileNameTemplate = 'Vzor pro jméno souboru';
$strFileNameTemplateHelp = 'Použijte __DB__ pro jméno databáze, __TABLE__ pro jméno tabulky a jakékoliv parametry pro %sfunkci strftime%s pro vložení data. Přípona souboru bude automaticky přidána podle typu. Jakýkoliv jiný text bude zachován.';
$strFileNameTemplateRemember = 'zapamatovat si hodnotu';
-$strFileNameTemplate = 'Vzor pro jméno souboru';
$strFixed = 'pevný';
$strFlushPrivilegesNote = 'Poznámka: phpMyAdmin získává oprávnÄ›ní přímo z&nbsp;tabulek MySQL. Obsah tÄ›chto tabulek se může liÅ¡it od oprávnÄ›ní, která server právÄ› používá, pokud byly tyto tabulky upravovány. V&nbsp;tomto případÄ› je vhodné provést %sznovunaÄtení oprávnÄ›ní%s pÅ™ed pokraÄováním.';
$strFlushTable = 'Vyprázdnit vyrovnávací paměť pro tabulku ("FLUSH")';
-$strFormat = 'Formát';
$strFormEmpty = 'Chybějící hodnota ve formuláři!';
+$strFormat = 'Formát';
$strFullText = 'Celé texty';
$strFunction = 'Funkce';
$strGenBy = 'Vygeneroval';
-$strGeneralRelationFeat = 'Obecné funkce relací';
$strGenTime = 'Vygenerováno';
+$strGeneralRelationFeat = 'Obecné funkce relací';
$strGeorgian = 'Gruzínština';
$strGerman = 'Německy';
$strGlobal = 'globální';
@@ -289,8 +292,8 @@ $strHebrew = 'Hebrejština';
$strHexForBinary = 'Binarní pole vypisovat šestnáctkově';
$strHome = 'Hlavní strana';
$strHomepageOfficial = 'Oficiální stránka phpMyAdmina';
-$strHostEmpty = 'Jméno poÄítaÄe je prázdné!';
$strHost = 'PoÄítaÄ';
+$strHostEmpty = 'Jméno poÄítaÄe je prázdné!';
$strHungarian = 'MaÄarÅ¡tina';
$strIcelandic = 'Islandština';
@@ -303,44 +306,48 @@ $strIgnoringFile = 'Ignoruji soubor %s';
$strImportDocSQL = 'Importovat soubory docSQL';
$strImportFiles = 'Importovat soubory';
$strImportFinished = 'Import ukonÄen';
-$strIndexes = 'Indexy';
-$strIndexHasBeenDropped = 'Index %s byl odstraněn';
+$strInUse = 'právě se používá';
$strIndex = 'Index';
+$strIndexHasBeenDropped = 'Index %s byl odstraněn';
$strIndexName = 'Jméno indexu&nbsp;:';
$strIndexType = 'Typ indexu&nbsp;:';
+$strIndexWarningMultiple = 'Pro sloupec `%s` je vytvořeno více indexů';
+$strIndexWarningPrimary = 'Sloupec `%s` by nemÄ›l být zárověň obsažen v&nbsp;PRIMARY a INDEX klíÄi';
+$strIndexWarningTable = 'Problémy s&nbsp;indexy v&nbsp;tabulce `%s`';
+$strIndexWarningUnique = 'Sloupec `%s` by nemÄ›l být zárověň obsažen v&nbsp;PRIMARY a UNIQUE klíÄi';
+$strIndexes = 'Indexy';
$strInnodbStat = 'Stav InnoDB';
$strInsecureMySQL = 'Máte standardní nastavení hesla uživatele root v&nbsp;MySQL. DoporuÄujeme zmÄ›nit toto nastavení a tím podstatnÄ› zvýšit bezpeÄnost VaÅ¡eho serveru.';
+$strInsert = 'Vložit';
$strInsertAsNewRow = 'Vložit jako nový řádek';
$strInsertBookmarkTitle = 'Prosím zadejte název oblíbené položky';
-$strInsertedRowId = 'Id vloženého řádku:';
-$strInsertedRows = 'Vloženo řádků:';
$strInsertNewRow = 'Vložit nový řádek';
$strInsertTextfiles = 'Vložit textové soubory do tabulky';
-$strInsert = 'Vložit';
+$strInsertedRowId = 'Id vloženého řádku:';
+$strInsertedRows = 'Vloženo řádků:';
$strInstructions = 'Instrukce';
$strInternalNotNecessary = '* Interní relace není potřebná, pokud již relace existuje v InnoDB.';
$strInternalRelations = 'Interní relace';
-$strInUse = 'právě se používá';
$strJapanese = 'Japonština';
$strJumpToDB = 'Na databázi &quot;%s&quot;.';
-$strJustDeleteDescr = 'OdstranÄ›ní uživatelé stále budou mít pÅ™istup na server dokud nebudou znovunaÄtena oprávnÄ›ní.';
$strJustDelete = 'Jen odstranit uživatele z tabulek s oprávněními.';
+$strJustDeleteDescr = 'OdstranÄ›ní uživatelé stále budou mít pÅ™istup na server dokud nebudou znovunaÄtena oprávnÄ›ní.';
$strKeepPass = 'Neměnit heslo';
$strKeyname = 'KlíÄový název';
$strKill = 'UkonÄit';
$strKorean = 'Korejština';
+$strLaTeX = 'LaTeX';
+$strLaTeXOptions = 'Nastavení exportu do LaTeXu';
$strLandscape = 'Na šířku';
$strLatexCaption = 'Titulek tabulky';
$strLatexContent = 'Obsah tabulky __TABLE__';
-$strLatexContinuedCaption = 'Titulek pokraÄování tabulky';
$strLatexContinued = '(pokraÄování)';
+$strLatexContinuedCaption = 'Titulek pokraÄování tabulky';
$strLatexIncludeCaption = 'Použít titulek tabulky';
$strLatexLabel = 'Návěstí';
-$strLaTeX = 'LaTeX';
-$strLaTeXOptions = 'Nastavení exportu do LaTeXu';
$strLatexStructure = 'Struktura tabulky __TABLE__';
$strLatvian = 'Lotyšština';
$strLengthSet = 'Délka/Množina*';
@@ -354,31 +361,33 @@ $strLoadExplanation = 'Automaticky jsou zvoleny nejvhodnější parametry, pokud
$strLoadMethod = 'Parametry pro příkaz LOAD';
$strLocalhost = 'Lokální';
$strLocationTextfile = 'textový soubor';
-$strLoginInformation = 'Přihlašování';
-$strLogin = 'Přihlášení';
-$strLogout = 'Odhlásit se';
$strLogPassword = 'Heslo:';
$strLogServer = 'Server';
$strLogUsername = 'Jméno:';
+$strLogin = 'Přihlášení';
+$strLoginInformation = 'Přihlašování';
+$strLogout = 'Odhlásit se';
-$strMaximumSize = 'Maximální velikost: %s%s';
+$strMIMETypesForTable = 'MIME TYPY PRO TABULKU';
+$strMIME_MIMEtype = 'MIME typ';
$strMIME_available_mime = 'Dostupné MIME typy';
$strMIME_available_transform = 'Dostupné transformace';
$strMIME_description = 'Popis';
-$strMIME_MIMEtype = 'MIME typ';
$strMIME_nodescription = 'Pro tuto transformaci není dostupný žádný popis.<br />Zeptejte se autora co %s dělá.';
+$strMIME_transformation = 'Transformace při prohlížení';
$strMIME_transformation_note = 'Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na %spopisy transformací%s';
-$strMIME_transformation_options_note = 'Zadejte parametry transformací v&nbsp;následujícím tvaru: \'a\',\'b\',\'c\'...<br />Pokud potřebujete použít zpětné lomítko ("\") nebo jednoduché uvozovky ("\'") mezi těmito hodnotami, vložte před ně zpětné lomítko (například \'\\\\xyz\' nebo \'a\\\'b\').';
$strMIME_transformation_options = 'Parametry transformace';
-$strMIME_transformation = 'Transformace při prohlížení';
-$strMIMETypesForTable = 'MIME TYPY PRO TABULKU';
+$strMIME_transformation_options_note = 'Zadejte parametry transformací v&nbsp;následujícím tvaru: \'a\',\'b\',\'c\'...<br />Pokud potřebujete použít zpětné lomítko ("\") nebo jednoduché uvozovky ("\'") mezi těmito hodnotami, vložte před ně zpětné lomítko (například \'\\\\xyz\' nebo \'a\\\'b\').';
$strMIME_without = 'MIME typy zobrazené kurzívou nemají vlastní transformaÄní funkci';
+$strMaximumSize = 'Maximální velikost: %s%s';
+$strMbExtensionMissing = 'Rozšíření mbstring pro PHP nebylo nalezeno a zdá se, že požíváte vícebajtovou znakovou sadu. Bez rozšíření mbstring neumí phpMyAdmin správnÄ› rozdÄ›lovat Å™etÄ›zce a proto to může mít neÄekané následky.';
+$strMbOverloadWarning = 'V&nbsp;nastavení PHP máte zapnuto mbstring.func_overload. Toto nastavení není kompatibilní s&nbsp;phpMyAdminem a může způsobit poškození dat!';
$strModifications = 'Změny byly uloženy';
-$strModifyIndexTopic = 'Upravit index';
$strModify = 'Úpravy';
+$strModifyIndexTopic = 'Upravit index';
$strMoreStatusVars = 'Další informace o&nbsp;stavu';
-$strMoveTableOK = 'Tabulka %s byla přesunuta do %s.';
$strMoveTable = 'Přesunout tabulku do (databáze<b>.</b>tabulka):';
+$strMoveTableOK = 'Tabulka %s byla přesunuta do %s.';
$strMoveTableSameNames = 'Nelze přesunout tabulku na sebe samu!';
$strMultilingual = 'mnohojazyÄný';
$strMustSelectFile = 'Zvolte soubor, který chcete vložit.';
@@ -394,17 +403,17 @@ $strMySQLShowVars = 'Ukázat systémové proměnné MySQL';
$strName = 'Název';
$strNeedPrimaryKey = 'Pro tuto tabulku byste mÄ›li definovat primární klíÄ.';
$strNext = 'Další';
-$strNoDatabasesSelected = 'Nebyla vybrána žádná databáze.';
+$strNo = 'Ne';
+$strNoActivity = 'Byli jste příliš dlouho neaktivní (déle než %s sekund), prosím přihlašte se znovu';
$strNoDatabases = 'Žádné databáze';
+$strNoDatabasesSelected = 'Nebyla vybrána žádná databáze.';
$strNoDescription = 'žádný popisek';
$strNoDropDatabases = 'Příkaz "DROP DATABASE" je vypnutý.';
$strNoExplain = 'Bez vysvětlení (EXPLAIN) SQL';
$strNoFrames = 'phpMyAdmin se lépe používá v&nbsp;prohlížeÄi podporujícím rámy ("FRAME").';
-$strNoIndexPartsDefined = 'Žádná Äást indexu nebyla definována!';
$strNoIndex = 'Žádný index nebyl definován!';
+$strNoIndexPartsDefined = 'Žádná Äást indexu nebyla definována!';
$strNoModification = 'Žádná změna';
-$strNo = 'Ne';
-$strNone = 'Žádná';
$strNoOptions = 'Tento formát nemá žádná nastavení';
$strNoPassword = 'Žádné heslo';
$strNoPermission = 'Web server nemá oprávnění uložit výpis do souboru %s.';
@@ -416,19 +425,20 @@ $strNoRowsSelected = 'Nebyla vybrán žádný řádek';
$strNoSpace = 'Nedostatek místa pro uložení souboru %s.';
$strNoTablesFound = 'V&nbsp;databázi nebyla nalezena žádná tabulka.';
$strNoThemeSupport = 'Není podporována změna tématu, zkontrolujte nastavení a témata v adresáři %s.';
+$strNoUsersFound = 'Žádný uživatel nenalezen.';
+$strNoValidateSQL = 'Bez kontroly SQL';
+$strNone = 'Žádná';
$strNotNumber = 'Nebylo zadáno Äíslo!';
$strNotOK = 'není v pořádku';
$strNotSet = '<b>%s</b> tabulka nenalezena nebo není nastavena v&nbsp;%s';
$strNotValidNumber = ' není platné Äíslo řádku!';
-$strNoUsersFound = 'Žádný uživatel nenalezen.';
-$strNoValidateSQL = 'Bez kontroly SQL';
$strNull = 'Nulový';
$strNumSearchResultsInTable = '%s odpovídající(ch) záznam(ů) v&nbsp;tabulce <i>%s</i>';
$strNumSearchResultsTotal = '<b>Celkem:</b> <i>%s</i> odpovídající(ch) záznam(ů)';
$strNumTables = 'Tabulek';
-$strOftenQuotation = 'Často uvozující znaky. Volitelně znamená, že pouze položky u kterých je to nutné (obvykle typu CHAR a VARCHAR) jsou uzavřeny do uzavíracích znaků.';
$strOK = 'OK';
+$strOftenQuotation = 'Často uvozující znaky. Volitelně znamená, že pouze položky u kterých je to nutné (obvykle typu CHAR a VARCHAR) jsou uzavřeny do uzavíracích znaků.';
$strOperations = 'Úpravy';
$strOperator = 'Operátor';
$strOptimizeTable = 'Optimalizovat tabulku';
@@ -438,12 +448,15 @@ $strOr = 'nebo';
$strOverhead = 'Navíc';
$strOverwriteExisting = 'Přepsat existující soubor(y)';
+$strPHP40203 = 'Používáte PHP 4.2.3, které má závažnou chybu pÅ™i práci s&nbsp;vícebajtovými znaky (mbstring), jedná se o&nbsp;chybu PHP Äíslo 19404. NedoporuÄujeme používat tuto verzi PHP s&nbsp;phpMyAdminem.';
+$strPHPVersion = 'Verze PHP';
$strPageNumber = 'Strana Äíslo:';
$strPaperSize = 'Velikost stránky';
$strPartialText = 'Zkrácené texty';
+$strPassword = 'Heslo';
$strPasswordChanged = 'Heslo pro %s bylo úspěšně změněno.';
$strPasswordEmpty = 'Heslo je prázdné!';
-$strPassword = 'Heslo';
+$strPasswordHashing = 'Hašovací funkce pro heslo';
$strPasswordNotSame = 'Hesla nejsou stejná!';
$strPdfDbSchema = 'Schéma databáze "%s" - Strana %s';
$strPdfInvalidTblName = 'Tabulka "%s" neexistuje!';
@@ -453,8 +466,6 @@ $strPerMinute = 'za minutu';
$strPerSecond = 'za sekundu';
$strPersian = 'Perština';
$strPhoneBook = 'adresář';
-$strPHP40203 = 'Používáte PHP 4.2.3, které má závažnou chybu pÅ™i práci s&nbsp;vícebajtovými znaky (mbstring), jedná se o&nbsp;chybu PHP Äíslo 19404. NedoporuÄujeme používat tuto verzi PHP s&nbsp;phpMyAdminem.';
-$strPHPVersion = 'Verze PHP';
$strPhp = 'Zobrazit PHP kód';
$strPmaDocumentation = 'Dokumentace phpMyAdmina';
$strPmaUriError = 'Parametr <tt>$cfg[\'PmaAbsoluteUri\']</tt> MUSà být nastaven v&nbsp;konfiguraÄním souboru!';
@@ -462,13 +473,13 @@ $strPolish = 'Polština';
$strPortrait = 'Na výšku';
$strPos1 = 'ZaÄátek';
$strPrevious = 'Předchozí';
+$strPrimary = 'Primární';
$strPrimaryKeyHasBeenDropped = 'Primární klÃ­Ä byl odstranÄ›n';
$strPrimaryKeyName = 'Jméno primárního klíÄe musí být "PRIMARY"!';
$strPrimaryKeyWarning = '("PRIMARY" <b>musí</b> být jméno <b>pouze</b> primárního klíÄe!)';
-$strPrimary = 'Primární';
-$strPrintViewFull = 'Náhled k vytištění (s&nbsp;kompletními texty)';
-$strPrintView = 'Náhled k vytištění';
$strPrint = 'Vytisknout';
+$strPrintView = 'Náhled k vytištění';
+$strPrintViewFull = 'Náhled k vytištění (s&nbsp;kompletními texty)';
$strPrivDescAllPrivileges = 'Všechna oprávnění kromě GRANT.';
$strPrivDescAlter = 'Umožňuje měnit strukturu existujících tabulek.';
$strPrivDescCreateDb = 'Umožňuje vytvářet nové databáze a tabulky.';
@@ -503,8 +514,8 @@ $strPrivilegesReloaded = 'OprávnÄ›ní byla znovunaÄtena úspěšnÄ›.';
$strProcesslist = 'Seznam procesů';
$strPutColNames = 'Přidat jména sloupců na první řádek';
-$strQBEDel = 'smazat';
$strQBE = 'Dotaz';
+$strQBEDel = 'smazat';
$strQBEIns = 'přidat';
$strQueryFrame = 'SQL okno';
$strQueryOnDb = 'SQL dotaz na databázi <b>%s</b>:';
@@ -514,51 +525,63 @@ $strQueryTime = 'Dotaz zabral %01.4f sekund';
$strQueryType = 'Typ dotazu';
$strQueryWindowLock = 'Nepřepisovat tento dotaz z&nbsp;hlavního okna';
+$strReType = 'Heslo znovu';
$strReceived = 'Přijato';
$strRecords = 'Záznamů';
$strReferentialIntegrity = 'Zkontrolovat integritu odkazů:';
$strRefresh = 'Obnovit';
-$strRelationalSchema = 'RelaÄní schéma';
$strRelationNotWorking = 'NÄ›které z&nbsp;rozšířených funkcí phpMyAdmina nelze používat. %sZde%s zjistíte proÄ.';
-$strRelationsForTable = 'RELACE PRO TABULKU';
-$strRelations = 'Relace';
$strRelationView = 'Zobrazit relace';
+$strRelationalSchema = 'RelaÄní schéma';
+$strRelations = 'Relace';
+$strRelationsForTable = 'RELACE PRO TABULKU';
$strReloadFailed = 'ZnovunaÄtení MySQL selhalo.';
-$strReloadingThePrivileges = 'ZnovunaÄítám oprávnÄ›ní';
$strReloadMySQL = 'ZnovunaÄtení MySQL';
+$strReloadingThePrivileges = 'ZnovunaÄítám oprávnÄ›ní';
$strRemoveSelectedUsers = 'Odstranit vybrané uživatele';
$strRenameDatabaseOK = 'Databáze %s byla přejmenována na %s';
-$strRenameTableOK = 'Tabulka %s byla přejmenována na %s';
$strRenameTable = 'Přejmenovat tabulku na';
+$strRenameTableOK = 'Tabulka %s byla přejmenována na %s';
$strRepairTable = 'Opravit tabulku';
-$strReplaceNULLBy = 'Nahradit NULL hodnoty';
$strReplace = 'Přepsat';
+$strReplaceNULLBy = 'Nahradit NULL hodnoty';
$strReplaceTable = 'Přepsat data tabulky souborem';
$strReset = 'Původní';
$strResourceLimits = 'Omezení zdrojů';
-$strReType = 'Heslo znovu';
-$strRevokeAndDeleteDescr = 'Uživatelé budou mít oprávnÄ›ní "USAGE" (používání) dokud nebudou znovunaÄtena oprávnÄ›ní.';
+$strRevoke = 'Zrušit';
$strRevokeAndDelete = 'Odebrat uživatelům veškerá oprávnění a poté je odstranit z tabulek.';
+$strRevokeAndDeleteDescr = 'Uživatelé budou mít oprávnÄ›ní "USAGE" (používání) dokud nebudou znovunaÄtena oprávnÄ›ní.';
$strRevokeMessage = 'Byla zrušena práva pro %s';
-$strRevoke = 'Zrušit';
$strRomanian = 'Rumunština';
$strRowLength = 'Délka řádku';
-$strRowsFrom = 'řádků zaÄínající od';
$strRowSize = ' Velikost řádku ';
+$strRows = 'Řádků';
+$strRowsFrom = 'řádků zaÄínající od';
$strRowsModeFlippedHorizontal = 'vodorovném (otoÄené hlaviÄky)';
$strRowsModeHorizontal = 'vodorovném';
$strRowsModeOptions = 've %s režimu a opakovat hlaviÄky po %s řádcích.';
$strRowsModeVertical = 'svislém';
-$strRows = 'Řádků';
$strRowsStatistic = 'Statistika řádků';
-$strRunning = 'na %s';
$strRunQuery = 'Provést dotaz';
$strRunSQLQuery = 'Spustit SQL dotaz(y) na databázi %s';
+$strRunning = 'na %s';
$strRussian = 'Ruština';
-$strSaveOnServer = 'Uložit na serveru v adresáři %s';
+$strSQL = 'SQL';
+$strSQLExportCompatibility = 'Kompatibilita SQL exportu';
+$strSQLExportType = 'Typ vytvořených dotazů';
+$strSQLOptions = 'Nastavení SQL exportu';
+$strSQLParserBugMessage = 'Je možné, že jste naÅ¡li chybu v&nbsp;SQL parseru. Prosím prozkoumejte podrobnÄ› SQL dotaz, pÅ™edevším jestli jsou správnÄ› uvozovky a jestli nejsou proházené. Další možnost selhání je pokud nahráváte soubor s&nbsp;binárními daty nezapsanými v&nbsp;uvozovkách. Můžete také vyzkouÅ¡et příkazovou řádku MySQL. Níže uvedený výstup z&nbsp;MySQL serveru (pokud je nÄ›jaký) Vám také může pomoci pÅ™i zkoumání problému. Pokud stále máte problémy nebo pokud SQL parser ohlásí chybu u dotazu, který na příkazové řádce funguje, prosím pokuste se zredukovat dotaz na co nejmenší, ve kterém se problém jeÅ¡tÄ› vyskytne, a ohlaste chybu na stránkách phpMyAdmina spolu se sekcí VÃPIS uvedenou níže:';
+$strSQLParserUserError = 'Pravděpodobně máte v&nbsp;SQL dotazu chybu. Níže uvedený výstup MySQL serveru (pokud je nějaký) Vám také může pomoci při zkoumání problému';
+$strSQLQuery = 'SQL-dotaz';
+$strSQLResult = 'Výsledek SQL dotazu';
+$strSQPBugInvalidIdentifer = 'Chybný identifikátor';
+$strSQPBugUnclosedQuote = 'Neuzavřené uvozovky';
+$strSQPBugUnknownPunctuation = 'Neznámé interpunkÄní znaménko';
$strSave = 'Ulož';
+$strSaveOnServer = 'Uložit na serveru v adresáři %s';
$strScaleFactorSmall = 'Měřítko je příliš malé, aby se schéma vešlo na jednu stránku';
+$strSearch = 'Vyhledávání';
$strSearchFormTitle = 'Vyhledávání v&nbsp;databázi';
$strSearchInTables = 'V&nbsp;tabulkách:';
$strSearchNeedle = 'Slova nebo hodnoty, které chcete vyhledat (zástupný znak: "%"):';
@@ -568,7 +591,6 @@ $strSearchOption3 = 'přesnou frázi';
$strSearchOption4 = 'jako regulární výraz';
$strSearchResultsFor = 'Výsledky vyhledávání pro "<i>%s</i>" %s:';
$strSearchType = 'Najít:';
-$strSearch = 'Vyhledávání';
$strSecretRequired = 'Nastavte klÃ­Ä pro Å¡ifrování cookies (blowfish_secret) v&nbsp;konfiguraÄním souboru (config.inc.php).';
$strSelectADb = 'Prosím vyberte databázi';
$strSelectAll = 'Vybrat vše';
@@ -578,9 +600,9 @@ $strSelectNumRows = 'v&nbsp;dotazu';
$strSelectTables = 'Vybrat tabulky';
$strSend = 'Do souboru';
$strSent = 'Odesláno';
+$strServer = 'Server';
$strServerChoice = 'Výběr serveru';
$strServerNotResponding = 'Server neodpovídá';
-$strServer = 'Server';
$strServerStatus = 'Stav serveru';
$strServerStatusUptime = 'Tento MySQL server běží %s. Čas spuštění: %s.';
$strServerTabProcesslist = 'Procesy';
@@ -590,41 +612,31 @@ $strServerVars = 'Proměnné a nastavení serveru';
$strServerVersion = 'Verze MySQL';
$strSessionValue = 'Hodnota sezení';
$strSetEnumVal = 'Pokud je sloupec typu "enum" nebo "set", zadávejte hodnoty v&nbsp;následujícím formátu: \'a\',\'b\',\'c\'...<br />Pokud potřebujete zadat zpětné lomítko ("\") nebo jednoduché uvozovky ("\'") mezi těmito hodnotami, napište před ně zpětné lomítko (příklad: \'\\\\xyz\' nebo \'a\\\'b\').';
+$strShow = 'Zobrazit';
$strShowAll = 'Zobrazit vše';
$strShowColor = 'Barevné šipky';
$strShowDatadictAs = 'Formát datového slovníku';
$strShowFullQueries = 'Zobrazit celé dotazy';
$strShowGrid = 'Zobrazit mřížku';
-$strShowingRecords = 'Zobrazeny záznamy';
$strShowPHPInfo = 'Zobrazit informace o&nbsp;PHP';
$strShowTableDimension = 'Rozměry tabulek';
$strShowTables = 'Zobrazit tabulky';
$strShowThisQuery = 'Zobrazit zde tento dotaz znovu';
-$strShow = 'Zobrazit';
+$strShowingRecords = 'Zobrazeny záznamy';
$strSimplifiedChinese = 'ZjednoduÅ¡ená ÄínÅ¡tina';
$strSingly = '(po jednom)';
$strSize = 'Velikost';
$strSlovak = 'Slovenština';
$strSlovenian = 'Slovinština';
-$strSortByKey = 'Setřídit podle klíÄe';
$strSort = 'Řadit';
+$strSortByKey = 'Setřídit podle klíÄe';
$strSpaceUsage = 'Využití místa';
$strSpanish = 'Španělština';
$strSplitWordsWithSpace = 'Slova jsou oddělena mezerou (" ").';
-$strSQLExportType = 'Typ vytvořených dotazů';
-$strSQLOptions = 'Nastavení SQL exportu';
-$strSQLParserBugMessage = 'Je možné, že jste naÅ¡li chybu v&nbsp;SQL parseru. Prosím prozkoumejte podrobnÄ› SQL dotaz, pÅ™edevším jestli jsou správnÄ› uvozovky a jestli nejsou proházené. Další možnost selhání je pokud nahráváte soubor s&nbsp;binárními daty nezapsanými v&nbsp;uvozovkách. Můžete také vyzkouÅ¡et příkazovou řádku MySQL. Níže uvedený výstup z&nbsp;MySQL serveru (pokud je nÄ›jaký) Vám také může pomoci pÅ™i zkoumání problému. Pokud stále máte problémy nebo pokud SQL parser ohlásí chybu u dotazu, který na příkazové řádce funguje, prosím pokuste se zredukovat dotaz na co nejmenší, ve kterém se problém jeÅ¡tÄ› vyskytne, a ohlaste chybu na stránkách phpMyAdmina spolu se sekcí VÃPIS uvedenou níže:';
-$strSQLParserUserError = 'Pravděpodobně máte v&nbsp;SQL dotazu chybu. Níže uvedený výstup MySQL serveru (pokud je nějaký) Vám také může pomoci při zkoumání problému';
-$strSQLQuery = 'SQL-dotaz';
-$strSQLResult = 'Výsledek SQL dotazu';
-$strSQL = 'SQL';
-$strSQPBugInvalidIdentifer = 'Chybný identifikátor';
-$strSQPBugUnclosedQuote = 'Neuzavřené uvozovky';
-$strSQPBugUnknownPunctuation = 'Neznámé interpunkÄní znaménko';
$strStatCheckTime = 'Poslední kontrola';
$strStatCreateTime = 'Vytvoření';
-$strStatement = 'Údaj';
$strStatUpdateTime = 'Poslední změna';
+$strStatement = 'Údaj';
$strStatus = 'Stav';
$strStrucCSV = 'CSV data';
$strStrucData = 'Strukturu a data';
@@ -641,6 +653,7 @@ $strSwedish = 'Švédština';
$strSwitchToDatabase = 'Přepnout na zkopírovanou databázi';
$strSwitchToTable = 'Přepnout na zkopírovanou tabulku';
+$strTable = 'Tabulka';
$strTableComments = 'Komentář k tabulce';
$strTableEmpty = 'Jméno tabulky je prázdné!';
$strTableHasBeenDropped = 'Tabulka %s byla odstraněna';
@@ -649,18 +662,17 @@ $strTableHasBeenFlushed = 'Vyrovnávací paměť pro tabulku %s byla vyprázdně
$strTableMaintenance = ' Údržba tabulky ';
$strTableOfContents = 'Obsah';
$strTableOptions = 'Parametry tabulky';
-$strTables = '%s tabulek';
$strTableStructure = 'Struktura tabulky';
-$strTable = 'Tabulka';
$strTableType = 'Typ tabulky';
+$strTables = '%s tabulek';
$strTakeIt = 'zvolit';
$strTblPrivileges = 'Oprávnění pro jednotlivé tabulky';
$strTextAreaLength = 'Tento sloupec možná nepůjde <br />(kvůli délce) upravit ';
$strThai = 'Thajština';
$strTheContent = 'Obsah souboru byl vložen';
$strTheContents = 'Obsah souboru pÅ™epíše obsah zvolené tabulky v&nbsp;tÄ›ch řádcích, kde je stejný primární nebo unikátní klíÄ.';
-$strTheme = 'Vzhled';
$strTheTerminator = 'Sloupce jsou odděleny tímto znakem.';
+$strTheme = 'Vzhled';
$strThisHost = 'Tento poÄítaÄ';
$strThisNotDirectory = 'Nebyl zadán adresář';
$strThreadSuccessfullyKilled = 'Vlákno %s bylo úspěšně zabito.';
@@ -692,14 +704,19 @@ $strUnicode = 'Unicode';
$strUnique = 'Unikátní';
$strUnknown = 'neznámý';
$strUnselectAll = 'OdznaÄit vÅ¡e';
+$strUpdComTab = 'Podívejte se prosím do dokumentace, jak aktualizovat tabulku s&nbsp;informacemi o&nbsp; sloupcích (tabulka column_comments)';
$strUpdatePrivMessage = 'Byla aktualizována oprávnění pro %s.';
$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šší.';
$strUsage = 'Používá';
$strUseBackquotes = 'Použít zpětné uvozovky u&nbsp;jmen tabulek a sloupců';
$strUseHostTable = 'Použít tabulku s&nbsp;poÄítaÄi';
+$strUseTabKey = 'Použijte klávesu TAB pro pohyb mezi hodnotami nebo CTRL+šipky po pohyb všemi směry.';
+$strUseTables = 'Použít tabulky';
+$strUseTextField = 'Použít textové pole';
+$strUseThisValue = 'Použít tuto hodnotu';
+$strUser = 'Uživatel';
$strUserAlreadyExists = 'Uživatel %s již existuje!';
$strUserEmpty = 'Jméno uživatele je prázdné!';
$strUserName = 'Jméno uživatele';
@@ -707,22 +724,17 @@ $strUserNotFound = 'Zvolený uživatel nebyl nalezen v&nbsp;tabulce oprávnění
$strUserOverview = 'Přehled uživatelů';
$strUsersDeleted = 'Vybraní uživatelé byli úspěšně odstraněni.';
$strUsersHavingAccessToDb = 'Uživatelé mající přístup k&nbsp;&quot;%s&quot;';
-$strUser = 'Uživatel';
-$strUseTabKey = 'Použijte klávesu TAB pro pohyb mezi hodnotami nebo CTRL+šipky po pohyb všemi směry.';
-$strUseTables = 'Použít tabulky';
-$strUseTextField = 'Použít textové pole';
-$strUseThisValue = 'Použít tuto hodnotu';
$strValidateSQL = 'Zkontrolovat SQL';
$strValidatorError = 'SQL validátor nemohl být inicializován. Prosím zkontrolujte, jestli máte požadovaná rozšíření PHP, která jsou uvedena v&nbsp;%sdokumentaci%s.';
$strValue = 'Hodnota';
$strVar = 'Proměnná';
-$strViewDumpDatabases = 'Export databází';
-$strViewDumpDB = 'Export databáze';
$strViewDump = 'Export tabulky';
+$strViewDumpDB = 'Export databáze';
+$strViewDumpDatabases = 'Export databází';
-$strWebServerUploadDirectoryError = 'Adresář urÄený pro upload souborů nemohl být otevÅ™en';
$strWebServerUploadDirectory = 'soubor z&nbsp;adresáře pro upload';
+$strWebServerUploadDirectoryError = 'Adresář urÄený pro upload souborů nemohl být otevÅ™en';
$strWelcome = 'Vítejte v&nbsp;%s';
$strWestEuropean = 'Západní Evropa';
$strWildcard = 'maska';
@@ -739,10 +751,4 @@ $strYes = 'Ano';
$strZeroRemovesTheLimit = 'Poznámka: Nastavení těchto parametrů na 0 (nulu) odstraní omezení.';
$strZip = '"zazipováno"';
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
?>
diff --git a/lang/czech-windows-1250.inc.php b/lang/czech-windows-1250.inc.php
index fd1f15b391..9766c4167a 100644
--- a/lang/czech-windows-1250.inc.php
+++ b/lang/czech-windows-1250.inc.php
@@ -23,18 +23,17 @@ $datefmt = '%a %d. %b %Y, %H:%M';
$timespanfmt = '%s dnù, %s hodin, %s minut a %s sekund';
+$strAPrimaryKey = 'V&nbsp;tabulce %s byl vytvoøen primární klíè';
$strAbortedClients = 'Pøerušené';
$strAbsolutePathToDocSqlDir = 'docSQL adresáø';
-$strAccessDeniedExplanation = 'phpMyAdmin se pokusil pøipojit k&nbsp;MySQL serveru, a ten odmítl pøipojení. Zkontrolujte jméno serveru, uživatelské jméno a heslo v&nbsp;souboru config.inc.php a ujistìte se, že jsou totožné s&nbsp;tìmi, které máte od administrátora MySQL serveru.';
$strAccessDenied = 'Pøístup odepøen';
+$strAccessDeniedExplanation = 'phpMyAdmin se pokusil pøipojit k&nbsp;MySQL serveru, a ten odmítl pøipojení. Zkontrolujte jméno serveru, uživatelské jméno a heslo v&nbsp;souboru config.inc.php a ujistìte se, že jsou totožné s&nbsp;tìmi, které máte od administrátora MySQL serveru.';
$strAction = 'Akce';
$strAddAutoIncrement = 'Pøidat hodnotu AUTO_INCREMENT';
$strAddConstraints = 'Pøidat integritní omezení';
$strAddDeleteColumn = 'Pøidat nebo odebrat sloupec';
$strAddDeleteRow = 'Pøidat nebo odebrat øádek';
$strAddDropDatabase = 'Pøidat DROP DATABASE';
-$strAddedColumnComment = 'Pøidán komentáø ke sloupci';
-$strAddedColumnRelation = 'Pøidána relace pro sloupec';
$strAddFields = 'Pøidat %s položek';
$strAddHeaderComment = 'Pøidat vlastní komentáø do hlavièky (\\n oddìluje øádky)';
$strAddIfNotExists = 'Pøidat IF NOT EXISTS';
@@ -44,24 +43,27 @@ $strAddPrivilegesOnDb = 'Pøidat oprávnìní pro databázi';
$strAddPrivilegesOnTbl = 'Pøidat oprávnìní pro tabulku';
$strAddSearchConditions = 'Pøidat vyhledávací parametry (èást dotazu po pøíkazu "WHERE"):';
$strAddToIndex = 'Pøidat %s sloupcù do indexu';
-$strAddUserMessage = 'Uživatel byl pøidán.';
$strAddUser = 'Pøidat nového uživatele';
+$strAddUserMessage = 'Uživatel byl pøidán.';
+$strAddedColumnComment = 'Pøidán komentáø ke sloupci';
+$strAddedColumnRelation = 'Pøidána relace pro sloupec';
$strAdministration = 'Správa';
$strAffectedRows = 'Ovlivnìné øádky:';
+$strAfter = 'Po %s';
$strAfterInsertBack = 'Návrat na pøedchozí stránku';
$strAfterInsertNewInsert = 'Vložit další øádek';
+$strAfterInsertNext = 'Upravit následující øádek';
$strAfterInsertSame = 'Návrat na tuto stránku';
-$strAfter = 'Po %s';
-$strAllTableSameWidth = 'Použít pro všechny tabulky stejnou šíøku';
$strAll = 'Všechno';
+$strAllTableSameWidth = 'Použít pro všechny tabulky stejnou šíøku';
$strAlterOrderBy = 'Zmìnit poøadí tabulky podle';
+$strAnIndex = 'K&nbsp;tabulce %s byl pøidán index';
$strAnalyzeTable = 'Analyzovat tabulku';
$strAnd = 'a';
-$strAnIndex = 'K&nbsp;tabulce %s byl pøidán index';
-$strAnyHost = 'Jakýkoliv poèítaè';
$strAny = 'Jakýkoliv';
+$strAnyHost = 'Jakýkoliv poèítaè';
$strAnyUser = 'Jakýkoliv uživatel';
-$strAPrimaryKey = 'V&nbsp;tabulce %s byl vytvoøen primární klíè';
+$strApproximateCount = 'Mùže být nepøesné, viz FAQ 3.11';
$strArabic = 'Arabština';
$strArmenian = 'Arménština';
$strAscending = 'Vzestupnì';
@@ -75,15 +77,15 @@ $strBack = 'Zpìt';
$strBaltic = 'Baltické';
$strBeginCut = 'ZAÈÁTEK VÝPISU';
$strBeginRaw = 'ZAÈÁTEK VÝPISU';
-$strBinary = ' Binární ';
-$strBinaryDoNotEdit = ' Binární - neupravujte ';
-$strBinaryLog = 'Binární log';
$strBinLogEventType = 'Typ události';
$strBinLogInfo = 'Informace';
$strBinLogName = 'Jméno logu';
$strBinLogOriginalPosition = 'Pùvodní pozice';
$strBinLogPosition = 'Pozice';
$strBinLogServerId = 'ID serveru';
+$strBinary = ' Binární ';
+$strBinaryDoNotEdit = ' Binární - neupravujte ';
+$strBinaryLog = 'Binární log';
$strBookmarkAllUsers = 'Umožnit všem uživatelùm používat tuto položku';
$strBookmarkDeleted = 'Položka byla smazána z&nbsp;oblíbených.';
$strBookmarkLabel = 'Název';
@@ -91,12 +93,13 @@ $strBookmarkOptions = 'Nastavení oblíbeného dotazu';
$strBookmarkQuery = 'Oblíbený SQL dotaz';
$strBookmarkThis = 'Pøidat tento SQL dotaz do oblíbených';
$strBookmarkView = 'Jen zobrazit';
-$strBrowseForeignValues = 'Projít hodnoty cizích klíèù';
$strBrowse = 'Projít';
+$strBrowseForeignValues = 'Projít hodnoty cizích klíèù';
$strBulgarian = 'Bulharština';
$strBzError = 'phpMyAdminovi se nepodaøilo zkomprimovat výpis, protože rozšíøení pro kompresi bz2 je v&nbsp;této verzi PHP chybné. Doporuèujeme tuto kompresi vypnout (nastavit <code>$cfg[\'BZipDump\']</code> v&nbsp;nastaveních phpMyAdmina na <code>FALSE</code>). Pokud chcete používat kompresi bz2, mìli byste nainstalovat novìjší verzi PHP. Více informací o&nbsp;tomto problému je u popisu chyby %s.';
$strBzip = '"zabzipováno"';
+$strCSVOptions = 'Nastavení CSV exportu';
$strCalendar = 'Kalendáø';
$strCannotLogin = 'Nepodaøilo se pøihlášení k MySQL serveru';
$strCantLoad = 'nelze nahrát rozšíøení %s,<br />zkontrolujte prosím nastavení PHP';
@@ -108,23 +111,23 @@ $strCarriage = 'Návrat vozíku (CR): \\r';
$strCaseInsensitive = 'nerozlišovat velká a malá písmena';
$strCaseSensitive = 'rozlišovat velká a malá písmena';
$strCentralEuropean = 'Støední Evropa';
+$strChange = 'Zmìnit';
+$strChangeCopyMode = 'Vytvoøit nového uživatele se stejnými oprávnìními a ...';
$strChangeCopyModeCopy = '... zachovat pùvodního uživatele.';
$strChangeCopyModeDeleteAndReload = ' ... smazat uživatele a poté znovu naèíst oprávnìní.';
$strChangeCopyModeJustDelete = ' ... smazat pùvodního uživatele ze všech tabulek.';
$strChangeCopyModeRevoke = ' ... odebrat všechna oprávnìní pùvodnímu uživateli a poté ho smazat.';
-$strChangeCopyMode = 'Vytvoøit nového uživatele se stejnými oprávnìními a ...';
$strChangeCopyUser = 'Zmìnit informace o&nbsp;uživateli / Kopírovat uživatele';
$strChangeDisplay = 'Zvolte které sloupce zobrazit';
$strChangePassword = 'Zmìnit heslo';
-$strChange = 'Zmìnit';
+$strCharset = 'Znaková sada';
$strCharsetOfFile = 'Znaková sada souboru:';
-$strCharsetsAndCollations = 'Znakové sady a porovnávání';
$strCharsets = 'Znakové sady';
-$strCharset = 'Znaková sada';
+$strCharsetsAndCollations = 'Znakové sady a porovnávání';
$strCheckAll = 'Zaškrtnout vše';
$strCheckOverhead = 'Zaškrtnout neoptimální';
-$strCheckPrivsLong = 'Zkontrolovat oprávnìní pro databázi &quot;%s&quot;.';
$strCheckPrivs = 'Zkontrolovat oprávnìní';
+$strCheckPrivsLong = 'Zkontrolovat oprávnìní pro databázi &quot;%s&quot;.';
$strCheckTable = 'Zkontrolovat tabulku';
$strChoosePage = 'Zvolte stránku, kterou chcete zmìnit';
$strColComFeat = 'Zobrazuji komentáøe sloupcù';
@@ -132,8 +135,9 @@ $strCollation = 'Porovnávání';
$strColumnNames = 'Názvy sloupcù';
$strColumnPrivileges = 'Oprávnìní pro jednotlivé sloupce';
$strCommand = 'Pøíkaz';
-$strCommentsForTable = 'KOMENTÁØE PRO TABULKU';
$strComments = 'Komentáøe';
+$strCommentsForTable = 'KOMENTÁØE PRO TABULKU';
+$strCompatibleHashing = 'Kompatibilní s&nbsp;MySQL&nbsp;4.0';
$strCompleteInserts = 'Úplné inserty';
$strCompression = 'Komprese';
$strConfigFileError = 'phpMyAdmin nemohl naèíst konfiguraèní soubor!<br />Tato chyba mùže nastat pokud v&nbsp;nìm PHP najde chybu nebo nemùže tento soubor najít.<br />Po kliknutí na následující odkaz se PHP pokusí pøímo interpretovat tento soubor a zobrazí informace o&nbsp;chybì, ke které došlo. Pak opravte tuto chybu (nejèastìji se jedná o&nbsp;chybìjící støedník).<br />Pokud získáte prázdnou stránku, všechno je v&nbsp;poøádku.';
@@ -148,22 +152,36 @@ $strCopyTable = 'Kopírovat tabulku do (databáze<b>.</b>tabulka):';
$strCopyTableOK = 'Tabulka %s byla zkopírována do %s.';
$strCopyTableSameNames = 'Nelze kopírovat tabulku na sebe samu!';
$strCouldNotKill = 'phpMyAdminovi se nepodaøilo ukonèit vlákno %s. Pravdìpodobnì jeho bìh již skonèil.';
-$strCreateIndexTopic = 'Vytvoøit nový index';
+$strCreate = 'Vytvoøit';
$strCreateIndex = 'Vytvoøit index na&nbsp;%s&nbsp;sloupcích';
+$strCreateIndexTopic = 'Vytvoøit nový index';
$strCreateNewDatabase = 'Vytvoøit novou databázi';
$strCreateNewTable = 'Vytvoøit novou tabulku v&nbsp;databázi %s';
$strCreatePage = 'Vytvoøit novou stránku';
$strCreatePdfFeat = 'Vytváøení PDF';
-$strCreate = 'Vytvoøit';
$strCreationDates = 'Datum vytvoøení, poslední zmìny a kontroly';
$strCriteria = 'Podmínka';
$strCroatian = 'Chorvatština';
-$strCSVOptions = 'Nastavení CSV exportu';
$strCyrillic = 'Cyrilika';
$strCzech = 'Èeština';
$strCzechSlovak = 'Èeština/Slovenština';
+$strDBComment = 'Komentáø k databázi: ';
+$strDBCopy = 'Zkopírovat databázi na';
+$strDBGContext = 'Kontext';
+$strDBGContextID = 'Kontext ID';
+$strDBGHits = 'Zásahù';
+$strDBGLine = 'Øádka';
+$strDBGMaxTimeMs = 'Min. èas, ms';
+$strDBGMinTimeMs = 'Max. èas, ms';
+$strDBGModule = 'Modul';
+$strDBGTimePerHitMs = 'Èas/Zásah, ms';
+$strDBGTotalTimeMs = 'Celkový èas, ms';
+$strDBRename = 'Pøejmenovat databázi na';
$strDanish = 'Dánština';
+$strData = 'Data';
+$strDataDict = 'Datový slovník';
+$strDataOnly = ' Jen data';
$strDatabase = 'Databáze';
$strDatabaseEmpty = 'Jméno databáze je prázdné!';
$strDatabaseExportOptions = 'Nastavení exportu databází';
@@ -171,68 +189,53 @@ $strDatabaseHasBeenDropped = 'Databáze %s byla zrušena.';
$strDatabaseNoTable = 'Tato databáze neobsahuje žádné tabulky!';
$strDatabases = 'Databáze';
$strDatabasesDropped = '%s databáze byla úspìšnì zrušena.';
+$strDatabasesStats = 'Statistiky databází';
$strDatabasesStatsDisable = 'Skrýt podrobnosti';
$strDatabasesStatsEnable = 'Zobrazit podrobnosti';
$strDatabasesStatsHeavyTraffic = 'Poznámka: Zobrazení podrobností o&nbsp;databázích mùže zpùsobit znaèné zvýšení provozu mezi webserverem a MySQL serverem.';
-$strDatabasesStats = 'Statistiky databází';
-$strData = 'Data';
-$strDataDict = 'Datový slovník';
-$strDataOnly = ' Jen data';
-$strDBComment = 'Komentáø k databázi: ';
-$strDBCopy = 'Zkopírovat databázi na';
-$strDBGContextID = 'Kontext ID';
-$strDBGContext = 'Kontext';
-$strDBGHits = 'Zásahù';
-$strDBGLine = 'Øádka';
-$strDBGMaxTimeMs = 'Min. èas, ms';
-$strDBGMinTimeMs = 'Max. èas, ms';
-$strDBGModule = 'Modul';
-$strDBGTimePerHitMs = 'Èas/Zásah, ms';
-$strDBGTotalTimeMs = 'Celkový èas, ms';
$strDbPrivileges = 'Oprávnìní pro jednotlivé databáze';
-$strDBRename = 'Pøejmenovat databázi na';
$strDbSpecific = 'závislé na databázi';
-$strDefaultValueHelp = 'Výchozí hodnotu zadejte jen jednu hodnotu bez uvozovek a escapování znakù, napøíklad: a';
$strDefault = 'Výchozí';
+$strDefaultValueHelp = 'Výchozí hodnotu zadejte jen jednu hodnotu bez uvozovek a escapování znakù, napøíklad: a';
$strDefragment = 'Defragmentovat tabulku';
+$strDelOld = 'Aktuální stránka se odkazuje na tabulky, které již neexistují. Chcete odstranit tyto odkazy?';
$strDelayedInserts = 'Používat zpoždìné inserty';
-$strDeleteAndFlushDescr = 'Toto je nejèistší øešení, ale naèítání oprávnìní mùže trvat dlouho.';
+$strDelete = 'Smazat';
$strDeleteAndFlush = 'Odstranit uživatele a znovunaèíst oprávnìní.';
+$strDeleteAndFlushDescr = 'Toto je nejèistší øešení, ale naèítání oprávnìní mùže trvat dlouho.';
$strDeleted = 'Øádek byl smazán';
$strDeletedRows = 'Smazané øádky:';
-$strDelete = 'Smazat';
$strDeleting = 'Odstraòuji %s';
-$strDelOld = 'Aktuální stránka se odkazuje na tabulky, které již neexistují. Chcete odstranit tyto odkazy?';
$strDescending = 'Sestupnì';
$strDescription = 'Popis';
$strDictionary = 'slovník';
-$strDisabled = 'Vypnuto';
$strDisableForeignChecks = 'Vypnout kontrolu cizích klíèù';
+$strDisabled = 'Vypnuto';
$strDisplayFeat = 'Zobrazení funkcí';
$strDisplayOrder = 'Seøadit podle:';
$strDisplayPDF = 'Zobrazit jako schéma v&nbsp;PDF';
$strDoAQuery = 'Provést "dotaz podle pøíkladu" (zástupný znak: "%")';
-$strDocu = 'Dokumentace';
$strDoYouReally = 'Opravdu si pøejete vykonat pøíkaz';
-$strDropDatabaseStrongWarning = 'Chystáte se ZRUŠIT celou databázi!';
+$strDocu = 'Dokumentace';
$strDrop = 'Odstranit';
+$strDropDatabaseStrongWarning = 'Chystáte se ZRUŠIT celou databázi!';
$strDropSelectedDatabases = 'Zrušit vybranou databázi';
$strDropUsersDb = 'Odstranit databáze se stejnými jmény jako uživatelé.';
-$strDumpingData = 'Vypisuji data pro tabulku';
$strDumpSaved = 'Výpis byl uložen do souboru %s.';
$strDumpXRows = 'Vypsat %s øádkù od %s.';
+$strDumpingData = 'Vypisuji data pro tabulku';
$strDynamic = 'dynamický';
+$strEdit = 'Upravit';
$strEditPDFPages = 'Upravit PDF stránky';
$strEditPrivileges = 'Upravit oprávnìní';
-$strEdit = 'Upravit';
$strEffective = 'Efektivní';
-$strEmptyResultSet = 'MySQL vrátil prázdný výsledek (tj. nulový poèet øádkù).';
$strEmpty = 'Vyprázdnit';
+$strEmptyResultSet = 'MySQL vrátil prázdný výsledek (tj. nulový poèet øádkù).';
$strEnabled = 'Zapnuto';
$strEncloseInTransaction = 'Uzavøít pøíkazy v&nbsp;transakci';
-$strEndCut = 'KONEC VÝPISU';
$strEnd = 'Konec';
+$strEndCut = 'KONEC VÝPISU';
$strEndRaw = 'KONEC VÝPISU';
$strEnglish = 'Anglicky';
$strEnglishPrivileges = 'Poznámka: názvy oprávnìní v&nbsp;MySQL jsou uvádìny anglicky';
@@ -248,29 +251,29 @@ $strExtendedInserts = 'Rozšíøené inserty';
$strExtra = 'Extra';
$strFailedAttempts = 'Nepovedených pokusù';
+$strField = 'Sloupec';
$strFieldHasBeenDropped = 'Sloupec %s byl odstranìn';
+$strFields = 'Sloupce';
$strFieldsEmpty = ' Nebyl zadán poèet sloupcù! ';
$strFieldsEnclosedBy = 'Názvy sloupcù uzavøené do';
$strFieldsEscapedBy = 'Názvy sloupcù escapovány';
-$strField = 'Sloupec';
-$strFields = 'Sloupce';
$strFieldsTerminatedBy = 'Sloupce oddìlené';
$strFileAlreadyExists = 'Soubor %s již na serveru existuje, zmìòte jméno souboru, nebo zvolte pøepsání souboru.';
$strFileCouldNotBeRead = 'Soubor nelze pøeèíst';
+$strFileNameTemplate = 'Vzor pro jméno souboru';
$strFileNameTemplateHelp = 'Použijte __DB__ pro jméno databáze, __TABLE__ pro jméno tabulky a jakékoliv parametry pro %sfunkci strftime%s pro vložení data. Pøípona souboru bude automaticky pøidána podle typu. Jakýkoliv jiný text bude zachován.';
$strFileNameTemplateRemember = 'zapamatovat si hodnotu';
-$strFileNameTemplate = 'Vzor pro jméno souboru';
$strFixed = 'pevný';
$strFlushPrivilegesNote = 'Poznámka: phpMyAdmin získává oprávnìní pøímo z&nbsp;tabulek MySQL. Obsah tìchto tabulek se mùže lišit od oprávnìní, která server právì používá, pokud byly tyto tabulky upravovány. V&nbsp;tomto pøípadì je vhodné provést %sznovunaètení oprávnìní%s pøed pokraèováním.';
$strFlushTable = 'Vyprázdnit vyrovnávací pamì pro tabulku ("FLUSH")';
-$strFormat = 'Formát';
$strFormEmpty = 'Chybìjící hodnota ve formuláøi!';
+$strFormat = 'Formát';
$strFullText = 'Celé texty';
$strFunction = 'Funkce';
$strGenBy = 'Vygeneroval';
-$strGeneralRelationFeat = 'Obecné funkce relací';
$strGenTime = 'Vygenerováno';
+$strGeneralRelationFeat = 'Obecné funkce relací';
$strGeorgian = 'Gruzínština';
$strGerman = 'Nìmecky';
$strGlobal = 'globální';
@@ -288,8 +291,8 @@ $strHebrew = 'Hebrejština';
$strHexForBinary = 'Binarní pole vypisovat šestnáctkovì';
$strHome = 'Hlavní strana';
$strHomepageOfficial = 'Oficiální stránka phpMyAdmina';
-$strHostEmpty = 'Jméno poèítaèe je prázdné!';
$strHost = 'Poèítaè';
+$strHostEmpty = 'Jméno poèítaèe je prázdné!';
$strHungarian = 'Maïarština';
$strIcelandic = 'Islandština';
@@ -302,44 +305,48 @@ $strIgnoringFile = 'Ignoruji soubor %s';
$strImportDocSQL = 'Importovat soubory docSQL';
$strImportFiles = 'Importovat soubory';
$strImportFinished = 'Import ukonèen';
-$strIndexes = 'Indexy';
-$strIndexHasBeenDropped = 'Index %s byl odstranìn';
+$strInUse = 'právì se používá';
$strIndex = 'Index';
+$strIndexHasBeenDropped = 'Index %s byl odstranìn';
$strIndexName = 'Jméno indexu&nbsp;:';
$strIndexType = 'Typ indexu&nbsp;:';
+$strIndexWarningMultiple = 'Pro sloupec `%s` je vytvoøeno více indexù';
+$strIndexWarningPrimary = 'Sloupec `%s` by nemìl být zárovìò obsažen v&nbsp;PRIMARY a INDEX klíèi';
+$strIndexWarningTable = 'Problémy s&nbsp;indexy v&nbsp;tabulce `%s`';
+$strIndexWarningUnique = 'Sloupec `%s` by nemìl být zárovìò obsažen v&nbsp;PRIMARY a UNIQUE klíèi';
+$strIndexes = 'Indexy';
$strInnodbStat = 'Stav InnoDB';
$strInsecureMySQL = 'Máte standardní nastavení hesla uživatele root v&nbsp;MySQL. Doporuèujeme zmìnit toto nastavení a tím podstatnì zvýšit bezpeènost Vašeho serveru.';
+$strInsert = 'Vložit';
$strInsertAsNewRow = 'Vložit jako nový øádek';
$strInsertBookmarkTitle = 'Prosím zadejte název oblíbené položky';
-$strInsertedRowId = 'Id vloženého øádku:';
-$strInsertedRows = 'Vloženo øádkù:';
$strInsertNewRow = 'Vložit nový øádek';
$strInsertTextfiles = 'Vložit textové soubory do tabulky';
-$strInsert = 'Vložit';
+$strInsertedRowId = 'Id vloženého øádku:';
+$strInsertedRows = 'Vloženo øádkù:';
$strInstructions = 'Instrukce';
$strInternalNotNecessary = '* Interní relace není potøebná, pokud již relace existuje v InnoDB.';
$strInternalRelations = 'Interní relace';
-$strInUse = 'právì se používá';
$strJapanese = 'Japonština';
$strJumpToDB = 'Na databázi &quot;%s&quot;.';
-$strJustDeleteDescr = 'Odstranìní uživatelé stále budou mít pøistup na server dokud nebudou znovunaètena oprávnìní.';
$strJustDelete = 'Jen odstranit uživatele z tabulek s oprávnìními.';
+$strJustDeleteDescr = 'Odstranìní uživatelé stále budou mít pøistup na server dokud nebudou znovunaètena oprávnìní.';
$strKeepPass = 'Nemìnit heslo';
$strKeyname = 'Klíèový název';
$strKill = 'Ukonèit';
$strKorean = 'Korejština';
+$strLaTeX = 'LaTeX';
+$strLaTeXOptions = 'Nastavení exportu do LaTeXu';
$strLandscape = 'Na šíøku';
$strLatexCaption = 'Titulek tabulky';
$strLatexContent = 'Obsah tabulky __TABLE__';
-$strLatexContinuedCaption = 'Titulek pokraèování tabulky';
$strLatexContinued = '(pokraèování)';
+$strLatexContinuedCaption = 'Titulek pokraèování tabulky';
$strLatexIncludeCaption = 'Použít titulek tabulky';
$strLatexLabel = 'Návìstí';
-$strLaTeX = 'LaTeX';
-$strLaTeXOptions = 'Nastavení exportu do LaTeXu';
$strLatexStructure = 'Struktura tabulky __TABLE__';
$strLatvian = 'Lotyšština';
$strLengthSet = 'Délka/Množina*';
@@ -353,31 +360,33 @@ $strLoadExplanation = 'Automaticky jsou zvoleny nejvhodnìjší parametry, pokud to
$strLoadMethod = 'Parametry pro pøíkaz LOAD';
$strLocalhost = 'Lokální';
$strLocationTextfile = 'textový soubor';
-$strLoginInformation = 'Pøihlašování';
-$strLogin = 'Pøihlášení';
-$strLogout = 'Odhlásit se';
$strLogPassword = 'Heslo:';
$strLogServer = 'Server';
$strLogUsername = 'Jméno:';
+$strLogin = 'Pøihlášení';
+$strLoginInformation = 'Pøihlašování';
+$strLogout = 'Odhlásit se';
-$strMaximumSize = 'Maximální velikost: %s%s';
+$strMIMETypesForTable = 'MIME TYPY PRO TABULKU';
+$strMIME_MIMEtype = 'MIME typ';
$strMIME_available_mime = 'Dostupné MIME typy';
$strMIME_available_transform = 'Dostupné transformace';
$strMIME_description = 'Popis';
-$strMIME_MIMEtype = 'MIME typ';
$strMIME_nodescription = 'Pro tuto transformaci není dostupný žádný popis.<br />Zeptejte se autora co %s dìlá.';
+$strMIME_transformation = 'Transformace pøi prohlížení';
$strMIME_transformation_note = 'Pro seznam dostupných parametrù transformací a jejich MIME typù kliknìte na %spopisy transformací%s';
-$strMIME_transformation_options_note = 'Zadejte parametry transformací v&nbsp;následujícím tvaru: \'a\',\'b\',\'c\'...<br />Pokud potøebujete použít zpìtné lomítko ("\") nebo jednoduché uvozovky ("\'") mezi tìmito hodnotami, vložte pøed nì zpìtné lomítko (napøíklad \'\\\\xyz\' nebo \'a\\\'b\').';
$strMIME_transformation_options = 'Parametry transformace';
-$strMIME_transformation = 'Transformace pøi prohlížení';
-$strMIMETypesForTable = 'MIME TYPY PRO TABULKU';
+$strMIME_transformation_options_note = 'Zadejte parametry transformací v&nbsp;následujícím tvaru: \'a\',\'b\',\'c\'...<br />Pokud potøebujete použít zpìtné lomítko ("\") nebo jednoduché uvozovky ("\'") mezi tìmito hodnotami, vložte pøed nì zpìtné lomítko (napøíklad \'\\\\xyz\' nebo \'a\\\'b\').';
$strMIME_without = 'MIME typy zobrazené kurzívou nemají vlastní transformaèní funkci';
+$strMaximumSize = 'Maximální velikost: %s%s';
+$strMbExtensionMissing = 'Rozšíøení mbstring pro PHP nebylo nalezeno a zdá se, že požíváte vícebajtovou znakovou sadu. Bez rozšíøení mbstring neumí phpMyAdmin správnì rozdìlovat øetìzce a proto to mùže mít neèekané následky.';
+$strMbOverloadWarning = 'V&nbsp;nastavení PHP máte zapnuto mbstring.func_overload. Toto nastavení není kompatibilní s&nbsp;phpMyAdminem a mùže zpùsobit poškození dat!';
$strModifications = 'Zmìny byly uloženy';
-$strModifyIndexTopic = 'Upravit index';
$strModify = 'Úpravy';
+$strModifyIndexTopic = 'Upravit index';
$strMoreStatusVars = 'Další informace o&nbsp;stavu';
-$strMoveTableOK = 'Tabulka %s byla pøesunuta do %s.';
$strMoveTable = 'Pøesunout tabulku do (databáze<b>.</b>tabulka):';
+$strMoveTableOK = 'Tabulka %s byla pøesunuta do %s.';
$strMoveTableSameNames = 'Nelze pøesunout tabulku na sebe samu!';
$strMultilingual = 'mnohojazyèný';
$strMustSelectFile = 'Zvolte soubor, který chcete vložit.';
@@ -393,17 +402,17 @@ $strMySQLShowVars = 'Ukázat systémové promìnné MySQL';
$strName = 'Název';
$strNeedPrimaryKey = 'Pro tuto tabulku byste mìli definovat primární klíè.';
$strNext = 'Další';
-$strNoDatabasesSelected = 'Nebyla vybrána žádná databáze.';
+$strNo = 'Ne';
+$strNoActivity = 'Byli jste pøíliš dlouho neaktivní (déle než %s sekund), prosím pøihlašte se znovu';
$strNoDatabases = 'Žádné databáze';
+$strNoDatabasesSelected = 'Nebyla vybrána žádná databáze.';
$strNoDescription = 'žádný popisek';
$strNoDropDatabases = 'Pøíkaz "DROP DATABASE" je vypnutý.';
$strNoExplain = 'Bez vysvìtlení (EXPLAIN) SQL';
$strNoFrames = 'phpMyAdmin se lépe používá v&nbsp;prohlížeèi podporujícím rámy ("FRAME").';
-$strNoIndexPartsDefined = 'Žádná èást indexu nebyla definována!';
$strNoIndex = 'Žádný index nebyl definován!';
+$strNoIndexPartsDefined = 'Žádná èást indexu nebyla definována!';
$strNoModification = 'Žádná zmìna';
-$strNo = 'Ne';
-$strNone = 'Žádná';
$strNoOptions = 'Tento formát nemá žádná nastavení';
$strNoPassword = 'Žádné heslo';
$strNoPermission = 'Web server nemá oprávnìní uložit výpis do souboru %s.';
@@ -415,19 +424,20 @@ $strNoRowsSelected = 'Nebyla vybrán žádný øádek';
$strNoSpace = 'Nedostatek místa pro uložení souboru %s.';
$strNoTablesFound = 'V&nbsp;databázi nebyla nalezena žádná tabulka.';
$strNoThemeSupport = 'Není podporována zmìna tématu, zkontrolujte nastavení a témata v adresáøi %s.';
+$strNoUsersFound = 'Žádný uživatel nenalezen.';
+$strNoValidateSQL = 'Bez kontroly SQL';
+$strNone = 'Žádná';
$strNotNumber = 'Nebylo zadáno èíslo!';
$strNotOK = 'není v poøádku';
$strNotSet = '<b>%s</b> tabulka nenalezena nebo není nastavena v&nbsp;%s';
$strNotValidNumber = ' není platné èíslo øádku!';
-$strNoUsersFound = 'Žádný uživatel nenalezen.';
-$strNoValidateSQL = 'Bez kontroly SQL';
$strNull = 'Nulový';
$strNumSearchResultsInTable = '%s odpovídající(ch) záznam(ù) v&nbsp;tabulce <i>%s</i>';
$strNumSearchResultsTotal = '<b>Celkem:</b> <i>%s</i> odpovídající(ch) záznam(ù)';
$strNumTables = 'Tabulek';
-$strOftenQuotation = 'Èasto uvozující znaky. Volitelnì znamená, že pouze položky u kterých je to nutné (obvykle typu CHAR a VARCHAR) jsou uzavøeny do uzavíracích znakù.';
$strOK = 'OK';
+$strOftenQuotation = 'Èasto uvozující znaky. Volitelnì znamená, že pouze položky u kterých je to nutné (obvykle typu CHAR a VARCHAR) jsou uzavøeny do uzavíracích znakù.';
$strOperations = 'Úpravy';
$strOperator = 'Operátor';
$strOptimizeTable = 'Optimalizovat tabulku';
@@ -437,12 +447,15 @@ $strOr = 'nebo';
$strOverhead = 'Navíc';
$strOverwriteExisting = 'Pøepsat existující soubor(y)';
+$strPHP40203 = 'Používáte PHP 4.2.3, které má závažnou chybu pøi práci s&nbsp;vícebajtovými znaky (mbstring), jedná se o&nbsp;chybu PHP èíslo 19404. Nedoporuèujeme používat tuto verzi PHP s&nbsp;phpMyAdminem.';
+$strPHPVersion = 'Verze PHP';
$strPageNumber = 'Strana èíslo:';
$strPaperSize = 'Velikost stránky';
$strPartialText = 'Zkrácené texty';
+$strPassword = 'Heslo';
$strPasswordChanged = 'Heslo pro %s bylo úspìšnì zmìnìno.';
$strPasswordEmpty = 'Heslo je prázdné!';
-$strPassword = 'Heslo';
+$strPasswordHashing = 'Hašovací funkce pro heslo';
$strPasswordNotSame = 'Hesla nejsou stejná!';
$strPdfDbSchema = 'Schéma databáze "%s" - Strana %s';
$strPdfInvalidTblName = 'Tabulka "%s" neexistuje!';
@@ -452,8 +465,6 @@ $strPerMinute = 'za minutu';
$strPerSecond = 'za sekundu';
$strPersian = 'Perština';
$strPhoneBook = 'adresáø';
-$strPHP40203 = 'Používáte PHP 4.2.3, které má závažnou chybu pøi práci s&nbsp;vícebajtovými znaky (mbstring), jedná se o&nbsp;chybu PHP èíslo 19404. Nedoporuèujeme používat tuto verzi PHP s&nbsp;phpMyAdminem.';
-$strPHPVersion = 'Verze PHP';
$strPhp = 'Zobrazit PHP kód';
$strPmaDocumentation = 'Dokumentace phpMyAdmina';
$strPmaUriError = 'Parametr <tt>$cfg[\'PmaAbsoluteUri\']</tt> MUSÍ být nastaven v&nbsp;konfiguraèním souboru!';
@@ -461,13 +472,13 @@ $strPolish = 'Polština';
$strPortrait = 'Na výšku';
$strPos1 = 'Zaèátek';
$strPrevious = 'Pøedchozí';
+$strPrimary = 'Primární';
$strPrimaryKeyHasBeenDropped = 'Primární klíè byl odstranìn';
$strPrimaryKeyName = 'Jméno primárního klíèe musí být "PRIMARY"!';
$strPrimaryKeyWarning = '("PRIMARY" <b>musí</b> být jméno <b>pouze</b> primárního klíèe!)';
-$strPrimary = 'Primární';
-$strPrintViewFull = 'Náhled k vytištìní (s&nbsp;kompletními texty)';
-$strPrintView = 'Náhled k vytištìní';
$strPrint = 'Vytisknout';
+$strPrintView = 'Náhled k vytištìní';
+$strPrintViewFull = 'Náhled k vytištìní (s&nbsp;kompletními texty)';
$strPrivDescAllPrivileges = 'Všechna oprávnìní kromì GRANT.';
$strPrivDescAlter = 'Umožòuje mìnit strukturu existujících tabulek.';
$strPrivDescCreateDb = 'Umožòuje vytváøet nové databáze a tabulky.';
@@ -502,8 +513,8 @@ $strPrivilegesReloaded = 'Oprávnìní byla znovunaètena úspìšnì.';
$strProcesslist = 'Seznam procesù';
$strPutColNames = 'Pøidat jména sloupcù na první øádek';
-$strQBEDel = 'smazat';
$strQBE = 'Dotaz';
+$strQBEDel = 'smazat';
$strQBEIns = 'pøidat';
$strQueryFrame = 'SQL okno';
$strQueryOnDb = 'SQL dotaz na databázi <b>%s</b>:';
@@ -513,51 +524,63 @@ $strQueryTime = 'Dotaz zabral %01.4f sekund';
$strQueryType = 'Typ dotazu';
$strQueryWindowLock = 'Nepøepisovat tento dotaz z&nbsp;hlavního okna';
+$strReType = 'Heslo znovu';
$strReceived = 'Pøijato';
$strRecords = 'Záznamù';
$strReferentialIntegrity = 'Zkontrolovat integritu odkazù:';
$strRefresh = 'Obnovit';
-$strRelationalSchema = 'Relaèní schéma';
$strRelationNotWorking = 'Nìkteré z&nbsp;rozšíøených funkcí phpMyAdmina nelze používat. %sZde%s zjistíte proè.';
-$strRelationsForTable = 'RELACE PRO TABULKU';
-$strRelations = 'Relace';
$strRelationView = 'Zobrazit relace';
+$strRelationalSchema = 'Relaèní schéma';
+$strRelations = 'Relace';
+$strRelationsForTable = 'RELACE PRO TABULKU';
$strReloadFailed = 'Znovunaètení MySQL selhalo.';
-$strReloadingThePrivileges = 'Znovunaèítám oprávnìní';
$strReloadMySQL = 'Znovunaètení MySQL';
+$strReloadingThePrivileges = 'Znovunaèítám oprávnìní';
$strRemoveSelectedUsers = 'Odstranit vybrané uživatele';
$strRenameDatabaseOK = 'Databáze %s byla pøejmenována na %s';
-$strRenameTableOK = 'Tabulka %s byla pøejmenována na %s';
$strRenameTable = 'Pøejmenovat tabulku na';
+$strRenameTableOK = 'Tabulka %s byla pøejmenována na %s';
$strRepairTable = 'Opravit tabulku';
-$strReplaceNULLBy = 'Nahradit NULL hodnoty';
$strReplace = 'Pøepsat';
+$strReplaceNULLBy = 'Nahradit NULL hodnoty';
$strReplaceTable = 'Pøepsat data tabulky souborem';
$strReset = 'Pùvodní';
$strResourceLimits = 'Omezení zdrojù';
-$strReType = 'Heslo znovu';
-$strRevokeAndDeleteDescr = 'Uživatelé budou mít oprávnìní "USAGE" (používání) dokud nebudou znovunaètena oprávnìní.';
+$strRevoke = 'Zrušit';
$strRevokeAndDelete = 'Odebrat uživatelùm veškerá oprávnìní a poté je odstranit z tabulek.';
+$strRevokeAndDeleteDescr = 'Uživatelé budou mít oprávnìní "USAGE" (používání) dokud nebudou znovunaètena oprávnìní.';
$strRevokeMessage = 'Byla zrušena práva pro %s';
-$strRevoke = 'Zrušit';
$strRomanian = 'Rumunština';
$strRowLength = 'Délka øádku';
-$strRowsFrom = 'øádkù zaèínající od';
$strRowSize = ' Velikost øádku ';
+$strRows = 'Øádkù';
+$strRowsFrom = 'øádkù zaèínající od';
$strRowsModeFlippedHorizontal = 'vodorovném (otoèené hlavièky)';
$strRowsModeHorizontal = 'vodorovném';
$strRowsModeOptions = 've %s režimu a opakovat hlavièky po %s øádcích.';
$strRowsModeVertical = 'svislém';
-$strRows = 'Øádkù';
$strRowsStatistic = 'Statistika øádkù';
-$strRunning = 'na %s';
$strRunQuery = 'Provést dotaz';
$strRunSQLQuery = 'Spustit SQL dotaz(y) na databázi %s';
+$strRunning = 'na %s';
$strRussian = 'Ruština';
-$strSaveOnServer = 'Uložit na serveru v adresáøi %s';
+$strSQL = 'SQL';
+$strSQLExportCompatibility = 'Kompatibilita SQL exportu';
+$strSQLExportType = 'Typ vytvoøených dotazù';
+$strSQLOptions = 'Nastavení SQL exportu';
+$strSQLParserBugMessage = 'Je možné, že jste našli chybu v&nbsp;SQL parseru. Prosím prozkoumejte podrobnì SQL dotaz, pøedevším jestli jsou správnì uvozovky a jestli nejsou proházené. Další možnost selhání je pokud nahráváte soubor s&nbsp;binárními daty nezapsanými v&nbsp;uvozovkách. Mùžete také vyzkoušet pøíkazovou øádku MySQL. Níže uvedený výstup z&nbsp;MySQL serveru (pokud je nìjaký) Vám také mùže pomoci pøi zkoumání problému. Pokud stále máte problémy nebo pokud SQL parser ohlásí chybu u dotazu, který na pøíkazové øádce funguje, prosím pokuste se zredukovat dotaz na co nejmenší, ve kterém se problém ještì vyskytne, a ohlaste chybu na stránkách phpMyAdmina spolu se sekcí VÝPIS uvedenou níže:';
+$strSQLParserUserError = 'Pravdìpodobnì máte v&nbsp;SQL dotazu chybu. Níže uvedený výstup MySQL serveru (pokud je nìjaký) Vám také mùže pomoci pøi zkoumání problému';
+$strSQLQuery = 'SQL-dotaz';
+$strSQLResult = 'Výsledek SQL dotazu';
+$strSQPBugInvalidIdentifer = 'Chybný identifikátor';
+$strSQPBugUnclosedQuote = 'Neuzavøené uvozovky';
+$strSQPBugUnknownPunctuation = 'Neznámé interpunkèní znaménko';
$strSave = 'Ulož';
+$strSaveOnServer = 'Uložit na serveru v adresáøi %s';
$strScaleFactorSmall = 'Mìøítko je pøíliš malé, aby se schéma vešlo na jednu stránku';
+$strSearch = 'Vyhledávání';
$strSearchFormTitle = 'Vyhledávání v&nbsp;databázi';
$strSearchInTables = 'V&nbsp;tabulkách:';
$strSearchNeedle = 'Slova nebo hodnoty, které chcete vyhledat (zástupný znak: "%"):';
@@ -567,7 +590,6 @@ $strSearchOption3 = 'pøesnou frázi';
$strSearchOption4 = 'jako regulární výraz';
$strSearchResultsFor = 'Výsledky vyhledávání pro "<i>%s</i>" %s:';
$strSearchType = 'Najít:';
-$strSearch = 'Vyhledávání';
$strSecretRequired = 'Nastavte klíè pro šifrování cookies (blowfish_secret) v&nbsp;konfiguraèním souboru (config.inc.php).';
$strSelectADb = 'Prosím vyberte databázi';
$strSelectAll = 'Vybrat vše';
@@ -577,9 +599,9 @@ $strSelectNumRows = 'v&nbsp;dotazu';
$strSelectTables = 'Vybrat tabulky';
$strSend = 'Do souboru';
$strSent = 'Odesláno';
+$strServer = 'Server';
$strServerChoice = 'Výbìr serveru';
$strServerNotResponding = 'Server neodpovídá';
-$strServer = 'Server';
$strServerStatus = 'Stav serveru';
$strServerStatusUptime = 'Tento MySQL server bìží %s. Èas spuštìní: %s.';
$strServerTabProcesslist = 'Procesy';
@@ -589,41 +611,31 @@ $strServerVars = 'Promìnné a nastavení serveru';
$strServerVersion = 'Verze MySQL';
$strSessionValue = 'Hodnota sezení';
$strSetEnumVal = 'Pokud je sloupec typu "enum" nebo "set", zadávejte hodnoty v&nbsp;následujícím formátu: \'a\',\'b\',\'c\'...<br />Pokud potøebujete zadat zpìtné lomítko ("\") nebo jednoduché uvozovky ("\'") mezi tìmito hodnotami, napište pøed nì zpìtné lomítko (pøíklad: \'\\\\xyz\' nebo \'a\\\'b\').';
+$strShow = 'Zobrazit';
$strShowAll = 'Zobrazit vše';
$strShowColor = 'Barevné šipky';
$strShowDatadictAs = 'Formát datového slovníku';
$strShowFullQueries = 'Zobrazit celé dotazy';
$strShowGrid = 'Zobrazit møížku';
-$strShowingRecords = 'Zobrazeny záznamy';
$strShowPHPInfo = 'Zobrazit informace o&nbsp;PHP';
$strShowTableDimension = 'Rozmìry tabulek';
$strShowTables = 'Zobrazit tabulky';
$strShowThisQuery = 'Zobrazit zde tento dotaz znovu';
-$strShow = 'Zobrazit';
+$strShowingRecords = 'Zobrazeny záznamy';
$strSimplifiedChinese = 'Zjednodušená èínština';
$strSingly = '(po jednom)';
$strSize = 'Velikost';
$strSlovak = 'Slovenština';
$strSlovenian = 'Slovinština';
-$strSortByKey = 'Setøídit podle klíèe';
$strSort = 'Øadit';
+$strSortByKey = 'Setøídit podle klíèe';
$strSpaceUsage = 'Využití místa';
$strSpanish = 'Španìlština';
$strSplitWordsWithSpace = 'Slova jsou oddìlena mezerou (" ").';
-$strSQLExportType = 'Typ vytvoøených dotazù';
-$strSQLOptions = 'Nastavení SQL exportu';
-$strSQLParserBugMessage = 'Je možné, že jste našli chybu v&nbsp;SQL parseru. Prosím prozkoumejte podrobnì SQL dotaz, pøedevším jestli jsou správnì uvozovky a jestli nejsou proházené. Další možnost selhání je pokud nahráváte soubor s&nbsp;binárními daty nezapsanými v&nbsp;uvozovkách. Mùžete také vyzkoušet pøíkazovou øádku MySQL. Níže uvedený výstup z&nbsp;MySQL serveru (pokud je nìjaký) Vám také mùže pomoci pøi zkoumání problému. Pokud stále máte problémy nebo pokud SQL parser ohlásí chybu u dotazu, který na pøíkazové øádce funguje, prosím pokuste se zredukovat dotaz na co nejmenší, ve kterém se problém ještì vyskytne, a ohlaste chybu na stránkách phpMyAdmina spolu se sekcí VÝPIS uvedenou níže:';
-$strSQLParserUserError = 'Pravdìpodobnì máte v&nbsp;SQL dotazu chybu. Níže uvedený výstup MySQL serveru (pokud je nìjaký) Vám také mùže pomoci pøi zkoumání problému';
-$strSQLQuery = 'SQL-dotaz';
-$strSQLResult = 'Výsledek SQL dotazu';
-$strSQL = 'SQL';
-$strSQPBugInvalidIdentifer = 'Chybný identifikátor';
-$strSQPBugUnclosedQuote = 'Neuzavøené uvozovky';
-$strSQPBugUnknownPunctuation = 'Neznámé interpunkèní znaménko';
$strStatCheckTime = 'Poslední kontrola';
$strStatCreateTime = 'Vytvoøení';
-$strStatement = 'Údaj';
$strStatUpdateTime = 'Poslední zmìna';
+$strStatement = 'Údaj';
$strStatus = 'Stav';
$strStrucCSV = 'CSV data';
$strStrucData = 'Strukturu a data';
@@ -640,6 +652,7 @@ $strSwedish = 'Švédština';
$strSwitchToDatabase = 'Pøepnout na zkopírovanou databázi';
$strSwitchToTable = 'Pøepnout na zkopírovanou tabulku';
+$strTable = 'Tabulka';
$strTableComments = 'Komentáø k tabulce';
$strTableEmpty = 'Jméno tabulky je prázdné!';
$strTableHasBeenDropped = 'Tabulka %s byla odstranìna';
@@ -648,18 +661,17 @@ $strTableHasBeenFlushed = 'Vyrovnávací pamì pro tabulku %s byla vyprázdnìna';
$strTableMaintenance = ' Údržba tabulky ';
$strTableOfContents = 'Obsah';
$strTableOptions = 'Parametry tabulky';
-$strTables = '%s tabulek';
$strTableStructure = 'Struktura tabulky';
-$strTable = 'Tabulka';
$strTableType = 'Typ tabulky';
+$strTables = '%s tabulek';
$strTakeIt = 'zvolit';
$strTblPrivileges = 'Oprávnìní pro jednotlivé tabulky';
$strTextAreaLength = 'Tento sloupec možná nepùjde <br />(kvùli délce) upravit ';
$strThai = 'Thajština';
$strTheContent = 'Obsah souboru byl vložen';
$strTheContents = 'Obsah souboru pøepíše obsah zvolené tabulky v&nbsp;tìch øádcích, kde je stejný primární nebo unikátní klíè.';
-$strTheme = 'Vzhled';
$strTheTerminator = 'Sloupce jsou oddìleny tímto znakem.';
+$strTheme = 'Vzhled';
$strThisHost = 'Tento poèítaè';
$strThisNotDirectory = 'Nebyl zadán adresáø';
$strThreadSuccessfullyKilled = 'Vlákno %s bylo úspìšnì zabito.';
@@ -691,14 +703,19 @@ $strUnicode = 'Unicode';
$strUnique = 'Unikátní';
$strUnknown = 'neznámý';
$strUnselectAll = 'Odznaèit vše';
+$strUpdComTab = 'Podívejte se prosím do dokumentace, jak aktualizovat tabulku s&nbsp;informacemi o&nbsp; sloupcích (tabulka column_comments)';
$strUpdatePrivMessage = 'Byla aktualizována oprávnìní pro %s.';
$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šší.';
$strUsage = 'Používá';
$strUseBackquotes = 'Použít zpìtné uvozovky u&nbsp;jmen tabulek a sloupcù';
$strUseHostTable = 'Použít tabulku s&nbsp;poèítaèi';
+$strUseTabKey = 'Použijte klávesu TAB pro pohyb mezi hodnotami nebo CTRL+šipky po pohyb všemi smìry.';
+$strUseTables = 'Použít tabulky';
+$strUseTextField = 'Použít textové pole';
+$strUseThisValue = 'Použít tuto hodnotu';
+$strUser = 'Uživatel';
$strUserAlreadyExists = 'Uživatel %s již existuje!';
$strUserEmpty = 'Jméno uživatele je prázdné!';
$strUserName = 'Jméno uživatele';
@@ -706,22 +723,17 @@ $strUserNotFound = 'Zvolený uživatel nebyl nalezen v&nbsp;tabulce oprávnìní.';
$strUserOverview = 'Pøehled uživatelù';
$strUsersDeleted = 'Vybraní uživatelé byli úspìšnì odstranìni.';
$strUsersHavingAccessToDb = 'Uživatelé mající pøístup k&nbsp;&quot;%s&quot;';
-$strUser = 'Uživatel';
-$strUseTabKey = 'Použijte klávesu TAB pro pohyb mezi hodnotami nebo CTRL+šipky po pohyb všemi smìry.';
-$strUseTables = 'Použít tabulky';
-$strUseTextField = 'Použít textové pole';
-$strUseThisValue = 'Použít tuto hodnotu';
$strValidateSQL = 'Zkontrolovat SQL';
$strValidatorError = 'SQL validátor nemohl být inicializován. Prosím zkontrolujte, jestli máte požadovaná rozšíøení PHP, která jsou uvedena v&nbsp;%sdokumentaci%s.';
$strValue = 'Hodnota';
$strVar = 'Promìnná';
-$strViewDumpDatabases = 'Export databází';
-$strViewDumpDB = 'Export databáze';
$strViewDump = 'Export tabulky';
+$strViewDumpDB = 'Export databáze';
+$strViewDumpDatabases = 'Export databází';
-$strWebServerUploadDirectoryError = 'Adresáø urèený pro upload souborù nemohl být otevøen';
$strWebServerUploadDirectory = 'soubor z&nbsp;adresáøe pro upload';
+$strWebServerUploadDirectoryError = 'Adresáø urèený pro upload souborù nemohl být otevøen';
$strWelcome = 'Vítejte v&nbsp;%s';
$strWestEuropean = 'Západní Evropa';
$strWildcard = 'maska';
@@ -738,10 +750,4 @@ $strYes = 'Ano';
$strZeroRemovesTheLimit = 'Poznámka: Nastavení tìchto parametrù na 0 (nulu) odstraní omezení.';
$strZip = '"zazipováno"';
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
?>
diff --git a/lang/danish-iso-8859-1.inc.php b/lang/danish-iso-8859-1.inc.php
index 7bbfb5de7d..b2f2d11d15 100644
--- a/lang/danish-iso-8859-1.inc.php
+++ b/lang/danish-iso-8859-1.inc.php
@@ -1,5 +1,5 @@
<?php
-/* $Id: danish-iso-8859-1.inc.php,v 2.44 2004/09/26 01:23:45 */
+/* $Id: danish-iso-8859-1.inc.php,v 2.60 2004/12/08 01:23:45 */
$charset = 'iso-8859-1';
$text_dir = 'ltr';
@@ -11,7 +11,7 @@ $number_decimal_separator = ',';
$byteUnits = array('Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB');
$day_of_week = array('søn', 'man', 'tir', 'ons', 'tor', 'fre', 'lør');
-$month = array('Jan', 'Feb', 'Mar', 'Apr', 'Maj', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dec');
+$month = array('jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul', 'aug', 'sep', 'okt', 'nov', 'dec');
// Se http://www.php.net/manual/en/function.strftime.php
// for at definere variablen herunder
$datefmt = '%d/%m %Y kl. %H:%M:%S';
@@ -28,6 +28,7 @@ $strAddConstraints = 'Tilføj begrænsninger';
$strAddDeleteColumn = 'Tilføj/Slet felt-kolonne';
$strAddDeleteRow = 'Tilføj/Slet kriterie-række';
$strAddDropDatabase = 'Tilføj DROP DATABASE';
+$strAddFields = 'Tilføj %s felt(er)';
$strAddHeaderComment = 'Tilføj tilpassede kommentarer i headeren (\\n deler linjer)';
$strAddIfNotExists = 'Tilføj IF NOT EXISTS';
$strAddIntoComments = 'Tilføj til kommentarer';
@@ -55,6 +56,7 @@ $strAnd = 'Og';
$strAny = 'Enhver';
$strAnyHost = 'Enhver vært';
$strAnyUser = 'Enhver bruger';
+$strApproximateCount = 'Kan være anslået. Se FAQ 3.11';
$strArabic = 'Arabisk';
$strArmenian = 'Armensk';
$strAscending = 'Stigende';
@@ -68,8 +70,15 @@ $strBack = 'Tilbage';
$strBaltic = 'Baltisk';
$strBeginCut = 'BEGYND KLIP';
$strBeginRaw = 'BEGYND RÅ';
+$strBinLogEventType = 'Hændelsestype';
+$strBinLogInfo = 'Information';
+$strBinLogName = 'Lognavn';
+$strBinLogOriginalPosition = 'Original position';
+$strBinLogPosition = 'Position';
+$strBinLogServerId = 'Server ID';
$strBinary = ' Binært ';
$strBinaryDoNotEdit = ' Binært - må ikke ændres ';
+$strBinaryLog = 'Binær log';
$strBookmarkAllUsers = 'Lad alle brugere få adgang til bogmærket';
$strBookmarkDeleted = 'Bogmærket er fjernet.';
$strBookmarkLabel = 'Mærke';
@@ -121,6 +130,7 @@ $strColumnPrivileges = 'Kolonne-specifikke privilegier';
$strCommand = 'Kommando';
$strComments = 'Kommentarer';
$strCommentsForTable = 'COMMENTS FOR TABLE (tabel-kommentarer)';
+$strCompatibleHashing = 'MySQL&nbsp;4.0 kompatibel';
$strCompleteInserts = 'Lav komplette inserts';
$strCompression = 'Komprimering';
$strConfigFileError = 'phpMyAdmin kunne ikke læse din konfigurationsfil!<br />Dette kan ske hvis php finder en parser-fejl i den, eller php kan ikke finde filen.<br />Kald konfigurationsfilen direkte fra nedenstående link og læs de(n) phpfejlmeddelse(r) du får. I de fleste tilfælde mangler der et anførselstegn eller et semikolon et sted.<br />Hvis du får en blank side, er alt i orden.';
@@ -130,6 +140,7 @@ $strConnections = 'Forbindelser';
$strConstraintsForDumped = 'Begrænsninger for dumpede tabeller';
$strConstraintsForTable = 'Begrænsninger for tabel';
$strCookiesRequired = 'Herefter skal cookies være sat til.';
+$strCopyDatabaseOK = 'Database %s er blevet kopieret til %s';
$strCopyTable = 'Kopier tabel til (database<b>.</b>tabel):';
$strCopyTableOK = 'Tabellen %s er nu kopieret til: %s.';
$strCopyTableSameNames = 'Kan ikke kopiere tabellen til den samme!';
@@ -174,6 +185,7 @@ $strDatabasesStats = 'Databasestatistik';
$strDatabasesStatsDisable = 'Slå Statistikker fra';
$strDatabasesStatsEnable = 'Slå Statistikker til';
$strDatabasesStatsHeavyTraffic = 'Bemærk: At slå databasestatistikkerne til her kan forårsage tung trafik mellem webserveren og MySQL-serveren.';
+$strDBCopy = 'Kopiér database til';
$strDbPrivileges = 'Database-specifikke privilegier';
$strDbSpecific = 'database-specifik';
$strDefault = 'Standardværdi';
@@ -221,6 +233,7 @@ $strEndRaw = 'SLUT RÅ';
$strEnglish = 'Engelsk';
$strEnglishPrivileges = ' NB: Navne på MySQL privilegier er på engelsk ';
$strError = 'Fejl';
+$strEscapeWildcards = 'Jokertegn _ og % skal være escaped med en \ foran for at bruge dem bogstaveligt';
$strEstonian = 'Estisk';
$strExcelEdition = 'Excel-udgave';
$strExcelOptions = 'Excel-indstillinger';
@@ -276,7 +289,7 @@ $strHostEmpty = 'Der er intet værtsnavn!';
$strHungarian = 'Ungarsk';
$strIcelandic = 'Islandsk';
-$strId = 'ID';
+$strId = 'ID';
$strIdxFulltext = 'Fuldtekst';
$strIfYouWish = 'Hvis du kun ønsker at importere nogle af tabellens kolonner, angives de med en kommasepareret felt liste.';
$strIgnore = 'Ignorer';
@@ -290,11 +303,16 @@ $strIndex = 'Indeks';
$strIndexHasBeenDropped = 'Indeks %s er blevet slettet';
$strIndexName = 'Indeksnavn&nbsp;:';
$strIndexType = 'Indekstype&nbsp;:';
-$strIndexes = 'Indekser';
+$strIndexWarningMultiple = 'Mere end en %s nøgle blev skabt for kolonne `%s`';
+$strIndexWarningPrimary = 'PRIMARY og INDEX nøgler burde ikke begge være sat for kolonne `%s`';
+$strIndexWarningTable = 'Problemer med indeksene på tabel `%s`';
+$strIndexWarningUnique = 'UNIQUE og INDEX nøgler burde ikke begge være sat for kolonne `%s`';
+$strIndexes = 'Indeks';
$strInnodbStat = 'InnoDB status';
$strInsecureMySQL = 'Din konfigurationsfil indeholder indstillinger (root og uden kodeord) som svarer til en standard MySQL priviligeret brugerkonto. Din MySQL server kører med denne standardindstilling, <u>er åben for indtrængen</u>, og du bør virkelig gøre noget ved dette sikkerhedshul.';
$strInsert = 'Indsæt';
$strInsertAsNewRow = 'Indsæt som ny række';
+$strInsertBookmarkTitle = 'Indsæt venligst bogmærke-titel';
$strInsertNewRow = 'Indsæt ny række';
$strInsertTextfiles = 'Importer tekstfil til tabellen';
$strInsertedRowId = 'Indsat række-id:';
@@ -376,6 +394,7 @@ $strName = 'Navn';
$strNeedPrimaryKey = 'Du burde definere en primær nøgle for denne tabel.';
$strNext = 'Næste';
$strNo = 'Nej';
+$strNoActivity = 'Ingen aktivitet i de seneste %s sekunder eller mere, log venligst ind igen';
$strNoDatabases = 'Ingen databaser';
$strNoDatabasesSelected = 'Ingen databaser valgt.';
$strNoDescription = 'ingen beskrivelse';
@@ -395,6 +414,7 @@ $strNoRights = 'Du har ikke tilstrækkelige rettigheder til at være her!';
$strNoRowsSelected = 'Ingen rækker valgt';
$strNoSpace = 'Utilstrækkeligt plads til at gemme filen %s.';
$strNoTablesFound = 'Ingen tabeller fundet i databasen.';
+$strNoThemeSupport = 'Ingen tema/layout-understøttelse, tjek venligst din konfiguration og/eller dine temaer i mappen %s.';
$strNoUsersFound = 'Ingen bruger(e) fundet.';
$strNoValidateSQL = 'Spring over Validér SQL';
$strNone = 'Intet';
@@ -426,6 +446,7 @@ $strPartialText = 'Delvise tekster';
$strPassword = 'Kodeord';
$strPasswordChanged = 'Kodeordet for %s blev korrekt udskiftet.';
$strPasswordEmpty = 'Der er ikke angivet noget kodeord!';
+$strPasswordHashing = 'Kodeord Hashing'; // may be better
$strPasswordNotSame = 'De to kodeord er ikke ens!';
$strPdfDbSchema = 'Skematik for databasen "%s" - Side %s';
$strPdfInvalidTblName = 'Tabellen "%s" findes ikke!';
@@ -481,6 +502,7 @@ $strPrivDescUsage = 'Ingen privilegier.';
$strPrivileges = 'Privilegier';
$strPrivilegesReloaded = 'Privilegierne blev korrekt genindlæst.';
$strProcesslist = 'Procesliste';
+$strProperties = 'Egenskaber';
$strPutColNames = 'Indsæt feltnavne i første række';
$strQBE = 'Foresp. via eks.';
@@ -562,6 +584,7 @@ $strSearchType = 'Find:';
$strSecretRequired = 'Konfigurationsfilen skal nu bruge et hemmeligt kodeord (blowfish_secret).';
$strSelectADb = 'Vælg en database';
$strSelectAll = 'Vælg alle';
+$strSelectBinaryLog = 'Vælg binærlog til gennemsyn';
$strSelectFields = 'Vælg mindst eet felt:';
$strSelectNumRows = 'i forespørgsel';
$strSelectTables = 'Vælg Tabeller';
@@ -606,7 +629,7 @@ $strStatUpdateTime = 'Sidste opdatering';
$strStatement = 'Erklæringer';
$strStatus = 'Status';
$strStrucCSV = 'CSV-data';
-$strStrucData = 'Struturen og data';
+$strStrucData = 'Struktur og data';
$strStrucDrop = 'Tilføj \'DROP TABLE\'';
$strStrucExcelCSV = 'CSV til MS Excel-data';
$strStrucNativeExcel = 'Fødte MS Excel-data';
@@ -617,6 +640,7 @@ $strSubmit = 'Send';
$strSuccess = 'Din SQL-forespørgsel blev udført korrekt';
$strSum = 'Sum';
$strSwedish = 'Svensk';
+$strSwitchToDatabase = 'Skift til den kopierede database';
$strSwitchToTable = 'Skift til den kopierede tabel';
$strTable = 'Tabel';
@@ -678,6 +702,7 @@ $strUpgrade = 'Du burde opdatere til %s %s eller senere.';
$strUsage = 'Benyttelse';
$strUseBackquotes = 'Brug \'backquotes\' på tabellers og felters navne';
$strUseHostTable = 'Brug Host Tabel';
+$strUseTabKey = 'Brug TAB tasten for at flytte dig fra værdi til værdi, eller CTRL+piletasterne til at flytte frit omkring';
$strUseTables = 'Benyt tabeller';
$strUseTextField = 'Brug tekstfelt';
$strUseThisValue = 'Brug denne værdi';
@@ -714,28 +739,10 @@ $strXML = 'XML';
$strYes = 'Ja';
$strZeroRemovesTheLimit = 'Bemærk: Indstilling af disse værdier til 0 (nul) fjerner begrænsningen.';
-$strZip = '"zipped"';
+$strZip = '"zippet"';
-$strAddFields = 'Add %s field(s)'; //to translate
-$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
-$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php
index f2b8482816..7825b73736 100644
--- a/lang/danish-utf-8.inc.php
+++ b/lang/danish-utf-8.inc.php
@@ -1,5 +1,5 @@
<?php
-/* $Id: danish-utf-8.inc.php,v 2.44 2004/09/26 01:23:45 */
+/* $Id: danish-utf-8.inc.php,v 2.60 2004/12/08 01:23:45 */
$charset = 'utf-8';
$allow_recoding = TRUE;
@@ -12,7 +12,7 @@ $number_decimal_separator = ',';
$byteUnits = array('Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB');
$day_of_week = array('søn', 'man', 'tir', 'ons', 'tor', 'fre', 'lør');
-$month = array('Jan', 'Feb', 'Mar', 'Apr', 'Maj', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dec');
+$month = array('jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul', 'aug', 'sep', 'okt', 'nov', 'dec');
// Se http://www.php.net/manual/en/function.strftime.php
// for at definere variablen herunder
$datefmt = '%d/%m %Y kl. %H:%M:%S';
@@ -29,6 +29,7 @@ $strAddConstraints = 'Tilføj begrænsninger';
$strAddDeleteColumn = 'Tilføj/Slet felt-kolonne';
$strAddDeleteRow = 'Tilføj/Slet kriterie-række';
$strAddDropDatabase = 'Tilføj DROP DATABASE';
+$strAddFields = 'Tilføj %s felt(er)';
$strAddHeaderComment = 'Tilføj tilpassede kommentarer i headeren (\\n deler linjer)';
$strAddIfNotExists = 'Tilføj IF NOT EXISTS';
$strAddIntoComments = 'Tilføj til kommentarer';
@@ -56,6 +57,7 @@ $strAnd = 'Og';
$strAny = 'Enhver';
$strAnyHost = 'Enhver vært';
$strAnyUser = 'Enhver bruger';
+$strApproximateCount = 'Kan være anslået. Se FAQ 3.11';
$strArabic = 'Arabisk';
$strArmenian = 'Armensk';
$strAscending = 'Stigende';
@@ -69,8 +71,15 @@ $strBack = 'Tilbage';
$strBaltic = 'Baltisk';
$strBeginCut = 'BEGYND KLIP';
$strBeginRaw = 'BEGYND RÃ…';
+$strBinLogEventType = 'Hændelsestype';
+$strBinLogInfo = 'Information';
+$strBinLogName = 'Lognavn';
+$strBinLogOriginalPosition = 'Original position';
+$strBinLogPosition = 'Position';
+$strBinLogServerId = 'Server ID';
$strBinary = ' Binært ';
$strBinaryDoNotEdit = ' Binært - må ikke ændres ';
+$strBinaryLog = 'Binær log';
$strBookmarkAllUsers = 'Lad alle brugere få adgang til bogmærket';
$strBookmarkDeleted = 'Bogmærket er fjernet.';
$strBookmarkLabel = 'Mærke';
@@ -122,6 +131,7 @@ $strColumnPrivileges = 'Kolonne-specifikke privilegier';
$strCommand = 'Kommando';
$strComments = 'Kommentarer';
$strCommentsForTable = 'COMMENTS FOR TABLE (tabel-kommentarer)';
+$strCompatibleHashing = 'MySQL&nbsp;4.0 kompatibel';
$strCompleteInserts = 'Lav komplette inserts';
$strCompression = 'Komprimering';
$strConfigFileError = 'phpMyAdmin kunne ikke læse din konfigurationsfil!<br />Dette kan ske hvis php finder en parser-fejl i den, eller php kan ikke finde filen.<br />Kald konfigurationsfilen direkte fra nedenstående link og læs de(n) phpfejlmeddelse(r) du får. I de fleste tilfælde mangler der et anførselstegn eller et semikolon et sted.<br />Hvis du får en blank side, er alt i orden.';
@@ -131,6 +141,7 @@ $strConnections = 'Forbindelser';
$strConstraintsForDumped = 'Begrænsninger for dumpede tabeller';
$strConstraintsForTable = 'Begrænsninger for tabel';
$strCookiesRequired = 'Herefter skal cookies være sat til.';
+$strCopyDatabaseOK = 'Database %s er blevet kopieret til %s';
$strCopyTable = 'Kopier tabel til (database<b>.</b>tabel):';
$strCopyTableOK = 'Tabellen %s er nu kopieret til: %s.';
$strCopyTableSameNames = 'Kan ikke kopiere tabellen til den samme!';
@@ -175,6 +186,7 @@ $strDatabasesStats = 'Databasestatistik';
$strDatabasesStatsDisable = 'Slå Statistikker fra';
$strDatabasesStatsEnable = 'Slå Statistikker til';
$strDatabasesStatsHeavyTraffic = 'Bemærk: At slå databasestatistikkerne til her kan forårsage tung trafik mellem webserveren og MySQL-serveren.';
+$strDBCopy = 'Kopiér database til';
$strDbPrivileges = 'Database-specifikke privilegier';
$strDbSpecific = 'database-specifik';
$strDefault = 'Standardværdi';
@@ -222,6 +234,7 @@ $strEndRaw = 'SLUT RÃ…';
$strEnglish = 'Engelsk';
$strEnglishPrivileges = ' NB: Navne på MySQL privilegier er på engelsk ';
$strError = 'Fejl';
+$strEscapeWildcards = 'Jokertegn _ og % skal være escaped med en \ foran for at bruge dem bogstaveligt';
$strEstonian = 'Estisk';
$strExcelEdition = 'Excel-udgave';
$strExcelOptions = 'Excel-indstillinger';
@@ -277,7 +290,7 @@ $strHostEmpty = 'Der er intet værtsnavn!';
$strHungarian = 'Ungarsk';
$strIcelandic = 'Islandsk';
-$strId = 'ID';
+$strId = 'ID';
$strIdxFulltext = 'Fuldtekst';
$strIfYouWish = 'Hvis du kun ønsker at importere nogle af tabellens kolonner, angives de med en kommasepareret felt liste.';
$strIgnore = 'Ignorer';
@@ -291,11 +304,16 @@ $strIndex = 'Indeks';
$strIndexHasBeenDropped = 'Indeks %s er blevet slettet';
$strIndexName = 'Indeksnavn&nbsp;:';
$strIndexType = 'Indekstype&nbsp;:';
-$strIndexes = 'Indekser';
+$strIndexWarningMultiple = 'Mere end en %s nøgle blev skabt for kolonne `%s`';
+$strIndexWarningPrimary = 'PRIMARY og INDEX nøgler burde ikke begge være sat for kolonne `%s`';
+$strIndexWarningTable = 'Problemer med indeksene på tabel `%s`';
+$strIndexWarningUnique = 'UNIQUE og INDEX nøgler burde ikke begge være sat for kolonne `%s`';
+$strIndexes = 'Indeks';
$strInnodbStat = 'InnoDB status';
$strInsecureMySQL = 'Din konfigurationsfil indeholder indstillinger (root og uden kodeord) som svarer til en standard MySQL priviligeret brugerkonto. Din MySQL server kører med denne standardindstilling, <u>er åben for indtrængen</u>, og du bør virkelig gøre noget ved dette sikkerhedshul.';
$strInsert = 'Indsæt';
$strInsertAsNewRow = 'Indsæt som ny række';
+$strInsertBookmarkTitle = 'Indsæt venligst bogmærke-titel';
$strInsertNewRow = 'Indsæt ny række';
$strInsertTextfiles = 'Importer tekstfil til tabellen';
$strInsertedRowId = 'Indsat række-id:';
@@ -377,6 +395,7 @@ $strName = 'Navn';
$strNeedPrimaryKey = 'Du burde definere en primær nøgle for denne tabel.';
$strNext = 'Næste';
$strNo = 'Nej';
+$strNoActivity = 'Ingen aktivitet i de seneste %s sekunder eller mere, log venligst ind igen';
$strNoDatabases = 'Ingen databaser';
$strNoDatabasesSelected = 'Ingen databaser valgt.';
$strNoDescription = 'ingen beskrivelse';
@@ -396,6 +415,7 @@ $strNoRights = 'Du har ikke tilstrækkelige rettigheder til at være her!';
$strNoRowsSelected = 'Ingen rækker valgt';
$strNoSpace = 'Utilstrækkeligt plads til at gemme filen %s.';
$strNoTablesFound = 'Ingen tabeller fundet i databasen.';
+$strNoThemeSupport = 'Ingen tema/layout-understøttelse, tjek venligst din konfiguration og/eller dine temaer i mappen %s.';
$strNoUsersFound = 'Ingen bruger(e) fundet.';
$strNoValidateSQL = 'Spring over Validér SQL';
$strNone = 'Intet';
@@ -427,6 +447,7 @@ $strPartialText = 'Delvise tekster';
$strPassword = 'Kodeord';
$strPasswordChanged = 'Kodeordet for %s blev korrekt udskiftet.';
$strPasswordEmpty = 'Der er ikke angivet noget kodeord!';
+$strPasswordHashing = 'Kodeord Hashing'; // may be better
$strPasswordNotSame = 'De to kodeord er ikke ens!';
$strPdfDbSchema = 'Skematik for databasen "%s" - Side %s';
$strPdfInvalidTblName = 'Tabellen "%s" findes ikke!';
@@ -482,6 +503,7 @@ $strPrivDescUsage = 'Ingen privilegier.';
$strPrivileges = 'Privilegier';
$strPrivilegesReloaded = 'Privilegierne blev korrekt genindlæst.';
$strProcesslist = 'Procesliste';
+$strProperties = 'Egenskaber';
$strPutColNames = 'Indsæt feltnavne i første række';
$strQBE = 'Foresp. via eks.';
@@ -563,6 +585,7 @@ $strSearchType = 'Find:';
$strSecretRequired = 'Konfigurationsfilen skal nu bruge et hemmeligt kodeord (blowfish_secret).';
$strSelectADb = 'Vælg en database';
$strSelectAll = 'Vælg alle';
+$strSelectBinaryLog = 'Vælg binærlog til gennemsyn';
$strSelectFields = 'Vælg mindst eet felt:';
$strSelectNumRows = 'i forespørgsel';
$strSelectTables = 'Vælg Tabeller';
@@ -607,7 +630,7 @@ $strStatUpdateTime = 'Sidste opdatering';
$strStatement = 'Erklæringer';
$strStatus = 'Status';
$strStrucCSV = 'CSV-data';
-$strStrucData = 'Struturen og data';
+$strStrucData = 'Struktur og data';
$strStrucDrop = 'Tilføj \'DROP TABLE\'';
$strStrucExcelCSV = 'CSV til MS Excel-data';
$strStrucNativeExcel = 'Fødte MS Excel-data';
@@ -618,6 +641,7 @@ $strSubmit = 'Send';
$strSuccess = 'Din SQL-forespørgsel blev udført korrekt';
$strSum = 'Sum';
$strSwedish = 'Svensk';
+$strSwitchToDatabase = 'Skift til den kopierede database';
$strSwitchToTable = 'Skift til den kopierede tabel';
$strTable = 'Tabel';
@@ -679,6 +703,7 @@ $strUpgrade = 'Du burde opdatere til %s %s eller senere.';
$strUsage = 'Benyttelse';
$strUseBackquotes = 'Brug \'backquotes\' på tabellers og felters navne';
$strUseHostTable = 'Brug Host Tabel';
+$strUseTabKey = 'Brug TAB tasten for at flytte dig fra værdi til værdi, eller CTRL+piletasterne til at flytte frit omkring';
$strUseTables = 'Benyt tabeller';
$strUseTextField = 'Brug tekstfelt';
$strUseThisValue = 'Brug denne værdi';
@@ -715,28 +740,10 @@ $strXML = 'XML';
$strYes = 'Ja';
$strZeroRemovesTheLimit = 'Bemærk: Indstilling af disse værdier til 0 (nul) fjerner begrænsningen.';
-$strZip = '"zipped"';
+$strZip = '"zippet"';
-$strAddFields = 'Add %s field(s)'; //to translate
-$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
-$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/dutch-iso-8859-1.inc.php b/lang/dutch-iso-8859-1.inc.php
index 07b00fa238..33afef52c7 100644
--- a/lang/dutch-iso-8859-1.inc.php
+++ b/lang/dutch-iso-8859-1.inc.php
@@ -742,4 +742,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php
index 8b5aad5a5c..7da26a4c0c 100644
--- a/lang/dutch-utf-8.inc.php
+++ b/lang/dutch-utf-8.inc.php
@@ -743,4 +743,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/english-iso-8859-1.inc.php b/lang/english-iso-8859-1.inc.php
index 88b2c12d78..d09573e310 100644
--- a/lang/english-iso-8859-1.inc.php
+++ b/lang/english-iso-8859-1.inc.php
@@ -17,6 +17,7 @@ $month = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'O
$datefmt = '%B %d, %Y at %I:%M %p';
$timespanfmt = '%s days, %s hours, %s minutes and %s seconds';
+$strAPrimaryKey = 'A primary key has been added on %s';
$strAbortedClients = 'Aborted';
$strAbsolutePathToDocSqlDir = 'Please enter the absolute path on webserver to docSQL directory';
$strAccessDenied = 'Access denied';
@@ -27,8 +28,6 @@ $strAddConstraints = 'Add constraints';
$strAddDeleteColumn = 'Add/Delete Field Columns';
$strAddDeleteRow = 'Add/Delete Criteria Row';
$strAddDropDatabase = 'Add DROP DATABASE';
-$strAddedColumnComment = 'Added comment for column';
-$strAddedColumnRelation = 'Added relation for column';
$strAddFields = 'Add %s field(s)';
$strAddHeaderComment = 'Add custom comment into header (\\n splits lines)';
$strAddIfNotExists = 'Add IF NOT EXISTS';
@@ -40,22 +39,25 @@ $strAddSearchConditions = 'Add search conditions (body of the "where" clause):';
$strAddToIndex = 'Add to index &nbsp;%s&nbsp;column(s)';
$strAddUser = 'Add a new User';
$strAddUserMessage = 'You have added a new user.';
+$strAddedColumnComment = 'Added comment for column';
+$strAddedColumnRelation = 'Added relation for column';
$strAdministration = 'Administration';
$strAffectedRows = 'Affected rows:';
$strAfter = 'After %s';
$strAfterInsertBack = 'Go back to previous page';
$strAfterInsertNewInsert = 'Insert another new row';
+$strAfterInsertNext = 'Edit next row';
$strAfterInsertSame = 'Go back to this page';
$strAll = 'All';
$strAllTableSameWidth = 'display all Tables with same width?';
$strAlterOrderBy = 'Alter table order by';
+$strAnIndex = 'An index has been added on %s';
$strAnalyzeTable = 'Analyze table';
$strAnd = 'And';
-$strAnIndex = 'An index has been added on %s';
$strAny = 'Any';
$strAnyHost = 'Any host';
$strAnyUser = 'Any user';
-$strAPrimaryKey = 'A primary key has been added on %s';
+$strApproximateCount = 'May be approximate. See FAQ 3.11';
$strArabic = 'Arabic';
$strArmenian = 'Armenian';
$strAscending = 'Ascending';
@@ -69,15 +71,15 @@ $strBack = 'Back';
$strBaltic = 'Baltic';
$strBeginCut = 'BEGIN CUT';
$strBeginRaw = 'BEGIN RAW';
-$strBinary = 'Binary';
-$strBinaryDoNotEdit = 'Binary - do not edit';
-$strBinaryLog = 'Binary log';
$strBinLogEventType = 'Event type';
$strBinLogInfo = 'Information';
$strBinLogName = 'Log name';
$strBinLogOriginalPosition = 'Original position';
$strBinLogPosition = 'Position';
$strBinLogServerId = 'Server ID';
+$strBinary = 'Binary';
+$strBinaryDoNotEdit = 'Binary - do not edit';
+$strBinaryLog = 'Binary log';
$strBookmarkAllUsers = 'Let every user access this bookmark';
$strBookmarkDeleted = 'The bookmark has been deleted.';
$strBookmarkLabel = 'Label';
@@ -91,6 +93,7 @@ $strBulgarian = 'Bulgarian';
$strBzError = 'phpMyAdmin was unable to compress the dump because of a broken Bz2 extension in this php version. It is strongly recommended to set the <code>$cfg[\'BZipDump\']</code> directive in your phpMyAdmin configuration file to <code>FALSE</code>. If you want to use the Bz2 compression features, you should upgrade to a later php version. See php bug report %s for details.';
$strBzip = '"bzipped"';
+$strCSVOptions = 'CSV options';
$strCalendar = 'Calendar';
$strCannotLogin = 'Cannot login to MySQL server';
$strCantLoad = 'cannot load %s extension,<br />please check PHP Configuration';
@@ -103,8 +106,8 @@ $strCaseInsensitive = 'case-insensitive';
$strCaseSensitive = 'case-sensitive';
$strCentralEuropean = 'Central European';
$strChange = 'Change';
-$strChangeCopyModeCopy = '... keep the old one.';
$strChangeCopyMode = 'Create a new user with the same privileges and ...';
+$strChangeCopyModeCopy = '... keep the old one.';
$strChangeCopyModeDeleteAndReload = ' ... delete the old one from the user tables and reload the privileges afterwards.';
$strChangeCopyModeJustDelete = ' ... delete the old one from the user tables.';
$strChangeCopyModeRevoke = ' ... revoke all active privileges from the old one and delete it afterwards.';
@@ -113,8 +116,8 @@ $strChangeDisplay = 'Choose Field to display';
$strChangePassword = 'Change password';
$strCharset = 'Charset';
$strCharsetOfFile = 'Character set of the file:';
-$strCharsetsAndCollations = 'Character Sets and Collations';
$strCharsets = 'Charsets';
+$strCharsetsAndCollations = 'Character Sets and Collations';
$strCheckAll = 'Check All';
$strCheckOverhead = 'Check overheaded';
$strCheckPrivs = 'Check Privileges';
@@ -128,6 +131,7 @@ $strColumnPrivileges = 'Column-specific privileges';
$strCommand = 'Command';
$strComments = 'Comments';
$strCommentsForTable = 'COMMENTS FOR TABLE';
+$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible';
$strCompleteInserts = 'Complete inserts';
$strCompression = 'Compression';
$strConfigFileError = 'phpMyAdmin was unable to read your configuration file!<br />This might happen if php finds a parse error in it or php cannot find the file.<br />Please call the configuration file directly using the link below and read the php error message(s) that you receive. In most cases a quote or a semicolon is missing somewhere.<br />If you receive a blank page, everything is fine.';
@@ -152,12 +156,26 @@ $strCreatePdfFeat = 'Creation of PDFs';
$strCreationDates = 'Creation/Update/Check dates';
$strCriteria = 'Criteria';
$strCroatian = 'Croatian';
-$strCSVOptions = 'CSV options';
$strCyrillic = 'Cyrillic';
$strCzech = 'Czech';
$strCzechSlovak = 'Czech-Slovak';
+$strDBComment = 'Database comment: ';
+$strDBCopy = 'Copy database to';
+$strDBGContext = 'Context';
+$strDBGContextID = 'Context ID';
+$strDBGHits = 'Hits';
+$strDBGLine = 'Line';
+$strDBGMaxTimeMs = 'Max time, ms';
+$strDBGMinTimeMs = 'Min time, ms';
+$strDBGModule = 'Module';
+$strDBGTimePerHitMs = 'Time/Hit, ms';
+$strDBGTotalTimeMs = 'Total time, ms';
+$strDBRename = 'Rename database to';
$strDanish = 'Danish';
+$strData = 'Data';
+$strDataDict = 'Data Dictionary';
+$strDataOnly = 'Data only';
$strDatabase = 'Database';
$strDatabaseEmpty = 'The database name is empty!';
$strDatabaseExportOptions = 'Database export options';
@@ -169,52 +187,37 @@ $strDatabasesStats = 'Databases statistics';
$strDatabasesStatsDisable = 'Disable Statistics';
$strDatabasesStatsEnable = 'Enable Statistics';
$strDatabasesStatsHeavyTraffic = 'Note: Enabling the Database statistics here might cause heavy traffic between the webserver and the MySQL one.';
-$strData = 'Data';
-$strDataDict = 'Data Dictionary';
-$strDataOnly = 'Data only';
-$strDBComment = 'Database comment: ';
-$strDBCopy = 'Copy database to';
-$strDBGContext = 'Context';
-$strDBGContextID = 'Context ID';
-$strDBGHits = 'Hits';
-$strDBGLine = 'Line';
-$strDBGMaxTimeMs = 'Max time, ms';
-$strDBGMinTimeMs = 'Min time, ms';
-$strDBGModule = 'Module';
-$strDBGTimePerHitMs = 'Time/Hit, ms';
-$strDBGTotalTimeMs = 'Total time, ms';
$strDbPrivileges = 'Database-specific privileges';
-$strDBRename = 'Rename database to';
$strDbSpecific = 'database-specific';
$strDefault = 'Default';
$strDefaultValueHelp = 'For default values, please enter just a single value, without backslash escaping or quotes, using this format: a';
$strDefragment = 'Defragment table';
+$strDelOld = 'The current Page has References to Tables that no longer exist. Would you like to delete those References?';
$strDelayedInserts = 'Use delayed inserts';
+$strDelete = 'Delete';
$strDeleteAndFlush = 'Delete the users and reload the privileges afterwards.';
$strDeleteAndFlushDescr = 'This is the cleanest way, but reloading the privileges may take a while.';
-$strDelete = 'Delete';
-$strDeletedRows = 'Deleted rows:';
$strDeleted = 'The row has been deleted';
+$strDeletedRows = 'Deleted rows:';
$strDeleting = 'Deleting %s';
-$strDelOld = 'The current Page has References to Tables that no longer exist. Would you like to delete those References?';
$strDescending = 'Descending';
$strDescription = 'Description';
$strDictionary = 'dictionary';
-$strDisabled = 'Disabled';
$strDisableForeignChecks = 'Disable foreign key checks';
+$strDisabled = 'Disabled';
$strDisplayFeat = 'Display Features';
$strDisplayOrder = 'Display order:';
$strDisplayPDF = 'Display PDF schema';
$strDoAQuery = 'Do a "query by example" (wildcard: "%")';
-$strDocu = 'Documentation';
$strDoYouReally = 'Do you really want to ';
-$strDropDatabaseStrongWarning = 'You are about to DESTROY a complete database!';
+$strDocu = 'Documentation';
$strDrop = 'Drop';
+$strDropDatabaseStrongWarning = 'You are about to DESTROY a complete database!';
$strDropSelectedDatabases = 'Drop Selected Databases';
$strDropUsersDb = 'Drop the databases that have the same names as the users.';
-$strDumpingData = 'Dumping data for table';
$strDumpSaved = 'Dump has been saved to file %s.';
$strDumpXRows = 'Dump %s row(s) starting at record # %s.';
+$strDumpingData = 'Dumping data for table';
$strDynamic = 'dynamic';
$strEdit = 'Edit';
@@ -225,8 +228,8 @@ $strEmpty = 'Empty';
$strEmptyResultSet = 'MySQL returned an empty result set (i.e. zero rows).';
$strEnabled = 'Enabled';
$strEncloseInTransaction = 'Enclose export in a transaction';
-$strEndCut = 'END CUT';
$strEnd = 'End';
+$strEndCut = 'END CUT';
$strEndRaw = 'END RAW';
$strEnglish = 'English';
$strEnglishPrivileges = ' Note: MySQL privilege names are expressed in English ';
@@ -244,10 +247,10 @@ $strExtra = 'Extra';
$strFailedAttempts = 'Failed attempts';
$strField = 'Field';
$strFieldHasBeenDropped = 'Field %s has been dropped';
+$strFields = 'Fields';
$strFieldsEmpty = ' The field count is empty! ';
$strFieldsEnclosedBy = 'Fields enclosed by';
$strFieldsEscapedBy = 'Fields escaped by';
-$strFields = 'Fields';
$strFieldsTerminatedBy = 'Fields terminated by';
$strFileAlreadyExists = 'File %s already exists on server, change filename or check overwrite option.';
$strFileCouldNotBeRead = 'File could not be read';
@@ -257,14 +260,14 @@ $strFileNameTemplateRemember = 'remember template';
$strFixed = 'fixed';
$strFlushPrivilegesNote = 'Note: phpMyAdmin gets the users\' privileges directly from MySQL\'s privilege tables. The content of these tables may differ from the privileges the server uses, if they have been changed manually. In this case, you should %sreload the privileges%s before you continue.';
$strFlushTable = 'Flush the table ("FLUSH")';
-$strFormat = 'Format';
$strFormEmpty = 'Missing value in the form !';
+$strFormat = 'Format';
$strFullText = 'Full Texts';
$strFunction = 'Function';
$strGenBy = 'Generated by';
-$strGeneralRelationFeat = 'General relation features';
$strGenTime = 'Generation Time';
+$strGeneralRelationFeat = 'General relation features';
$strGeorgian = 'Georgian';
$strGerman = 'German';
$strGlobal = 'global';
@@ -282,8 +285,8 @@ $strHebrew = 'Hebrew';
$strHexForBinary = 'Use hexadecimal for binary fields';
$strHome = 'Home';
$strHomepageOfficial = 'Official phpMyAdmin Homepage';
-$strHostEmpty = 'The host name is empty!';
$strHost = 'Host';
+$strHostEmpty = 'The host name is empty!';
$strHungarian = 'Hungarian';
$strIcelandic = 'Icelandic';
@@ -296,44 +299,48 @@ $strIgnoringFile = 'Ignoring file %s';
$strImportDocSQL = 'Import docSQL Files';
$strImportFiles = 'Import files';
$strImportFinished = 'Import finished';
-$strIndexes = 'Indexes';
-$strIndexHasBeenDropped = 'Index %s has been dropped';
+$strInUse = 'in use';
$strIndex = 'Index';
+$strIndexHasBeenDropped = 'Index %s has been dropped';
$strIndexName = 'Index name&nbsp;:';
$strIndexType = 'Index type&nbsp;:';
+$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';
+$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';
+$strIndexWarningTable = 'Problems with indexes of table `%s`';
+$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';
+$strIndexes = 'Indexes';
$strInnodbStat = 'InnoDB Status';
$strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';
+$strInsert = 'Insert';
$strInsertAsNewRow = 'Insert as a new row';
$strInsertBookmarkTitle = 'Please insert bookmark title';
-$strInsertedRowId = 'Inserted row id:';
-$strInsertedRows = 'Inserted rows:';
-$strInsert = 'Insert';
$strInsertNewRow = 'Insert new row';
$strInsertTextfiles = 'Insert data from a textfile into table';
+$strInsertedRowId = 'Inserted row id:';
+$strInsertedRows = 'Inserted rows:';
$strInstructions = 'Instructions';
$strInternalNotNecessary = '* An internal relation is not necessary when it exists also in InnoDB.';
$strInternalRelations = 'Internal relations';
-$strInUse = 'in use';
$strJapanese = 'Japanese';
$strJumpToDB = 'Jump to database &quot;%s&quot;.';
-$strJustDeleteDescr = 'The &quot;deleted&quot; users will still be able to access the server as usual until the privileges are reloaded.';
$strJustDelete = 'Just delete the users from the privilege tables.';
+$strJustDeleteDescr = 'The &quot;deleted&quot; users will still be able to access the server as usual until the privileges are reloaded.';
$strKeepPass = 'Do not change the password';
$strKeyname = 'Keyname';
$strKill = 'Kill';
$strKorean = 'Korean';
+$strLaTeX = 'LaTeX';
+$strLaTeXOptions = 'LaTeX options';
$strLandscape = 'Landscape';
$strLatexCaption = 'Table caption';
$strLatexContent = 'Content of table __TABLE__';
-$strLatexContinuedCaption = 'Continued table caption';
$strLatexContinued = '(continued)';
+$strLatexContinuedCaption = 'Continued table caption';
$strLatexIncludeCaption = 'Include table caption';
$strLatexLabel = 'Label key';
-$strLaTeX = 'LaTeX';
-$strLaTeXOptions = 'LaTeX options';
$strLatexStructure = 'Structure of table __TABLE__';
$strLatvian = 'Latvian';
$strLengthSet = 'Length/Values*';
@@ -347,28 +354,30 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
$strLoadMethod = 'LOAD method';
$strLocalhost = 'Local';
$strLocationTextfile = 'Location of the textfile';
-$strLoginInformation = 'Login Information';
-$strLogin = 'Login';
-$strLogout = 'Log out';
$strLogPassword = 'Password:';
$strLogServer = 'Server';
$strLogUsername = 'Username:';
+$strLogin = 'Login';
+$strLoginInformation = 'Login Information';
+$strLogout = 'Log out';
-$strMaximumSize = 'Max: %s%s';
+$strMIMETypesForTable = 'MIME TYPES FOR TABLE';
+$strMIME_MIMEtype = 'MIME-type';
$strMIME_available_mime = 'Available MIME-types';
$strMIME_available_transform = 'Available transformations';
$strMIME_description = 'Description';
-$strMIME_MIMEtype = 'MIME-type';
$strMIME_nodescription = 'No Description is available for this transformation.<br />Please ask the author, what %s does.';
$strMIME_transformation = 'Browser transformation';
$strMIME_transformation_note = 'For a list of available transformation options and their MIME-type transformations, click on %stransformation descriptions%s';
-$strMIME_transformation_options_note = 'Please enter the values for transformation options using this format: \'a\',\'b\',\'c\'...<br />If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, backslash it (for example \'\\\\xyz\' or \'a\\\'b\').';
$strMIME_transformation_options = 'Transformation options';
-$strMIMETypesForTable = 'MIME TYPES FOR TABLE';
+$strMIME_transformation_options_note = 'Please enter the values for transformation options using this format: \'a\',\'b\',\'c\'...<br />If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, backslash it (for example \'\\\\xyz\' or \'a\\\'b\').';
$strMIME_without = 'MIME-types printed in italics do not have a seperate transformation function';
+$strMaximumSize = 'Max: %s%s';
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.';
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!';
$strModifications = 'Modifications have been saved';
-$strModifyIndexTopic = 'Modify an index';
$strModify = 'Modify';
+$strModifyIndexTopic = 'Modify an index';
$strMoreStatusVars = 'More status variables';
$strMoveTable = 'Move table to (database<b>.</b>table):';
$strMoveTableOK = 'Table %s has been moved to %s.';
@@ -387,6 +396,8 @@ $strMySQLShowVars = 'Show MySQL system variables';
$strName = 'Name';
$strNeedPrimaryKey = 'You should define a primary key for this table.';
$strNext = 'Next';
+$strNo = 'No';
+$strNoActivity = 'No activity since %s seconds or more, please login again';
$strNoDatabases = 'No databases';
$strNoDatabasesSelected = 'No databases selected.';
$strNoDescription = 'no Description';
@@ -396,8 +407,6 @@ $strNoFrames = 'phpMyAdmin is more friendly with a <b>frames-capable</b> browser
$strNoIndex = 'No index defined!';
$strNoIndexPartsDefined = 'No index parts defined!';
$strNoModification = 'No change';
-$strNone = 'None';
-$strNo = 'No';
$strNoOptions = 'This format has no options';
$strNoPassword = 'No Password';
$strNoPermission = 'The web server does not have permission to save the file %s.';
@@ -409,19 +418,20 @@ $strNoRowsSelected = 'No rows selected';
$strNoSpace = 'Insufficient space to save the file %s.';
$strNoTablesFound = 'No tables found in database.';
$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.';
+$strNoUsersFound = 'No user(s) found.';
+$strNoValidateSQL = 'Skip Validate SQL';
+$strNone = 'None';
$strNotNumber = 'This is not a number!';
$strNotOK = 'not OK';
$strNotSet = '<b>%s</b> table not found or not set in %s';
$strNotValidNumber = ' is not a valid row number!';
-$strNoUsersFound = 'No user(s) found.';
-$strNoValidateSQL = 'Skip Validate SQL';
$strNull = 'Null';
$strNumSearchResultsInTable = '%s match(es) inside table <i>%s</i>';
$strNumSearchResultsTotal = '<b>Total:</b> <i>%s</i> match(es)';
$strNumTables = 'Tables';
-$strOftenQuotation = 'Often quotation marks. OPTIONALLY means that only char and varchar fields are enclosed by the "enclosed by"-character.';
$strOK = 'OK';
+$strOftenQuotation = 'Often quotation marks. OPTIONALLY means that only char and varchar fields are enclosed by the "enclosed by"-character.';
$strOperations = 'Operations';
$strOperator = 'Operator';
$strOptimizeTable = 'Optimize table';
@@ -431,13 +441,16 @@ $strOr = 'Or';
$strOverhead = 'Overhead';
$strOverwriteExisting = 'Overwrite existing file(s)';
+$strPHP40203 = 'You are using PHP 4.2.3, which has a serious bug with multi-byte strings (mbstring). See PHP bug report 19404. This version of PHP is not recommended for use with phpMyAdmin.';
+$strPHPVersion = 'PHP Version';
$strPageNumber = 'Page number:';
$strPaperSize = 'Paper size';
$strPartialText = 'Partial Texts';
+$strPassword = 'Password';
$strPasswordChanged = 'The Password for %s was changed successfully.';
$strPasswordEmpty = 'The password is empty!';
+$strPasswordHashing = 'Password Hashing';
$strPasswordNotSame = 'The passwords aren\'t the same!';
-$strPassword = 'Password';
$strPdfDbSchema = 'Schema of the the "%s" database - Page %s';
$strPdfInvalidTblName = 'The "%s" table doesn\'t exist!';
$strPdfNoTables = 'No tables';
@@ -446,22 +459,20 @@ $strPerMinute = 'per minute';
$strPerSecond = 'per second';
$strPersian = 'Persian';
$strPhoneBook = 'phone book';
-$strPHP40203 = 'You are using PHP 4.2.3, which has a serious bug with multi-byte strings (mbstring). See PHP bug report 19404. This version of PHP is not recommended for use with phpMyAdmin.';
$strPhp = 'Create PHP Code';
-$strPHPVersion = 'PHP Version';
$strPmaDocumentation = 'phpMyAdmin documentation';
$strPmaUriError = 'The <tt>$cfg[\'PmaAbsoluteUri\']</tt> directive MUST be set in your configuration file!';
$strPolish = 'Polish';
$strPortrait = 'Portrait';
$strPos1 = 'Begin';
$strPrevious = 'Previous';
+$strPrimary = 'Primary';
$strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';
$strPrimaryKeyName = 'The name of the primary key must be... PRIMARY!';
$strPrimaryKeyWarning = '("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)';
-$strPrimary = 'Primary';
$strPrint = 'Print';
-$strPrintViewFull = 'Print view (with full texts)';
$strPrintView = 'Print view';
+$strPrintViewFull = 'Print view (with full texts)';
$strPrivDescAllPrivileges = 'Includes all privileges except GRANT.';
$strPrivDescAlter = 'Allows altering the structure of existing tables.';
$strPrivDescCreateDb = 'Allows creating new databases and tables.';
@@ -496,9 +507,9 @@ $strPrivilegesReloaded = 'The privileges were reloaded successfully.';
$strProcesslist = 'Process list';
$strPutColNames = 'Put fields names at first row';
+$strQBE = 'Query';
$strQBEDel = 'Del';
$strQBEIns = 'Ins';
-$strQBE = 'Query';
$strQueryFrame = 'Query window';
$strQueryOnDb = 'SQL-query on database <b>%s</b>:';
$strQuerySQLHistory = 'SQL-history';
@@ -507,51 +518,63 @@ $strQueryTime = 'Query took %01.4f sec';
$strQueryType = 'Query type';
$strQueryWindowLock = 'Do not overwrite this query from outside the window';
+$strReType = 'Re-type';
$strReceived = 'Received';
$strRecords = 'Records';
$strReferentialIntegrity = 'Check referential integrity:';
$strRefresh = 'Refresh';
-$strRelationalSchema = 'Relational schema';
$strRelationNotWorking = 'The additional Features for working with linked Tables have been deactivated. To find out why click %shere%s.';
-$strRelationsForTable = 'RELATIONS FOR TABLE';
-$strRelations = 'Relations';
$strRelationView = 'Relation view';
+$strRelationalSchema = 'Relational schema';
+$strRelations = 'Relations';
+$strRelationsForTable = 'RELATIONS FOR TABLE';
$strReloadFailed = 'MySQL reload failed.';
-$strReloadingThePrivileges = 'Reloading the privileges';
$strReloadMySQL = 'Reload MySQL';
+$strReloadingThePrivileges = 'Reloading the privileges';
$strRemoveSelectedUsers = 'Remove selected users';
$strRenameDatabaseOK = 'Database %s has been renamed to %s';
-$strRenameTableOK = 'Table %s has been renamed to %s';
$strRenameTable = 'Rename table to';
+$strRenameTableOK = 'Table %s has been renamed to %s';
$strRepairTable = 'Repair table';
-$strReplaceNULLBy = 'Replace NULL by';
$strReplace = 'Replace';
+$strReplaceNULLBy = 'Replace NULL by';
$strReplaceTable = 'Replace table data with file';
$strReset = 'Reset';
$strResourceLimits = 'Resource limits';
-$strReType = 'Re-type';
-$strRevokeAndDeleteDescr = 'The users will still have the USAGE privilege until the privileges are reloaded.';
+$strRevoke = 'Revoke';
$strRevokeAndDelete = 'Revoke all active privileges from the users and delete them afterwards.';
+$strRevokeAndDeleteDescr = 'The users will still have the USAGE privilege until the privileges are reloaded.';
$strRevokeMessage = 'You have revoked the privileges for %s';
-$strRevoke = 'Revoke';
$strRomanian = 'Romanian';
$strRowLength = 'Row length';
-$strRowsFrom = 'row(s) starting from record #';
$strRowSize = ' Row size ';
+$strRows = 'Rows';
+$strRowsFrom = 'row(s) starting from record #';
$strRowsModeFlippedHorizontal = 'horizontal (rotated headers)';
$strRowsModeHorizontal = 'horizontal';
$strRowsModeOptions = 'in %s mode and repeat headers after %s cells';
$strRowsModeVertical = 'vertical';
-$strRows = 'Rows';
$strRowsStatistic = 'Row Statistic';
-$strRunning = 'running on %s';
$strRunQuery = 'Submit Query';
$strRunSQLQuery = 'Run SQL query/queries on database %s';
+$strRunning = 'running on %s';
$strRussian = 'Russian';
-$strSaveOnServer = 'Save on server in %s directory';
+$strSQL = 'SQL';
+$strSQLExportCompatibility = 'SQL export compatibility';
+$strSQLExportType = 'Export type';
+$strSQLOptions = 'SQL options';
+$strSQLParserBugMessage = 'There is a chance that you may have found a bug in the SQL parser. Please examine your query closely, and check that the quotes are correct and not mis-matched. Other possible failure causes may be that you are uploading a file with binary outside of a quoted text area. You can also try your query on the MySQL command line interface. The MySQL server error output below, if there is any, may also help you in diagnosing the problem. If you still have problems or if the parser fails where the command line interface succeeds, please reduce your SQL query input to the single query that causes problems, and submit a bug report with the data chunk in the CUT section below:';
+$strSQLParserUserError = 'There seems to be an error in your SQL query. The MySQL server error output below, if there is any, may also help you in diagnosing the problem';
+$strSQLQuery = 'SQL-query';
+$strSQLResult = 'SQL result';
+$strSQPBugInvalidIdentifer = 'Invalid Identifer';
+$strSQPBugUnclosedQuote = 'Unclosed quote';
+$strSQPBugUnknownPunctuation = 'Unknown Punctuation String';
$strSave = 'Save';
+$strSaveOnServer = 'Save on server in %s directory';
$strScaleFactorSmall = 'The scale factor is too small to fit the schema on one page';
+$strSearch = 'Search';
$strSearchFormTitle = 'Search in database';
$strSearchInTables = 'Inside table(s):';
$strSearchNeedle = 'Word(s) or value(s) to search for (wildcard: "%"):';
@@ -560,7 +583,6 @@ $strSearchOption2 = 'all words';
$strSearchOption3 = 'the exact phrase';
$strSearchOption4 = 'as regular expression';
$strSearchResultsFor = 'Search results for "<i>%s</i>" %s:';
-$strSearch = 'Search';
$strSearchType = 'Find:';
$strSecretRequired = 'The configuration file now needs a secret passphrase (blowfish_secret).';
$strSelectADb = 'Please select a database';
@@ -571,9 +593,9 @@ $strSelectNumRows = 'in query';
$strSelectTables = 'Select Tables';
$strSend = 'Save as file';
$strSent = 'Sent';
+$strServer = 'Server';
$strServerChoice = 'Server Choice';
$strServerNotResponding = 'The server is not responding';
-$strServer = 'Server';
$strServerStatus = 'Runtime Information';
$strServerStatusUptime = 'This MySQL server has been running for %s. It started up on %s.';
$strServerTabProcesslist = 'Processes';
@@ -583,41 +605,31 @@ $strServerVars = 'Server variables and settings';
$strServerVersion = 'Server version';
$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, backslash it (for example \'\\\\xyz\' or \'a\\\'b\').';
+$strShow = 'Show';
$strShowAll = 'Show all';
$strShowColor = 'Show color';
$strShowDatadictAs = 'Data Dictionary Format';
$strShowFullQueries = 'Show Full Queries';
$strShowGrid = 'Show grid';
-$strShowingRecords = 'Showing rows';
$strShowPHPInfo = 'Show PHP information';
-$strShow = 'Show';
$strShowTableDimension = 'Show dimension of tables';
$strShowTables = 'Show tables';
$strShowThisQuery = ' Show this query here again ';
+$strShowingRecords = 'Showing rows';
$strSimplifiedChinese = 'Simplified Chinese';
$strSingly = '(singly)';
$strSize = 'Size';
$strSlovak = 'Slovak';
$strSlovenian = 'Slovenian';
-$strSortByKey = 'Sort by key';
$strSort = 'Sort';
+$strSortByKey = 'Sort by key';
$strSpaceUsage = 'Space usage';
$strSpanish = 'Spanish';
$strSplitWordsWithSpace = 'Words are separated by a space character (" ").';
-$strSQLExportType = 'Export type';
-$strSQLOptions = 'SQL options';
-$strSQLParserBugMessage = 'There is a chance that you may have found a bug in the SQL parser. Please examine your query closely, and check that the quotes are correct and not mis-matched. Other possible failure causes may be that you are uploading a file with binary outside of a quoted text area. You can also try your query on the MySQL command line interface. The MySQL server error output below, if there is any, may also help you in diagnosing the problem. If you still have problems or if the parser fails where the command line interface succeeds, please reduce your SQL query input to the single query that causes problems, and submit a bug report with the data chunk in the CUT section below:';
-$strSQLParserUserError = 'There seems to be an error in your SQL query. The MySQL server error output below, if there is any, may also help you in diagnosing the problem';
-$strSQLQuery = 'SQL-query';
-$strSQLResult = 'SQL result';
-$strSQL = 'SQL';
-$strSQPBugInvalidIdentifer = 'Invalid Identifer';
-$strSQPBugUnclosedQuote = 'Unclosed quote';
-$strSQPBugUnknownPunctuation = 'Unknown Punctuation String';
$strStatCheckTime = 'Last check';
$strStatCreateTime = 'Creation';
-$strStatement = 'Statements';
$strStatUpdateTime = 'Last update';
+$strStatement = 'Statements';
$strStatus = 'Status';
$strStrucCSV = 'CSV data';
$strStrucData = 'Structure and data';
@@ -634,6 +646,7 @@ $strSwedish = 'Swedish';
$strSwitchToDatabase = 'Switch to copied database';
$strSwitchToTable = 'Switch to copied table';
+$strTable = 'Table';
$strTableComments = 'Table comments';
$strTableEmpty = 'The table name is empty!';
$strTableHasBeenDropped = 'Table %s has been dropped';
@@ -642,18 +655,17 @@ $strTableHasBeenFlushed = 'Table %s has been flushed';
$strTableMaintenance = 'Table maintenance';
$strTableOfContents = 'Table of contents';
$strTableOptions = 'Table options';
-$strTables = '%s table(s)';
$strTableStructure = 'Table structure for table';
-$strTable = 'Table';
$strTableType = 'Table type';
+$strTables = '%s table(s)';
$strTakeIt = 'take it';
$strTblPrivileges = 'Table-specific privileges';
$strTextAreaLength = ' Because of its length,<br /> this field might not be editable ';
$strThai = 'Thai';
-$strTheContents = 'The contents of the file replaces the contents of the selected table for rows with identical primary or unique key.';
$strTheContent = 'The content of your file has been inserted.';
-$strTheme = 'Theme / Style';
+$strTheContents = 'The contents of the file replaces the contents of the selected table for rows with identical primary or unique key.';
$strTheTerminator = 'The terminator of the fields.';
+$strTheme = 'Theme / Style';
$strThisHost = 'This Host';
$strThisNotDirectory = 'This was not a directory';
$strThreadSuccessfullyKilled = 'Thread %s was successfully killed.';
@@ -685,14 +697,19 @@ $strUnicode = 'Unicode';
$strUnique = 'Unique';
$strUnknown = 'unknown';
$strUnselectAll = 'Unselect All';
+$strUpdComTab = 'Please see Documentation on how to update your Column_comments Table';
$strUpdatePrivMessage = 'You have updated the privileges for %s.';
$strUpdateProfileMessage = 'The profile has been updated.';
$strUpdateQuery = 'Update Query';
-$strUpdComTab = 'Please see Documentation on how to update your Column_comments Table';
$strUpgrade = 'You should upgrade to %s %s or later.';
$strUsage = 'Usage';
$strUseBackquotes = 'Enclose table and field names with backquotes';
$strUseHostTable = 'Use Host Table';
+$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere';
+$strUseTables = 'Use Tables';
+$strUseTextField = 'Use text field';
+$strUseThisValue = 'Use this value';
+$strUser = 'User';
$strUserAlreadyExists = 'The user %s already exists!';
$strUserEmpty = 'The user name is empty!';
$strUserName = 'User name';
@@ -700,22 +717,17 @@ $strUserNotFound = 'The selected user was not found in the privilege table.';
$strUserOverview = 'User overview';
$strUsersDeleted = 'The selected users have been deleted successfully.';
$strUsersHavingAccessToDb = 'Users having access to &quot;%s&quot;';
-$strUser = 'User';
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere';
-$strUseTables = 'Use Tables';
-$strUseTextField = 'Use text field';
-$strUseThisValue = 'Use this value';
$strValidateSQL = 'Validate SQL';
$strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.';
$strValue = 'Value';
$strVar = 'Variable';
-$strViewDumpDatabases = 'View dump (schema) of databases';
-$strViewDumpDB = 'View dump (schema) of database';
$strViewDump = 'View dump (schema) of table';
+$strViewDumpDB = 'View dump (schema) of database';
+$strViewDumpDatabases = 'View dump (schema) of databases';
-$strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';
$strWebServerUploadDirectory = 'web-server upload directory';
+$strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';
$strWelcome = 'Welcome to %s';
$strWestEuropean = 'West European';
$strWildcard = 'wildcard';
@@ -732,10 +744,4 @@ $strYes = 'Yes';
$strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.';
$strZip = '"zipped"';
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
?>
diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php
index 9e38271334..75e46cf477 100644
--- a/lang/english-utf-8.inc.php
+++ b/lang/english-utf-8.inc.php
@@ -18,6 +18,7 @@ $month = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'O
$datefmt = '%B %d, %Y at %I:%M %p';
$timespanfmt = '%s days, %s hours, %s minutes and %s seconds';
+$strAPrimaryKey = 'A primary key has been added on %s';
$strAbortedClients = 'Aborted';
$strAbsolutePathToDocSqlDir = 'Please enter the absolute path on webserver to docSQL directory';
$strAccessDenied = 'Access denied';
@@ -28,8 +29,6 @@ $strAddConstraints = 'Add constraints';
$strAddDeleteColumn = 'Add/Delete Field Columns';
$strAddDeleteRow = 'Add/Delete Criteria Row';
$strAddDropDatabase = 'Add DROP DATABASE';
-$strAddedColumnComment = 'Added comment for column';
-$strAddedColumnRelation = 'Added relation for column';
$strAddFields = 'Add %s field(s)';
$strAddHeaderComment = 'Add custom comment into header (\\n splits lines)';
$strAddIfNotExists = 'Add IF NOT EXISTS';
@@ -41,22 +40,25 @@ $strAddSearchConditions = 'Add search conditions (body of the "where" clause):';
$strAddToIndex = 'Add to index &nbsp;%s&nbsp;column(s)';
$strAddUser = 'Add a new User';
$strAddUserMessage = 'You have added a new user.';
+$strAddedColumnComment = 'Added comment for column';
+$strAddedColumnRelation = 'Added relation for column';
$strAdministration = 'Administration';
$strAffectedRows = 'Affected rows:';
$strAfter = 'After %s';
$strAfterInsertBack = 'Go back to previous page';
$strAfterInsertNewInsert = 'Insert another new row';
+$strAfterInsertNext = 'Edit next row';
$strAfterInsertSame = 'Go back to this page';
$strAll = 'All';
$strAllTableSameWidth = 'display all Tables with same width?';
$strAlterOrderBy = 'Alter table order by';
+$strAnIndex = 'An index has been added on %s';
$strAnalyzeTable = 'Analyze table';
$strAnd = 'And';
-$strAnIndex = 'An index has been added on %s';
$strAny = 'Any';
$strAnyHost = 'Any host';
$strAnyUser = 'Any user';
-$strAPrimaryKey = 'A primary key has been added on %s';
+$strApproximateCount = 'May be approximate. See FAQ 3.11';
$strArabic = 'Arabic';
$strArmenian = 'Armenian';
$strAscending = 'Ascending';
@@ -70,15 +72,15 @@ $strBack = 'Back';
$strBaltic = 'Baltic';
$strBeginCut = 'BEGIN CUT';
$strBeginRaw = 'BEGIN RAW';
-$strBinary = 'Binary';
-$strBinaryDoNotEdit = 'Binary - do not edit';
-$strBinaryLog = 'Binary log';
$strBinLogEventType = 'Event type';
$strBinLogInfo = 'Information';
$strBinLogName = 'Log name';
$strBinLogOriginalPosition = 'Original position';
$strBinLogPosition = 'Position';
$strBinLogServerId = 'Server ID';
+$strBinary = 'Binary';
+$strBinaryDoNotEdit = 'Binary - do not edit';
+$strBinaryLog = 'Binary log';
$strBookmarkAllUsers = 'Let every user access this bookmark';
$strBookmarkDeleted = 'The bookmark has been deleted.';
$strBookmarkLabel = 'Label';
@@ -92,6 +94,7 @@ $strBulgarian = 'Bulgarian';
$strBzError = 'phpMyAdmin was unable to compress the dump because of a broken Bz2 extension in this php version. It is strongly recommended to set the <code>$cfg[\'BZipDump\']</code> directive in your phpMyAdmin configuration file to <code>FALSE</code>. If you want to use the Bz2 compression features, you should upgrade to a later php version. See php bug report %s for details.';
$strBzip = '"bzipped"';
+$strCSVOptions = 'CSV options';
$strCalendar = 'Calendar';
$strCannotLogin = 'Cannot login to MySQL server';
$strCantLoad = 'cannot load %s extension,<br />please check PHP Configuration';
@@ -104,8 +107,8 @@ $strCaseInsensitive = 'case-insensitive';
$strCaseSensitive = 'case-sensitive';
$strCentralEuropean = 'Central European';
$strChange = 'Change';
-$strChangeCopyModeCopy = '... keep the old one.';
$strChangeCopyMode = 'Create a new user with the same privileges and ...';
+$strChangeCopyModeCopy = '... keep the old one.';
$strChangeCopyModeDeleteAndReload = ' ... delete the old one from the user tables and reload the privileges afterwards.';
$strChangeCopyModeJustDelete = ' ... delete the old one from the user tables.';
$strChangeCopyModeRevoke = ' ... revoke all active privileges from the old one and delete it afterwards.';
@@ -114,8 +117,8 @@ $strChangeDisplay = 'Choose Field to display';
$strChangePassword = 'Change password';
$strCharset = 'Charset';
$strCharsetOfFile = 'Character set of the file:';
-$strCharsetsAndCollations = 'Character Sets and Collations';
$strCharsets = 'Charsets';
+$strCharsetsAndCollations = 'Character Sets and Collations';
$strCheckAll = 'Check All';
$strCheckOverhead = 'Check overheaded';
$strCheckPrivs = 'Check Privileges';
@@ -129,6 +132,7 @@ $strColumnPrivileges = 'Column-specific privileges';
$strCommand = 'Command';
$strComments = 'Comments';
$strCommentsForTable = 'COMMENTS FOR TABLE';
+$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible';
$strCompleteInserts = 'Complete inserts';
$strCompression = 'Compression';
$strConfigFileError = 'phpMyAdmin was unable to read your configuration file!<br />This might happen if php finds a parse error in it or php cannot find the file.<br />Please call the configuration file directly using the link below and read the php error message(s) that you receive. In most cases a quote or a semicolon is missing somewhere.<br />If you receive a blank page, everything is fine.';
@@ -153,12 +157,26 @@ $strCreatePdfFeat = 'Creation of PDFs';
$strCreationDates = 'Creation/Update/Check dates';
$strCriteria = 'Criteria';
$strCroatian = 'Croatian';
-$strCSVOptions = 'CSV options';
$strCyrillic = 'Cyrillic';
$strCzech = 'Czech';
$strCzechSlovak = 'Czech-Slovak';
+$strDBComment = 'Database comment: ';
+$strDBCopy = 'Copy database to';
+$strDBGContext = 'Context';
+$strDBGContextID = 'Context ID';
+$strDBGHits = 'Hits';
+$strDBGLine = 'Line';
+$strDBGMaxTimeMs = 'Max time, ms';
+$strDBGMinTimeMs = 'Min time, ms';
+$strDBGModule = 'Module';
+$strDBGTimePerHitMs = 'Time/Hit, ms';
+$strDBGTotalTimeMs = 'Total time, ms';
+$strDBRename = 'Rename database to';
$strDanish = 'Danish';
+$strData = 'Data';
+$strDataDict = 'Data Dictionary';
+$strDataOnly = 'Data only';
$strDatabase = 'Database';
$strDatabaseEmpty = 'The database name is empty!';
$strDatabaseExportOptions = 'Database export options';
@@ -170,52 +188,37 @@ $strDatabasesStats = 'Databases statistics';
$strDatabasesStatsDisable = 'Disable Statistics';
$strDatabasesStatsEnable = 'Enable Statistics';
$strDatabasesStatsHeavyTraffic = 'Note: Enabling the Database statistics here might cause heavy traffic between the webserver and the MySQL one.';
-$strData = 'Data';
-$strDataDict = 'Data Dictionary';
-$strDataOnly = 'Data only';
-$strDBComment = 'Database comment: ';
-$strDBCopy = 'Copy database to';
-$strDBGContext = 'Context';
-$strDBGContextID = 'Context ID';
-$strDBGHits = 'Hits';
-$strDBGLine = 'Line';
-$strDBGMaxTimeMs = 'Max time, ms';
-$strDBGMinTimeMs = 'Min time, ms';
-$strDBGModule = 'Module';
-$strDBGTimePerHitMs = 'Time/Hit, ms';
-$strDBGTotalTimeMs = 'Total time, ms';
$strDbPrivileges = 'Database-specific privileges';
-$strDBRename = 'Rename database to';
$strDbSpecific = 'database-specific';
$strDefault = 'Default';
$strDefaultValueHelp = 'For default values, please enter just a single value, without backslash escaping or quotes, using this format: a';
$strDefragment = 'Defragment table';
+$strDelOld = 'The current Page has References to Tables that no longer exist. Would you like to delete those References?';
$strDelayedInserts = 'Use delayed inserts';
+$strDelete = 'Delete';
$strDeleteAndFlush = 'Delete the users and reload the privileges afterwards.';
$strDeleteAndFlushDescr = 'This is the cleanest way, but reloading the privileges may take a while.';
-$strDelete = 'Delete';
-$strDeletedRows = 'Deleted rows:';
$strDeleted = 'The row has been deleted';
+$strDeletedRows = 'Deleted rows:';
$strDeleting = 'Deleting %s';
-$strDelOld = 'The current Page has References to Tables that no longer exist. Would you like to delete those References?';
$strDescending = 'Descending';
$strDescription = 'Description';
$strDictionary = 'dictionary';
-$strDisabled = 'Disabled';
$strDisableForeignChecks = 'Disable foreign key checks';
+$strDisabled = 'Disabled';
$strDisplayFeat = 'Display Features';
$strDisplayOrder = 'Display order:';
$strDisplayPDF = 'Display PDF schema';
$strDoAQuery = 'Do a "query by example" (wildcard: "%")';
-$strDocu = 'Documentation';
$strDoYouReally = 'Do you really want to ';
-$strDropDatabaseStrongWarning = 'You are about to DESTROY a complete database!';
+$strDocu = 'Documentation';
$strDrop = 'Drop';
+$strDropDatabaseStrongWarning = 'You are about to DESTROY a complete database!';
$strDropSelectedDatabases = 'Drop Selected Databases';
$strDropUsersDb = 'Drop the databases that have the same names as the users.';
-$strDumpingData = 'Dumping data for table';
$strDumpSaved = 'Dump has been saved to file %s.';
$strDumpXRows = 'Dump %s row(s) starting at record # %s.';
+$strDumpingData = 'Dumping data for table';
$strDynamic = 'dynamic';
$strEdit = 'Edit';
@@ -226,8 +229,8 @@ $strEmpty = 'Empty';
$strEmptyResultSet = 'MySQL returned an empty result set (i.e. zero rows).';
$strEnabled = 'Enabled';
$strEncloseInTransaction = 'Enclose export in a transaction';
-$strEndCut = 'END CUT';
$strEnd = 'End';
+$strEndCut = 'END CUT';
$strEndRaw = 'END RAW';
$strEnglish = 'English';
$strEnglishPrivileges = ' Note: MySQL privilege names are expressed in English ';
@@ -245,10 +248,10 @@ $strExtra = 'Extra';
$strFailedAttempts = 'Failed attempts';
$strField = 'Field';
$strFieldHasBeenDropped = 'Field %s has been dropped';
+$strFields = 'Fields';
$strFieldsEmpty = ' The field count is empty! ';
$strFieldsEnclosedBy = 'Fields enclosed by';
$strFieldsEscapedBy = 'Fields escaped by';
-$strFields = 'Fields';
$strFieldsTerminatedBy = 'Fields terminated by';
$strFileAlreadyExists = 'File %s already exists on server, change filename or check overwrite option.';
$strFileCouldNotBeRead = 'File could not be read';
@@ -258,14 +261,14 @@ $strFileNameTemplateRemember = 'remember template';
$strFixed = 'fixed';
$strFlushPrivilegesNote = 'Note: phpMyAdmin gets the users\' privileges directly from MySQL\'s privilege tables. The content of these tables may differ from the privileges the server uses, if they have been changed manually. In this case, you should %sreload the privileges%s before you continue.';
$strFlushTable = 'Flush the table ("FLUSH")';
-$strFormat = 'Format';
$strFormEmpty = 'Missing value in the form !';
+$strFormat = 'Format';
$strFullText = 'Full Texts';
$strFunction = 'Function';
$strGenBy = 'Generated by';
-$strGeneralRelationFeat = 'General relation features';
$strGenTime = 'Generation Time';
+$strGeneralRelationFeat = 'General relation features';
$strGeorgian = 'Georgian';
$strGerman = 'German';
$strGlobal = 'global';
@@ -283,8 +286,8 @@ $strHebrew = 'Hebrew';
$strHexForBinary = 'Use hexadecimal for binary fields';
$strHome = 'Home';
$strHomepageOfficial = 'Official phpMyAdmin Homepage';
-$strHostEmpty = 'The host name is empty!';
$strHost = 'Host';
+$strHostEmpty = 'The host name is empty!';
$strHungarian = 'Hungarian';
$strIcelandic = 'Icelandic';
@@ -297,44 +300,48 @@ $strIgnoringFile = 'Ignoring file %s';
$strImportDocSQL = 'Import docSQL Files';
$strImportFiles = 'Import files';
$strImportFinished = 'Import finished';
-$strIndexes = 'Indexes';
-$strIndexHasBeenDropped = 'Index %s has been dropped';
+$strInUse = 'in use';
$strIndex = 'Index';
+$strIndexHasBeenDropped = 'Index %s has been dropped';
$strIndexName = 'Index name&nbsp;:';
$strIndexType = 'Index type&nbsp;:';
+$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';
+$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';
+$strIndexWarningTable = 'Problems with indexes of table `%s`';
+$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';
+$strIndexes = 'Indexes';
$strInnodbStat = 'InnoDB Status';
$strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.';
+$strInsert = 'Insert';
$strInsertAsNewRow = 'Insert as a new row';
$strInsertBookmarkTitle = 'Please insert bookmark title';
-$strInsertedRowId = 'Inserted row id:';
-$strInsertedRows = 'Inserted rows:';
-$strInsert = 'Insert';
$strInsertNewRow = 'Insert new row';
$strInsertTextfiles = 'Insert data from a textfile into table';
+$strInsertedRowId = 'Inserted row id:';
+$strInsertedRows = 'Inserted rows:';
$strInstructions = 'Instructions';
$strInternalNotNecessary = '* An internal relation is not necessary when it exists also in InnoDB.';
$strInternalRelations = 'Internal relations';
-$strInUse = 'in use';
$strJapanese = 'Japanese';
$strJumpToDB = 'Jump to database &quot;%s&quot;.';
-$strJustDeleteDescr = 'The &quot;deleted&quot; users will still be able to access the server as usual until the privileges are reloaded.';
$strJustDelete = 'Just delete the users from the privilege tables.';
+$strJustDeleteDescr = 'The &quot;deleted&quot; users will still be able to access the server as usual until the privileges are reloaded.';
$strKeepPass = 'Do not change the password';
$strKeyname = 'Keyname';
$strKill = 'Kill';
$strKorean = 'Korean';
+$strLaTeX = 'LaTeX';
+$strLaTeXOptions = 'LaTeX options';
$strLandscape = 'Landscape';
$strLatexCaption = 'Table caption';
$strLatexContent = 'Content of table __TABLE__';
-$strLatexContinuedCaption = 'Continued table caption';
$strLatexContinued = '(continued)';
+$strLatexContinuedCaption = 'Continued table caption';
$strLatexIncludeCaption = 'Include table caption';
$strLatexLabel = 'Label key';
-$strLaTeX = 'LaTeX';
-$strLaTeXOptions = 'LaTeX options';
$strLatexStructure = 'Structure of table __TABLE__';
$strLatvian = 'Latvian';
$strLengthSet = 'Length/Values*';
@@ -348,28 +355,30 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
$strLoadMethod = 'LOAD method';
$strLocalhost = 'Local';
$strLocationTextfile = 'Location of the textfile';
-$strLoginInformation = 'Login Information';
-$strLogin = 'Login';
-$strLogout = 'Log out';
$strLogPassword = 'Password:';
$strLogServer = 'Server';
$strLogUsername = 'Username:';
+$strLogin = 'Login';
+$strLoginInformation = 'Login Information';
+$strLogout = 'Log out';
-$strMaximumSize = 'Max: %s%s';
+$strMIMETypesForTable = 'MIME TYPES FOR TABLE';
+$strMIME_MIMEtype = 'MIME-type';
$strMIME_available_mime = 'Available MIME-types';
$strMIME_available_transform = 'Available transformations';
$strMIME_description = 'Description';
-$strMIME_MIMEtype = 'MIME-type';
$strMIME_nodescription = 'No Description is available for this transformation.<br />Please ask the author, what %s does.';
$strMIME_transformation = 'Browser transformation';
$strMIME_transformation_note = 'For a list of available transformation options and their MIME-type transformations, click on %stransformation descriptions%s';
-$strMIME_transformation_options_note = 'Please enter the values for transformation options using this format: \'a\',\'b\',\'c\'...<br />If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, backslash it (for example \'\\\\xyz\' or \'a\\\'b\').';
$strMIME_transformation_options = 'Transformation options';
-$strMIMETypesForTable = 'MIME TYPES FOR TABLE';
+$strMIME_transformation_options_note = 'Please enter the values for transformation options using this format: \'a\',\'b\',\'c\'...<br />If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, backslash it (for example \'\\\\xyz\' or \'a\\\'b\').';
$strMIME_without = 'MIME-types printed in italics do not have a seperate transformation function';
+$strMaximumSize = 'Max: %s%s';
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.';
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!';
$strModifications = 'Modifications have been saved';
-$strModifyIndexTopic = 'Modify an index';
$strModify = 'Modify';
+$strModifyIndexTopic = 'Modify an index';
$strMoreStatusVars = 'More status variables';
$strMoveTable = 'Move table to (database<b>.</b>table):';
$strMoveTableOK = 'Table %s has been moved to %s.';
@@ -388,6 +397,8 @@ $strMySQLShowVars = 'Show MySQL system variables';
$strName = 'Name';
$strNeedPrimaryKey = 'You should define a primary key for this table.';
$strNext = 'Next';
+$strNo = 'No';
+$strNoActivity = 'No activity since %s seconds or more, please login again';
$strNoDatabases = 'No databases';
$strNoDatabasesSelected = 'No databases selected.';
$strNoDescription = 'no Description';
@@ -397,8 +408,6 @@ $strNoFrames = 'phpMyAdmin is more friendly with a <b>frames-capable</b> browser
$strNoIndex = 'No index defined!';
$strNoIndexPartsDefined = 'No index parts defined!';
$strNoModification = 'No change';
-$strNone = 'None';
-$strNo = 'No';
$strNoOptions = 'This format has no options';
$strNoPassword = 'No Password';
$strNoPermission = 'The web server does not have permission to save the file %s.';
@@ -410,19 +419,20 @@ $strNoRowsSelected = 'No rows selected';
$strNoSpace = 'Insufficient space to save the file %s.';
$strNoTablesFound = 'No tables found in database.';
$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.';
+$strNoUsersFound = 'No user(s) found.';
+$strNoValidateSQL = 'Skip Validate SQL';
+$strNone = 'None';
$strNotNumber = 'This is not a number!';
$strNotOK = 'not OK';
$strNotSet = '<b>%s</b> table not found or not set in %s';
$strNotValidNumber = ' is not a valid row number!';
-$strNoUsersFound = 'No user(s) found.';
-$strNoValidateSQL = 'Skip Validate SQL';
$strNull = 'Null';
$strNumSearchResultsInTable = '%s match(es) inside table <i>%s</i>';
$strNumSearchResultsTotal = '<b>Total:</b> <i>%s</i> match(es)';
$strNumTables = 'Tables';
-$strOftenQuotation = 'Often quotation marks. OPTIONALLY means that only char and varchar fields are enclosed by the "enclosed by"-character.';
$strOK = 'OK';
+$strOftenQuotation = 'Often quotation marks. OPTIONALLY means that only char and varchar fields are enclosed by the "enclosed by"-character.';
$strOperations = 'Operations';
$strOperator = 'Operator';
$strOptimizeTable = 'Optimize table';
@@ -432,13 +442,16 @@ $strOr = 'Or';
$strOverhead = 'Overhead';
$strOverwriteExisting = 'Overwrite existing file(s)';
+$strPHP40203 = 'You are using PHP 4.2.3, which has a serious bug with multi-byte strings (mbstring). See PHP bug report 19404. This version of PHP is not recommended for use with phpMyAdmin.';
+$strPHPVersion = 'PHP Version';
$strPageNumber = 'Page number:';
$strPaperSize = 'Paper size';
$strPartialText = 'Partial Texts';
+$strPassword = 'Password';
$strPasswordChanged = 'The Password for %s was changed successfully.';
$strPasswordEmpty = 'The password is empty!';
+$strPasswordHashing = 'Password Hashing';
$strPasswordNotSame = 'The passwords aren\'t the same!';
-$strPassword = 'Password';
$strPdfDbSchema = 'Schema of the the "%s" database - Page %s';
$strPdfInvalidTblName = 'The "%s" table doesn\'t exist!';
$strPdfNoTables = 'No tables';
@@ -447,22 +460,20 @@ $strPerMinute = 'per minute';
$strPerSecond = 'per second';
$strPersian = 'Persian';
$strPhoneBook = 'phone book';
-$strPHP40203 = 'You are using PHP 4.2.3, which has a serious bug with multi-byte strings (mbstring). See PHP bug report 19404. This version of PHP is not recommended for use with phpMyAdmin.';
$strPhp = 'Create PHP Code';
-$strPHPVersion = 'PHP Version';
$strPmaDocumentation = 'phpMyAdmin documentation';
$strPmaUriError = 'The <tt>$cfg[\'PmaAbsoluteUri\']</tt> directive MUST be set in your configuration file!';
$strPolish = 'Polish';
$strPortrait = 'Portrait';
$strPos1 = 'Begin';
$strPrevious = 'Previous';
+$strPrimary = 'Primary';
$strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';
$strPrimaryKeyName = 'The name of the primary key must be... PRIMARY!';
$strPrimaryKeyWarning = '("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)';
-$strPrimary = 'Primary';
$strPrint = 'Print';
-$strPrintViewFull = 'Print view (with full texts)';
$strPrintView = 'Print view';
+$strPrintViewFull = 'Print view (with full texts)';
$strPrivDescAllPrivileges = 'Includes all privileges except GRANT.';
$strPrivDescAlter = 'Allows altering the structure of existing tables.';
$strPrivDescCreateDb = 'Allows creating new databases and tables.';
@@ -497,9 +508,9 @@ $strPrivilegesReloaded = 'The privileges were reloaded successfully.';
$strProcesslist = 'Process list';
$strPutColNames = 'Put fields names at first row';
+$strQBE = 'Query';
$strQBEDel = 'Del';
$strQBEIns = 'Ins';
-$strQBE = 'Query';
$strQueryFrame = 'Query window';
$strQueryOnDb = 'SQL-query on database <b>%s</b>:';
$strQuerySQLHistory = 'SQL-history';
@@ -508,51 +519,63 @@ $strQueryTime = 'Query took %01.4f sec';
$strQueryType = 'Query type';
$strQueryWindowLock = 'Do not overwrite this query from outside the window';
+$strReType = 'Re-type';
$strReceived = 'Received';
$strRecords = 'Records';
$strReferentialIntegrity = 'Check referential integrity:';
$strRefresh = 'Refresh';
-$strRelationalSchema = 'Relational schema';
$strRelationNotWorking = 'The additional Features for working with linked Tables have been deactivated. To find out why click %shere%s.';
-$strRelationsForTable = 'RELATIONS FOR TABLE';
-$strRelations = 'Relations';
$strRelationView = 'Relation view';
+$strRelationalSchema = 'Relational schema';
+$strRelations = 'Relations';
+$strRelationsForTable = 'RELATIONS FOR TABLE';
$strReloadFailed = 'MySQL reload failed.';
-$strReloadingThePrivileges = 'Reloading the privileges';
$strReloadMySQL = 'Reload MySQL';
+$strReloadingThePrivileges = 'Reloading the privileges';
$strRemoveSelectedUsers = 'Remove selected users';
$strRenameDatabaseOK = 'Database %s has been renamed to %s';
-$strRenameTableOK = 'Table %s has been renamed to %s';
$strRenameTable = 'Rename table to';
+$strRenameTableOK = 'Table %s has been renamed to %s';
$strRepairTable = 'Repair table';
-$strReplaceNULLBy = 'Replace NULL by';
$strReplace = 'Replace';
+$strReplaceNULLBy = 'Replace NULL by';
$strReplaceTable = 'Replace table data with file';
$strReset = 'Reset';
$strResourceLimits = 'Resource limits';
-$strReType = 'Re-type';
-$strRevokeAndDeleteDescr = 'The users will still have the USAGE privilege until the privileges are reloaded.';
+$strRevoke = 'Revoke';
$strRevokeAndDelete = 'Revoke all active privileges from the users and delete them afterwards.';
+$strRevokeAndDeleteDescr = 'The users will still have the USAGE privilege until the privileges are reloaded.';
$strRevokeMessage = 'You have revoked the privileges for %s';
-$strRevoke = 'Revoke';
$strRomanian = 'Romanian';
$strRowLength = 'Row length';
-$strRowsFrom = 'row(s) starting from record #';
$strRowSize = ' Row size ';
+$strRows = 'Rows';
+$strRowsFrom = 'row(s) starting from record #';
$strRowsModeFlippedHorizontal = 'horizontal (rotated headers)';
$strRowsModeHorizontal = 'horizontal';
$strRowsModeOptions = 'in %s mode and repeat headers after %s cells';
$strRowsModeVertical = 'vertical';
-$strRows = 'Rows';
$strRowsStatistic = 'Row Statistic';
-$strRunning = 'running on %s';
$strRunQuery = 'Submit Query';
$strRunSQLQuery = 'Run SQL query/queries on database %s';
+$strRunning = 'running on %s';
$strRussian = 'Russian';
-$strSaveOnServer = 'Save on server in %s directory';
+$strSQL = 'SQL';
+$strSQLExportCompatibility = 'SQL export compatibility';
+$strSQLExportType = 'Export type';
+$strSQLOptions = 'SQL options';
+$strSQLParserBugMessage = 'There is a chance that you may have found a bug in the SQL parser. Please examine your query closely, and check that the quotes are correct and not mis-matched. Other possible failure causes may be that you are uploading a file with binary outside of a quoted text area. You can also try your query on the MySQL command line interface. The MySQL server error output below, if there is any, may also help you in diagnosing the problem. If you still have problems or if the parser fails where the command line interface succeeds, please reduce your SQL query input to the single query that causes problems, and submit a bug report with the data chunk in the CUT section below:';
+$strSQLParserUserError = 'There seems to be an error in your SQL query. The MySQL server error output below, if there is any, may also help you in diagnosing the problem';
+$strSQLQuery = 'SQL-query';
+$strSQLResult = 'SQL result';
+$strSQPBugInvalidIdentifer = 'Invalid Identifer';
+$strSQPBugUnclosedQuote = 'Unclosed quote';
+$strSQPBugUnknownPunctuation = 'Unknown Punctuation String';
$strSave = 'Save';
+$strSaveOnServer = 'Save on server in %s directory';
$strScaleFactorSmall = 'The scale factor is too small to fit the schema on one page';
+$strSearch = 'Search';
$strSearchFormTitle = 'Search in database';
$strSearchInTables = 'Inside table(s):';
$strSearchNeedle = 'Word(s) or value(s) to search for (wildcard: "%"):';
@@ -561,7 +584,6 @@ $strSearchOption2 = 'all words';
$strSearchOption3 = 'the exact phrase';
$strSearchOption4 = 'as regular expression';
$strSearchResultsFor = 'Search results for "<i>%s</i>" %s:';
-$strSearch = 'Search';
$strSearchType = 'Find:';
$strSecretRequired = 'The configuration file now needs a secret passphrase (blowfish_secret).';
$strSelectADb = 'Please select a database';
@@ -572,9 +594,9 @@ $strSelectNumRows = 'in query';
$strSelectTables = 'Select Tables';
$strSend = 'Save as file';
$strSent = 'Sent';
+$strServer = 'Server';
$strServerChoice = 'Server Choice';
$strServerNotResponding = 'The server is not responding';
-$strServer = 'Server';
$strServerStatus = 'Runtime Information';
$strServerStatusUptime = 'This MySQL server has been running for %s. It started up on %s.';
$strServerTabProcesslist = 'Processes';
@@ -584,41 +606,31 @@ $strServerVars = 'Server variables and settings';
$strServerVersion = 'Server version';
$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, backslash it (for example \'\\\\xyz\' or \'a\\\'b\').';
+$strShow = 'Show';
$strShowAll = 'Show all';
$strShowColor = 'Show color';
$strShowDatadictAs = 'Data Dictionary Format';
$strShowFullQueries = 'Show Full Queries';
$strShowGrid = 'Show grid';
-$strShowingRecords = 'Showing rows';
$strShowPHPInfo = 'Show PHP information';
-$strShow = 'Show';
$strShowTableDimension = 'Show dimension of tables';
$strShowTables = 'Show tables';
$strShowThisQuery = ' Show this query here again ';
+$strShowingRecords = 'Showing rows';
$strSimplifiedChinese = 'Simplified Chinese';
$strSingly = '(singly)';
$strSize = 'Size';
$strSlovak = 'Slovak';
$strSlovenian = 'Slovenian';
-$strSortByKey = 'Sort by key';
$strSort = 'Sort';
+$strSortByKey = 'Sort by key';
$strSpaceUsage = 'Space usage';
$strSpanish = 'Spanish';
$strSplitWordsWithSpace = 'Words are separated by a space character (" ").';
-$strSQLExportType = 'Export type';
-$strSQLOptions = 'SQL options';
-$strSQLParserBugMessage = 'There is a chance that you may have found a bug in the SQL parser. Please examine your query closely, and check that the quotes are correct and not mis-matched. Other possible failure causes may be that you are uploading a file with binary outside of a quoted text area. You can also try your query on the MySQL command line interface. The MySQL server error output below, if there is any, may also help you in diagnosing the problem. If you still have problems or if the parser fails where the command line interface succeeds, please reduce your SQL query input to the single query that causes problems, and submit a bug report with the data chunk in the CUT section below:';
-$strSQLParserUserError = 'There seems to be an error in your SQL query. The MySQL server error output below, if there is any, may also help you in diagnosing the problem';
-$strSQLQuery = 'SQL-query';
-$strSQLResult = 'SQL result';
-$strSQL = 'SQL';
-$strSQPBugInvalidIdentifer = 'Invalid Identifer';
-$strSQPBugUnclosedQuote = 'Unclosed quote';
-$strSQPBugUnknownPunctuation = 'Unknown Punctuation String';
$strStatCheckTime = 'Last check';
$strStatCreateTime = 'Creation';
-$strStatement = 'Statements';
$strStatUpdateTime = 'Last update';
+$strStatement = 'Statements';
$strStatus = 'Status';
$strStrucCSV = 'CSV data';
$strStrucData = 'Structure and data';
@@ -635,6 +647,7 @@ $strSwedish = 'Swedish';
$strSwitchToDatabase = 'Switch to copied database';
$strSwitchToTable = 'Switch to copied table';
+$strTable = 'Table';
$strTableComments = 'Table comments';
$strTableEmpty = 'The table name is empty!';
$strTableHasBeenDropped = 'Table %s has been dropped';
@@ -643,18 +656,17 @@ $strTableHasBeenFlushed = 'Table %s has been flushed';
$strTableMaintenance = 'Table maintenance';
$strTableOfContents = 'Table of contents';
$strTableOptions = 'Table options';
-$strTables = '%s table(s)';
$strTableStructure = 'Table structure for table';
-$strTable = 'Table';
$strTableType = 'Table type';
+$strTables = '%s table(s)';
$strTakeIt = 'take it';
$strTblPrivileges = 'Table-specific privileges';
$strTextAreaLength = ' Because of its length,<br /> this field might not be editable ';
$strThai = 'Thai';
-$strTheContents = 'The contents of the file replaces the contents of the selected table for rows with identical primary or unique key.';
$strTheContent = 'The content of your file has been inserted.';
-$strTheme = 'Theme / Style';
+$strTheContents = 'The contents of the file replaces the contents of the selected table for rows with identical primary or unique key.';
$strTheTerminator = 'The terminator of the fields.';
+$strTheme = 'Theme / Style';
$strThisHost = 'This Host';
$strThisNotDirectory = 'This was not a directory';
$strThreadSuccessfullyKilled = 'Thread %s was successfully killed.';
@@ -686,14 +698,19 @@ $strUnicode = 'Unicode';
$strUnique = 'Unique';
$strUnknown = 'unknown';
$strUnselectAll = 'Unselect All';
+$strUpdComTab = 'Please see Documentation on how to update your Column_comments Table';
$strUpdatePrivMessage = 'You have updated the privileges for %s.';
$strUpdateProfileMessage = 'The profile has been updated.';
$strUpdateQuery = 'Update Query';
-$strUpdComTab = 'Please see Documentation on how to update your Column_comments Table';
$strUpgrade = 'You should upgrade to %s %s or later.';
$strUsage = 'Usage';
$strUseBackquotes = 'Enclose table and field names with backquotes';
$strUseHostTable = 'Use Host Table';
+$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere';
+$strUseTables = 'Use Tables';
+$strUseTextField = 'Use text field';
+$strUseThisValue = 'Use this value';
+$strUser = 'User';
$strUserAlreadyExists = 'The user %s already exists!';
$strUserEmpty = 'The user name is empty!';
$strUserName = 'User name';
@@ -701,22 +718,17 @@ $strUserNotFound = 'The selected user was not found in the privilege table.';
$strUserOverview = 'User overview';
$strUsersDeleted = 'The selected users have been deleted successfully.';
$strUsersHavingAccessToDb = 'Users having access to &quot;%s&quot;';
-$strUser = 'User';
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere';
-$strUseTables = 'Use Tables';
-$strUseTextField = 'Use text field';
-$strUseThisValue = 'Use this value';
$strValidateSQL = 'Validate SQL';
$strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.';
$strValue = 'Value';
$strVar = 'Variable';
-$strViewDumpDatabases = 'View dump (schema) of databases';
-$strViewDumpDB = 'View dump (schema) of database';
$strViewDump = 'View dump (schema) of table';
+$strViewDumpDB = 'View dump (schema) of database';
+$strViewDumpDatabases = 'View dump (schema) of databases';
-$strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';
$strWebServerUploadDirectory = 'web-server upload directory';
+$strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';
$strWelcome = 'Welcome to %s';
$strWestEuropean = 'West European';
$strWildcard = 'wildcard';
@@ -733,10 +745,4 @@ $strYes = 'Yes';
$strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.';
$strZip = '"zipped"';
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
?>
diff --git a/lang/estonian-iso-8859-1.inc.php b/lang/estonian-iso-8859-1.inc.php
index e9e2e59a8b..0e30aa4be8 100644
--- a/lang/estonian-iso-8859-1.inc.php
+++ b/lang/estonian-iso-8859-1.inc.php
@@ -738,4 +738,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php
index d82b616637..5561b8ec7f 100644
--- a/lang/estonian-utf-8.inc.php
+++ b/lang/estonian-utf-8.inc.php
@@ -739,4 +739,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/finnish-iso-8859-1.inc.php b/lang/finnish-iso-8859-1.inc.php
index 9af7e913c5..1feee9f5fd 100644
--- a/lang/finnish-iso-8859-1.inc.php
+++ b/lang/finnish-iso-8859-1.inc.php
@@ -763,4 +763,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php
index 7e1a577f1a..b36b50f78a 100644
--- a/lang/finnish-utf-8.inc.php
+++ b/lang/finnish-utf-8.inc.php
@@ -764,4 +764,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/french-iso-8859-1.inc.php b/lang/french-iso-8859-1.inc.php
index 52a4d16b33..553ff94de3 100644
--- a/lang/french-iso-8859-1.inc.php
+++ b/lang/french-iso-8859-1.inc.php
@@ -57,6 +57,7 @@ $strAnd = 'et';
$strAny = 'N\'importe quel';
$strAnyHost = 'Tout serveur';
$strAnyUser = 'Tout utilisateur';
+$strApproximateCount = 'Peut être approximatif. Voir FAQ 3.11';
$strArabic = 'arabe';
$strArmenian = 'arménien';
$strAscending = 'Croissant';
@@ -70,8 +71,15 @@ $strBack = 'Retour';
$strBaltic = 'baltique';
$strBeginCut = 'Début de la section à couper';
$strBeginRaw = 'Début des informations sur l\'anomalie';
+$strBinLogEventType = 'Type d\'évènement';
+$strBinLogInfo = 'Information';
+$strBinLogName = 'Nom du log binaire';
+$strBinLogOriginalPosition = 'Position d\'origine';
+$strBinLogPosition = 'Position';
+$strBinLogServerId = 'ID du serveur';
$strBinary = 'Binaire';
$strBinaryDoNotEdit = 'Binaire - ne pas éditer';
+$strBinaryLog = 'Log binaire';
$strBookmarkAllUsers = 'Signet visible pour les autres utilisateurs';
$strBookmarkDeleted = 'Le signet a été effacé.';
$strBookmarkLabel = 'Intitulé';
@@ -123,6 +131,7 @@ $strColumnPrivileges = 'Privilèges de colonnes';
$strCommand = 'Commande';
$strComments = 'Commentaires';
$strCommentsForTable = 'COMMENTAIRES POUR LA TABLE';
+$strCompatibleHashing = 'compatible MySQL&nbsp;4.0';
$strCompleteInserts = 'Insertions complètes';
$strCompression = 'Compression';
$strConfigFileError = 'phpMyAdmin n\'a pu lire votre fichier de configuration!<br />Il est possible qu\'il contienne une erreur de syntaxe, ou que PHP soit incapable de le trouver<br />À l\'aide du lien suivant, vous pouvez vérifier le message d\'erreur généré par PHP;<br />la plupart du temps, un apostrophe ou un point-virgule sont manquants.<br />Si vous recevez une page blanche, aucune erreur n\'a été détectée.';
@@ -132,6 +141,7 @@ $strConnections = 'Connexions';
$strConstraintsForDumped = 'Contraintes pour les tables exportées';
$strConstraintsForTable = 'Contraintes pour la table';
$strCookiesRequired = 'Vous devez accepter les cookies pour poursuivre.';
+$strCopyDatabaseOK = 'La base de données %s a été copiée sur %s';
$strCopyTable = '<b>Copier</b> la table vers (base<b>.</b>table)&nbsp;:';
$strCopyTableOK = 'La table %s a été copiée vers %s.';
$strCopyTableSameNames = 'On ne peut copier la table sur elle-même!';
@@ -151,6 +161,7 @@ $strCzech = 'tchèque';
$strCzechSlovak = 'tchèque-slovaque';
$strDBComment = '<b>Commentaire</b> sur la base de données: ';
+$strDBCopy = 'Copier la base de données vers:';
$strDBGContext = 'Contexte';
$strDBGContextID = 'Identificateur de contexte';
$strDBGHits = 'Occurences';
@@ -293,6 +304,11 @@ $strIndex = 'Index';
$strIndexHasBeenDropped = 'L\'index %s a été effacé';
$strIndexName = 'Nom de la clef&nbsp;:';
$strIndexType = 'Type de clef&nbsp;:';
+$strIndexWarningMultiple = 'Plus d\'un index de type %s existe pour la colonne `%s`';
+$strIndexWarningPrimary = 'La colonne `%s` ne devrait pas faire partie à la fois d\'une clé primaire et d\'une clé index';
+$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';
+$strIndexWarningTable = 'Il y a des problèmes avec les index de la table `%s`';
+$strIndexWarningUnique = 'La colonne `%s` ne devrait pas faire partie à la fois d\'une clé unique et d\'une clé index';
$strIndexes = 'Index';
$strInnodbStat = 'État InnoDB';
$strInsecureMySQL = 'Votre fichier de configuration fait référence à l\'utilisateur root sans mot de passe, ce qui correspond à la valeur par défaut de MySQL. Votre serveur MySQL est donc ouvert aux intrusions, et vous devriez corriger ce problème de sécurité.';
@@ -380,6 +396,7 @@ $strName = 'Nom';
$strNeedPrimaryKey = 'Vous devriez définir une clé primaire pour cette table.';
$strNext = 'Suivant';
$strNo = 'Non';
+$strNoActivity = 'Aucune activité depuis %s secondes ou plus, veuillez vous reconnecter';
$strNoDatabases = 'Aucune base de données';
$strNoDatabasesSelected = 'Aucune base de données n\'a été sélectionnée.';
$strNoDescription = 'pas de description';
@@ -431,6 +448,7 @@ $strPartialText = 'Textes réduits';
$strPassword = 'Mot de passe';
$strPasswordChanged = 'Le mot de passe de %s a été changé.';
$strPasswordEmpty = 'Le mot de passe est vide';
+$strPasswordHashing = 'Hachage du mot de passe';
$strPasswordNotSame = 'Les mots de passe doivent être identiques';
$strPdfDbSchema = 'Schema de la base "%s" - Page %s';
$strPdfInvalidTblName = 'La table "%s" n\'existe pas !';
@@ -567,6 +585,7 @@ $strSearchType = 'Type de recherche :';
$strSecretRequired = 'Vous devez ajouter dans le fichier de configuration une phrase de passe secrète (blowfish_secret).';
$strSelectADb = 'Choisissez une base de données';
$strSelectAll = 'Tout sélectionner';
+$strSelectBinaryLog = 'Sélectionnez le log binaire à consulter';
$strSelectFields = 'Choisir les champs à afficher (au moins un)';
$strSelectNumRows = 'dans la requête';
$strSelectTables = 'Choisissez les tables';
@@ -622,7 +641,8 @@ $strSubmit = 'Exécuter';
$strSuccess = 'Votre requête SQL a été exécutée avec succès';
$strSum = 'Somme';
$strSwedish = 'suédois';
-$strSwitchToTable = 'Se rendre à la table copiée';
+$strSwitchToDatabase = 'Aller à la base de données copiée';
+$strSwitchToTable = 'Aller à la table copiée';
$strTable = 'Table';
$strTableComments = 'Commentaires sur la table';
@@ -722,21 +742,8 @@ $strYes = 'Oui';
$strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlève la limite.';
$strZip = '"zippé"';
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php
index e50d7c07d8..4dd1429f5a 100644
--- a/lang/french-utf-8.inc.php
+++ b/lang/french-utf-8.inc.php
@@ -58,6 +58,7 @@ $strAnd = 'et';
$strAny = 'N\'importe quel';
$strAnyHost = 'Tout serveur';
$strAnyUser = 'Tout utilisateur';
+$strApproximateCount = 'Peut être approximatif. Voir FAQ 3.11';
$strArabic = 'arabe';
$strArmenian = 'arménien';
$strAscending = 'Croissant';
@@ -71,8 +72,15 @@ $strBack = 'Retour';
$strBaltic = 'baltique';
$strBeginCut = 'Début de la section à couper';
$strBeginRaw = 'Début des informations sur l\'anomalie';
+$strBinLogEventType = 'Type d\'évènement';
+$strBinLogInfo = 'Information';
+$strBinLogName = 'Nom du log binaire';
+$strBinLogOriginalPosition = 'Position d\'origine';
+$strBinLogPosition = 'Position';
+$strBinLogServerId = 'ID du serveur';
$strBinary = 'Binaire';
$strBinaryDoNotEdit = 'Binaire - ne pas éditer';
+$strBinaryLog = 'Log binaire';
$strBookmarkAllUsers = 'Signet visible pour les autres utilisateurs';
$strBookmarkDeleted = 'Le signet a été effacé.';
$strBookmarkLabel = 'Intitulé';
@@ -124,6 +132,7 @@ $strColumnPrivileges = 'Privilèges de colonnes';
$strCommand = 'Commande';
$strComments = 'Commentaires';
$strCommentsForTable = 'COMMENTAIRES POUR LA TABLE';
+$strCompatibleHashing = 'compatible MySQL&nbsp;4.0';
$strCompleteInserts = 'Insertions complètes';
$strCompression = 'Compression';
$strConfigFileError = 'phpMyAdmin n\'a pu lire votre fichier de configuration!<br />Il est possible qu\'il contienne une erreur de syntaxe, ou que PHP soit incapable de le trouver<br />À l\'aide du lien suivant, vous pouvez vérifier le message d\'erreur généré par PHP;<br />la plupart du temps, un apostrophe ou un point-virgule sont manquants.<br />Si vous recevez une page blanche, aucune erreur n\'a été détectée.';
@@ -133,6 +142,7 @@ $strConnections = 'Connexions';
$strConstraintsForDumped = 'Contraintes pour les tables exportées';
$strConstraintsForTable = 'Contraintes pour la table';
$strCookiesRequired = 'Vous devez accepter les cookies pour poursuivre.';
+$strCopyDatabaseOK = 'La base de données %s a été copiée sur %s';
$strCopyTable = '<b>Copier</b> la table vers (base<b>.</b>table)&nbsp;:';
$strCopyTableOK = 'La table %s a été copiée vers %s.';
$strCopyTableSameNames = 'On ne peut copier la table sur elle-même!';
@@ -152,6 +162,7 @@ $strCzech = 'tchèque';
$strCzechSlovak = 'tchèque-slovaque';
$strDBComment = '<b>Commentaire</b> sur la base de données: ';
+$strDBCopy = 'Copier la base de données vers:';
$strDBGContext = 'Contexte';
$strDBGContextID = 'Identificateur de contexte';
$strDBGHits = 'Occurences';
@@ -294,6 +305,11 @@ $strIndex = 'Index';
$strIndexHasBeenDropped = 'L\'index %s a été effacé';
$strIndexName = 'Nom de la clef&nbsp;:';
$strIndexType = 'Type de clef&nbsp;:';
+$strIndexWarningMultiple = 'Plus d\'un index de type %s existe pour la colonne `%s`';
+$strIndexWarningPrimary = 'La colonne `%s` ne devrait pas faire partie à la fois d\'une clé primaire et d\'une clé index';
+$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';
+$strIndexWarningTable = 'Il y a des problèmes avec les index de la table `%s`';
+$strIndexWarningUnique = 'La colonne `%s` ne devrait pas faire partie à la fois d\'une clé unique et d\'une clé index';
$strIndexes = 'Index';
$strInnodbStat = 'État InnoDB';
$strInsecureMySQL = 'Votre fichier de configuration fait référence à l\'utilisateur root sans mot de passe, ce qui correspond à la valeur par défaut de MySQL. Votre serveur MySQL est donc ouvert aux intrusions, et vous devriez corriger ce problème de sécurité.';
@@ -381,6 +397,7 @@ $strName = 'Nom';
$strNeedPrimaryKey = 'Vous devriez définir une clé primaire pour cette table.';
$strNext = 'Suivant';
$strNo = 'Non';
+$strNoActivity = 'Aucune activité depuis %s secondes ou plus, veuillez vous reconnecter';
$strNoDatabases = 'Aucune base de données';
$strNoDatabasesSelected = 'Aucune base de données n\'a été sélectionnée.';
$strNoDescription = 'pas de description';
@@ -432,6 +449,7 @@ $strPartialText = 'Textes réduits';
$strPassword = 'Mot de passe';
$strPasswordChanged = 'Le mot de passe de %s a été changé.';
$strPasswordEmpty = 'Le mot de passe est vide';
+$strPasswordHashing = 'Hachage du mot de passe';
$strPasswordNotSame = 'Les mots de passe doivent être identiques';
$strPdfDbSchema = 'Schema de la base "%s" - Page %s';
$strPdfInvalidTblName = 'La table "%s" n\'existe pas !';
@@ -568,6 +586,7 @@ $strSearchType = 'Type de recherche :';
$strSecretRequired = 'Vous devez ajouter dans le fichier de configuration une phrase de passe secrète (blowfish_secret).';
$strSelectADb = 'Choisissez une base de données';
$strSelectAll = 'Tout sélectionner';
+$strSelectBinaryLog = 'Sélectionnez le log binaire à consulter';
$strSelectFields = 'Choisir les champs à afficher (au moins un)';
$strSelectNumRows = 'dans la requête';
$strSelectTables = 'Choisissez les tables';
@@ -623,7 +642,8 @@ $strSubmit = 'Exécuter';
$strSuccess = 'Votre requête SQL a été exécutée avec succès';
$strSum = 'Somme';
$strSwedish = 'suédois';
-$strSwitchToTable = 'Se rendre à la table copiée';
+$strSwitchToDatabase = 'Aller à la base de données copiée';
+$strSwitchToTable = 'Aller à la table copiée';
$strTable = 'Table';
$strTableComments = 'Commentaires sur la table';
@@ -723,21 +743,8 @@ $strYes = 'Oui';
$strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlève la limite.';
$strZip = '"zippé"';
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/galician-iso-8859-1.inc.php b/lang/galician-iso-8859-1.inc.php
index 7f4631139c..72615cf54d 100644
--- a/lang/galician-iso-8859-1.inc.php
+++ b/lang/galician-iso-8859-1.inc.php
@@ -61,6 +61,7 @@ $strAnd = 'E';
$strAny = 'Calquer';
$strAnyHost = 'Calquer servidor';
$strAnyUser = 'Calquer usuario';
+$strApproximateCount = 'Pode ser aproximado. Consulte a FAQ 3.11';
$strArabic = 'Árabe';
$strArmenian = 'Armenio';
$strAscending = 'Ascendente';
@@ -74,8 +75,15 @@ $strBack = 'Voltar';
$strBaltic = 'Báltico';
$strBeginCut = 'COMEZA O RECORTE';
$strBeginRaw = 'COMEZA O TEXTO SIMPLE ("RAW")';
+$strBinLogEventType = 'Tipo de evento';
+$strBinLogInfo = 'Información';
+$strBinLogName = 'Nome do ficheiro de rexistro';
+$strBinLogOriginalPosition = 'Posición orixinal';
+$strBinLogPosition = 'Posición';
+$strBinLogServerId = 'ID do servidor';
$strBinary = ' Binario ';
$strBinaryDoNotEdit = ' Binario - non editar ';
+$strBinaryLog = 'Ficheiro de rexistro binario';
$strBookmarkAllUsers = 'Permitir que calquer usuario poida acceder a este marcador';
$strBookmarkDeleted = 'Eliminouse o marcador.';
$strBookmarkLabel = 'Nome';
@@ -127,6 +135,7 @@ $strColumnPrivileges = 'Privilexios proprios de columna';
$strCommand = 'Comando';
$strComments = 'Comentarios';
$strCommentsForTable = 'COMENTARIOS PARA A TABELA';
+$strCompatibleHashing = 'Compatíbel co MySQL&nbsp;4.0';
$strCompleteInserts = 'Insercións completas';
$strCompression = 'Compresión';
$strConfigFileError = 'phpMyAdmin non puido ler o seu ficheiro de configuración<br/>Isto podería deberse a que php atopou un erro nel ou a que php non puido atopar o ficheiro.<br/>Invoque o ficheiro de configuración directamente mediante o vínculo que hai máis abaixo e lea a mensaxe de erro de php que receba. Na maioría dos casos simplesmente faltan unha aspa ou un ponto e vírcula <br/>Se recebe unha páxina en branco é que todo está ben.';
@@ -136,6 +145,7 @@ $strConnections = 'Conexións';
$strConstraintsForDumped = 'Limitacións para os volcados das tabelas';
$strConstraintsForTable = 'Limitacións para a tabela';
$strCookiesRequired = 'A partir de aqui debe permitir cookies.';
+$strCopyDatabaseOK = 'A base de dastos %s copiouse para %s';
$strCopyTable = 'Copiar a tabela a (base_de_datos<b>.</b>tabela):';
$strCopyTableOK = 'Tabela \$table copiada para \$new_name.';
$strCopyTableSameNames = 'Non se pode copiar unha tabela sobre si mesma';
@@ -143,7 +153,7 @@ $strCouldNotKill = 'phpMyAdmin foi incapaz de finalizar o fío %s. Probablemente
$strCreate = 'Crear';
$strCreateIndex = 'Crear un índice en&nbsp;%s&nbsp;colunas';
$strCreateIndexTopic = 'Crear un novo índice';
-$strCreateNewDatabase = 'Crear un novo banco de datos';
+$strCreateNewDatabase = 'Crear unha nova base de datos';
$strCreateNewTable = 'Crear unha tabela nova na base de datos %s';
$strCreatePage = 'Crear unha páxina nova';
$strCreatePdfFeat = 'Creación de PDFs';
@@ -155,6 +165,7 @@ $strCzech = 'Checo';
$strCzechSlovak = 'Checo-eslovaco';
$strDBComment = 'Comentario da base de datos: ';
+$strDBCopy = 'Copiar a base de datos para';
$strDBGContext = 'Contexto';
$strDBGContextID = 'ID do contexto';
$strDBGHits = 'Hits';
@@ -176,7 +187,7 @@ $strDatabaseHasBeenDropped = 'A base de datos %s foi eliminada.';
$strDatabaseNoTable = 'Esta base de datos non contén nengunha tabela';
$strDatabases = 'Bancos de Datos';
$strDatabasesDropped = 'Elimináronse %s bases de datos sen problemas.';
-$strDatabasesStats = 'Estatísticas dos bancos de datos';
+$strDatabasesStats = 'Estatísticas das bases de datos';
$strDatabasesStatsDisable = 'Deshabilitar as estatísticas';
$strDatabasesStatsEnable = 'Habilitar as estatísticas';
$strDatabasesStatsHeavyTraffic = 'Nota: De habilitar as estatísticas da base de datos, ocasionará que se produza un tráfico denso entre o servidor web e o de MySQL.';
@@ -227,6 +238,7 @@ $strEndRaw = 'FIN DO TEXTO SIMPLE ("RAW")';
$strEnglish = 'Inglés';
$strEnglishPrivileges = ' Nota: os nomes de privilexios do MySQL están en inglés';
$strError = 'Erro';
+$strEscapeWildcards = 'Os caracteres comodín _ e % deberíanse escapar con \ para podelos usar literalmente';
$strEstonian = 'Estonio';
$strExcelEdition = 'Edición mediante MS-Excel';
$strExcelOptions = 'Opcións de Excel';
@@ -296,6 +308,10 @@ $strIndex = 'Índice';
$strIndexHasBeenDropped = 'Eliminouse o índice %s';
$strIndexName = 'Nome do índice&nbsp;:';
$strIndexType = 'Tipo de índice&nbsp;:';
+$strIndexWarningMultiple = 'Creouse máis dunha chave %s para a columna `%s`';
+$strIndexWarningPrimary = 'Non se lle deberían asignar ambas as dúas chaves PRIMARY e INDEX á columna `%s`';
+$strIndexWarningTable = 'Problemas cos índices da tabela `%s`';
+$strIndexWarningUnique = 'Non se lle deberían asignar ambas as dúas chaves UNIQUE e INDEX á columna `%s`';
$strIndexes = 'Índices';
$strInnodbStat = 'Estado de InnoDB';
$strInsecureMySQL = 'O seu ficheiro de configuración contén axustes (en concreto, o usuário root non ten contrasinal) que corresponden coa conta con todos os privilexios que MySQL fai por omisión. O seu servidor de MySQL está a rodar con esta configuración, está aberto a intrusións e habería que mirar de solucionar este problema de seguranza.';
@@ -306,7 +322,7 @@ $strInsertNewRow = 'Inserir un novo rexistro';
$strInsertTextfiles = 'Inserir un arquivo de texto na tabela';
$strInsertedRowId = 'Identificador da fila inserida:';
$strInsertedRows = 'Filas inseridas:';
-$strInstructions = 'Instruccións';
+$strInstructions = 'Instrucións';
$strInternalNotNecessary = '* Non se precisa dunha relación interna cando existe tamén en InnoDB.';
$strInternalRelations = 'Relacións internas';
@@ -383,10 +399,11 @@ $strName = 'Nome';
$strNeedPrimaryKey = 'Deberia definir unha chave primaria para esta tabela.';
$strNext = 'Seguinte';
$strNo = 'Non';
-$strNoDatabases = 'Non hai nengún banco de datos';
+$strNoActivity = 'Non se rexistrou actividade algunha desde hai %s segundos ou máis. Terá que entrar de novo';
+$strNoDatabases = 'Non hai nengunha base de datos';
$strNoDatabasesSelected = 'Non hai nengunha base de datos seleccionada.';
$strNoDescription = 'sen descrición';
-$strNoDropDatabases = 'Os comandos "Eliminar banco de datos" non están permitidos.';
+$strNoDropDatabases = 'Os comandos "Eliminar a base de datos" non están permitidos.';
$strNoExplain = 'Saltar a explicacion de SQL';
$strNoFrames = 'phpMyAdmin usa-se mellor cun navegador que <b>acepte molduras</b>.';
$strNoIndex = 'Non se definiu un índice';
@@ -401,7 +418,7 @@ $strNoQuery = 'Non hai procura SQL!';
$strNoRights = 'Non ten direitos suficientes para estar aquí agora!';
$strNoRowsSelected = 'Non hai fileiras seleccionadas';
$strNoSpace = 'Non hai espacio para gardar o ficheiro %s.';
-$strNoTablesFound = 'Non se achou nengunha tabela no banco de datos';
+$strNoTablesFound = 'Non se achou nengunha tabela na base de datos';
$strNoThemeSupport = 'Non ten a funcionalidade dos temas. Comprobe a configuración e/ou os seus temas no directorio %s.';
$strNoUsersFound = 'Non se achou nengun(s) usuario(s).';
$strNoValidateSQL = 'Saltarse a validacion de';
@@ -434,6 +451,7 @@ $strPartialText = 'Textos parciais';
$strPassword = 'Contrasinal';
$strPasswordChanged = 'Modificou-se sen problemas o contrasinal de %s.';
$strPasswordEmpty = 'O contrasinal está vacío!';
+$strPasswordHashing = 'Hash do contrasinal';
$strPasswordNotSame = 'Os contrasinais non son os mesmos!';
$strPdfDbSchema = 'Esquema da base de datos "%s" - Páxina %s';
$strPdfInvalidTblName = 'Non existe a tabela "%s".';
@@ -495,7 +513,7 @@ $strQBE = 'Procurar pondo un exemplo ("QBE")';
$strQBEDel = 'Eliminar';
$strQBEIns = 'Inserir';
$strQueryFrame = 'Xanela de procuras';
-$strQueryOnDb = 'Procura tipo SQL no banco de datos <b>%s</b>:';
+$strQueryOnDb = 'Procura tipo SQL na base de datos <b>%s</b>:';
$strQuerySQLHistory = 'Historial de SQL';
$strQueryStatistics = '<b>Estatística das procuras</b>: Desde que se iniciou, enviáronselle ao servidor %s procuras.';
$strQueryTime = 'A pesquisa levou %01.4f segundos';
@@ -570,6 +588,7 @@ $strSearchType = 'Atopar:';
$strSecretRequired = 'O ficheiro de configuración agora necesita un contrasinal secreto (blowfish_secret).';
$strSelectADb = 'Seleccione unha base de dados';
$strSelectAll = 'Seleccionar todo';
+$strSelectBinaryLog = 'Seleccione o ficheiro de rexistro binario que quer ver';
$strSelectFields = 'Seleccione os campos (mínimo 1)';
$strSelectNumRows = 'a procurar';
$strSelectTables = 'Seleccionar tabelas';
@@ -614,17 +633,18 @@ $strStatUpdateTime = 'Actualización máis recente';
$strStatement = 'Informacións';
$strStatus = 'Estado';
$strStrucCSV = 'Datos CSV';
-$strStrucData = 'Estructura e datos';
+$strStrucData = 'Estrutura e datos';
$strStrucDrop = 'Adicionar \'Eliminar tabela anterior se existe\'';
$strStrucExcelCSV = 'CSV (para datos de MS Excel)';
$strStrucNativeExcel = 'Datos nativos de MS Excel';
-$strStrucOnly = 'Só a estructura';
-$strStructPropose = 'Propor unha estructura para a tabela';
-$strStructure = 'Estructura';
+$strStrucOnly = 'Só a estrutura';
+$strStructPropose = 'Propor unha estrutura para a tabela';
+$strStructure = 'Estrutura';
$strSubmit = 'Submeter';
$strSuccess = 'O seu comando de SQL executou-se com éxito';
$strSum = 'Suma';
$strSwedish = 'Sueco';
+$strSwitchToDatabase = 'Pasar á base de datos copiada';
$strSwitchToTable = 'Ir ? tabela copiada';
$strTable = 'Tabela';
@@ -636,7 +656,7 @@ $strTableHasBeenFlushed = 'Fechouse a tabela %s';
$strTableMaintenance = 'Tabela de manutención';
$strTableOfContents = 'Table of contents';
$strTableOptions = 'Opcións de tabela';
-$strTableStructure = 'Estructura da tabela';
+$strTableStructure = 'Estrutura da tabela';
$strTableType = 'Tipo da tabela';
$strTables = '%s tabela(s)';
$strTakeIt = 'colle-o';
@@ -686,6 +706,7 @@ $strUpgrade = 'Deberia actualizar a %s %s ou posterior.';
$strUsage = 'Uso';
$strUseBackquotes = 'Protexer os nomes das tabelas e dos campos con&nbsp;" ` "';
$strUseHostTable = 'Usar a tabela de Host';
+$strUseTabKey = 'Use a tecla do tabulador para moverse de valor en valor ou a tecla CONTROL combinada cunha flecha para moverse a calquer sitio';
$strUseTables = 'Usar as tabelas';
$strUseTextField = 'Use campo de texto';
$strUseThisValue = 'Usar este valor';
@@ -703,7 +724,7 @@ $strValidatorError = 'Non foi posible iniciar o comprobador de SQL. Comprobe que
$strValue = 'Valor';
$strVar = 'Variable';
$strViewDump = 'Ver o esquema do volcado da tabela';
-$strViewDumpDB = 'Ver o esquema do volcado do banco de datos';
+$strViewDumpDB = 'Ver o esquema do volcado da base de datos';
$strViewDumpDatabases = 'Ver o volcado das bases de datos';
$strWebServerUploadDirectory = 'directorio de subida (upload) do servidor web';
@@ -724,23 +745,8 @@ $strYes = 'Si';
$strZeroRemovesTheLimit = 'Nota: Se estas opcións se configuran como 0 (cero) elimina-se o limite.';
$strZip = 'comprimido no formato "zip"';
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php
index c93f532759..e3c9460529 100644
--- a/lang/galician-utf-8.inc.php
+++ b/lang/galician-utf-8.inc.php
@@ -62,6 +62,7 @@ $strAnd = 'E';
$strAny = 'Calquer';
$strAnyHost = 'Calquer servidor';
$strAnyUser = 'Calquer usuario';
+$strApproximateCount = 'Pode ser aproximado. Consulte a FAQ 3.11';
$strArabic = 'Ãrabe';
$strArmenian = 'Armenio';
$strAscending = 'Ascendente';
@@ -75,8 +76,15 @@ $strBack = 'Voltar';
$strBaltic = 'Báltico';
$strBeginCut = 'COMEZA O RECORTE';
$strBeginRaw = 'COMEZA O TEXTO SIMPLE ("RAW")';
+$strBinLogEventType = 'Tipo de evento';
+$strBinLogInfo = 'Información';
+$strBinLogName = 'Nome do ficheiro de rexistro';
+$strBinLogOriginalPosition = 'Posición orixinal';
+$strBinLogPosition = 'Posición';
+$strBinLogServerId = 'ID do servidor';
$strBinary = ' Binario ';
$strBinaryDoNotEdit = ' Binario - non editar ';
+$strBinaryLog = 'Ficheiro de rexistro binario';
$strBookmarkAllUsers = 'Permitir que calquer usuario poida acceder a este marcador';
$strBookmarkDeleted = 'Eliminouse o marcador.';
$strBookmarkLabel = 'Nome';
@@ -128,6 +136,7 @@ $strColumnPrivileges = 'Privilexios proprios de columna';
$strCommand = 'Comando';
$strComments = 'Comentarios';
$strCommentsForTable = 'COMENTARIOS PARA A TABELA';
+$strCompatibleHashing = 'Compatíbel co MySQL&nbsp;4.0';
$strCompleteInserts = 'Insercións completas';
$strCompression = 'Compresión';
$strConfigFileError = 'phpMyAdmin non puido ler o seu ficheiro de configuración<br/>Isto podería deberse a que php atopou un erro nel ou a que php non puido atopar o ficheiro.<br/>Invoque o ficheiro de configuración directamente mediante o vínculo que hai máis abaixo e lea a mensaxe de erro de php que receba. Na maioría dos casos simplesmente faltan unha aspa ou un ponto e vírcula <br/>Se recebe unha páxina en branco é que todo está ben.';
@@ -137,6 +146,7 @@ $strConnections = 'Conexións';
$strConstraintsForDumped = 'Limitacións para os volcados das tabelas';
$strConstraintsForTable = 'Limitacións para a tabela';
$strCookiesRequired = 'A partir de aqui debe permitir cookies.';
+$strCopyDatabaseOK = 'A base de dastos %s copiouse para %s';
$strCopyTable = 'Copiar a tabela a (base_de_datos<b>.</b>tabela):';
$strCopyTableOK = 'Tabela \$table copiada para \$new_name.';
$strCopyTableSameNames = 'Non se pode copiar unha tabela sobre si mesma';
@@ -144,7 +154,7 @@ $strCouldNotKill = 'phpMyAdmin foi incapaz de finalizar o fío %s. Probablement
$strCreate = 'Crear';
$strCreateIndex = 'Crear un índice en&nbsp;%s&nbsp;colunas';
$strCreateIndexTopic = 'Crear un novo índice';
-$strCreateNewDatabase = 'Crear un novo banco de datos';
+$strCreateNewDatabase = 'Crear unha nova base de datos';
$strCreateNewTable = 'Crear unha tabela nova na base de datos %s';
$strCreatePage = 'Crear unha páxina nova';
$strCreatePdfFeat = 'Creación de PDFs';
@@ -156,6 +166,7 @@ $strCzech = 'Checo';
$strCzechSlovak = 'Checo-eslovaco';
$strDBComment = 'Comentario da base de datos: ';
+$strDBCopy = 'Copiar a base de datos para';
$strDBGContext = 'Contexto';
$strDBGContextID = 'ID do contexto';
$strDBGHits = 'Hits';
@@ -177,7 +188,7 @@ $strDatabaseHasBeenDropped = 'A base de datos %s foi eliminada.';
$strDatabaseNoTable = 'Esta base de datos non contén nengunha tabela';
$strDatabases = 'Bancos de Datos';
$strDatabasesDropped = 'Elimináronse %s bases de datos sen problemas.';
-$strDatabasesStats = 'Estatísticas dos bancos de datos';
+$strDatabasesStats = 'Estatísticas das bases de datos';
$strDatabasesStatsDisable = 'Deshabilitar as estatísticas';
$strDatabasesStatsEnable = 'Habilitar as estatísticas';
$strDatabasesStatsHeavyTraffic = 'Nota: De habilitar as estatísticas da base de datos, ocasionará que se produza un tráfico denso entre o servidor web e o de MySQL.';
@@ -228,6 +239,7 @@ $strEndRaw = 'FIN DO TEXTO SIMPLE ("RAW")';
$strEnglish = 'Inglés';
$strEnglishPrivileges = ' Nota: os nomes de privilexios do MySQL están en inglés';
$strError = 'Erro';
+$strEscapeWildcards = 'Os caracteres comodín _ e % deberíanse escapar con \ para podelos usar literalmente';
$strEstonian = 'Estonio';
$strExcelEdition = 'Edición mediante MS-Excel';
$strExcelOptions = 'Opcións de Excel';
@@ -297,6 +309,10 @@ $strIndex = 'Ãndice';
$strIndexHasBeenDropped = 'Eliminouse o índice %s';
$strIndexName = 'Nome do índice&nbsp;:';
$strIndexType = 'Tipo de índice&nbsp;:';
+$strIndexWarningMultiple = 'Creouse máis dunha chave %s para a columna `%s`';
+$strIndexWarningPrimary = 'Non se lle deberían asignar ambas as dúas chaves PRIMARY e INDEX á columna `%s`';
+$strIndexWarningTable = 'Problemas cos índices da tabela `%s`';
+$strIndexWarningUnique = 'Non se lle deberían asignar ambas as dúas chaves UNIQUE e INDEX á columna `%s`';
$strIndexes = 'Ãndices';
$strInnodbStat = 'Estado de InnoDB';
$strInsecureMySQL = 'O seu ficheiro de configuración contén axustes (en concreto, o usuário root non ten contrasinal) que corresponden coa conta con todos os privilexios que MySQL fai por omisión. O seu servidor de MySQL está a rodar con esta configuración, está aberto a intrusións e habería que mirar de solucionar este problema de seguranza.';
@@ -307,7 +323,7 @@ $strInsertNewRow = 'Inserir un novo rexistro';
$strInsertTextfiles = 'Inserir un arquivo de texto na tabela';
$strInsertedRowId = 'Identificador da fila inserida:';
$strInsertedRows = 'Filas inseridas:';
-$strInstructions = 'Instruccións';
+$strInstructions = 'Instrucións';
$strInternalNotNecessary = '* Non se precisa dunha relación interna cando existe tamén en InnoDB.';
$strInternalRelations = 'Relacións internas';
@@ -384,10 +400,11 @@ $strName = 'Nome';
$strNeedPrimaryKey = 'Deberia definir unha chave primaria para esta tabela.';
$strNext = 'Seguinte';
$strNo = 'Non';
-$strNoDatabases = 'Non hai nengún banco de datos';
+$strNoActivity = 'Non se rexistrou actividade algunha desde hai %s segundos ou máis. Terá que entrar de novo';
+$strNoDatabases = 'Non hai nengunha base de datos';
$strNoDatabasesSelected = 'Non hai nengunha base de datos seleccionada.';
$strNoDescription = 'sen descrición';
-$strNoDropDatabases = 'Os comandos "Eliminar banco de datos" non están permitidos.';
+$strNoDropDatabases = 'Os comandos "Eliminar a base de datos" non están permitidos.';
$strNoExplain = 'Saltar a explicacion de SQL';
$strNoFrames = 'phpMyAdmin usa-se mellor cun navegador que <b>acepte molduras</b>.';
$strNoIndex = 'Non se definiu un índice';
@@ -402,7 +419,7 @@ $strNoQuery = 'Non hai procura SQL!';
$strNoRights = 'Non ten direitos suficientes para estar aquí agora!';
$strNoRowsSelected = 'Non hai fileiras seleccionadas';
$strNoSpace = 'Non hai espacio para gardar o ficheiro %s.';
-$strNoTablesFound = 'Non se achou nengunha tabela no banco de datos';
+$strNoTablesFound = 'Non se achou nengunha tabela na base de datos';
$strNoThemeSupport = 'Non ten a funcionalidade dos temas. Comprobe a configuración e/ou os seus temas no directorio %s.';
$strNoUsersFound = 'Non se achou nengun(s) usuario(s).';
$strNoValidateSQL = 'Saltarse a validacion de';
@@ -435,6 +452,7 @@ $strPartialText = 'Textos parciais';
$strPassword = 'Contrasinal';
$strPasswordChanged = 'Modificou-se sen problemas o contrasinal de %s.';
$strPasswordEmpty = 'O contrasinal está vacío!';
+$strPasswordHashing = 'Hash do contrasinal';
$strPasswordNotSame = 'Os contrasinais non son os mesmos!';
$strPdfDbSchema = 'Esquema da base de datos "%s" - Páxina %s';
$strPdfInvalidTblName = 'Non existe a tabela "%s".';
@@ -496,7 +514,7 @@ $strQBE = 'Procurar pondo un exemplo ("QBE")';
$strQBEDel = 'Eliminar';
$strQBEIns = 'Inserir';
$strQueryFrame = 'Xanela de procuras';
-$strQueryOnDb = 'Procura tipo SQL no banco de datos <b>%s</b>:';
+$strQueryOnDb = 'Procura tipo SQL na base de datos <b>%s</b>:';
$strQuerySQLHistory = 'Historial de SQL';
$strQueryStatistics = '<b>Estatística das procuras</b>: Desde que se iniciou, enviáronselle ao servidor %s procuras.';
$strQueryTime = 'A pesquisa levou %01.4f segundos';
@@ -571,6 +589,7 @@ $strSearchType = 'Atopar:';
$strSecretRequired = 'O ficheiro de configuración agora necesita un contrasinal secreto (blowfish_secret).';
$strSelectADb = 'Seleccione unha base de dados';
$strSelectAll = 'Seleccionar todo';
+$strSelectBinaryLog = 'Seleccione o ficheiro de rexistro binario que quer ver';
$strSelectFields = 'Seleccione os campos (mínimo 1)';
$strSelectNumRows = 'a procurar';
$strSelectTables = 'Seleccionar tabelas';
@@ -615,17 +634,18 @@ $strStatUpdateTime = 'Actualización máis recente';
$strStatement = 'Informacións';
$strStatus = 'Estado';
$strStrucCSV = 'Datos CSV';
-$strStrucData = 'Estructura e datos';
+$strStrucData = 'Estrutura e datos';
$strStrucDrop = 'Adicionar \'Eliminar tabela anterior se existe\'';
$strStrucExcelCSV = 'CSV (para datos de MS Excel)';
$strStrucNativeExcel = 'Datos nativos de MS Excel';
-$strStrucOnly = 'Só a estructura';
-$strStructPropose = 'Propor unha estructura para a tabela';
-$strStructure = 'Estructura';
+$strStrucOnly = 'Só a estrutura';
+$strStructPropose = 'Propor unha estrutura para a tabela';
+$strStructure = 'Estrutura';
$strSubmit = 'Submeter';
$strSuccess = 'O seu comando de SQL executou-se com éxito';
$strSum = 'Suma';
$strSwedish = 'Sueco';
+$strSwitchToDatabase = 'Pasar á base de datos copiada';
$strSwitchToTable = 'Ir ? tabela copiada';
$strTable = 'Tabela';
@@ -637,7 +657,7 @@ $strTableHasBeenFlushed = 'Fechouse a tabela %s';
$strTableMaintenance = 'Tabela de manutención';
$strTableOfContents = 'Table of contents';
$strTableOptions = 'Opcións de tabela';
-$strTableStructure = 'Estructura da tabela';
+$strTableStructure = 'Estrutura da tabela';
$strTableType = 'Tipo da tabela';
$strTables = '%s tabela(s)';
$strTakeIt = 'colle-o';
@@ -687,6 +707,7 @@ $strUpgrade = 'Deberia actualizar a %s %s ou posterior.';
$strUsage = 'Uso';
$strUseBackquotes = 'Protexer os nomes das tabelas e dos campos con&nbsp;" ` "';
$strUseHostTable = 'Usar a tabela de Host';
+$strUseTabKey = 'Use a tecla do tabulador para moverse de valor en valor ou a tecla CONTROL combinada cunha flecha para moverse a calquer sitio';
$strUseTables = 'Usar as tabelas';
$strUseTextField = 'Use campo de texto';
$strUseThisValue = 'Usar este valor';
@@ -704,7 +725,7 @@ $strValidatorError = 'Non foi posible iniciar o comprobador de SQL. Comprobe que
$strValue = 'Valor';
$strVar = 'Variable';
$strViewDump = 'Ver o esquema do volcado da tabela';
-$strViewDumpDB = 'Ver o esquema do volcado do banco de datos';
+$strViewDumpDB = 'Ver o esquema do volcado da base de datos';
$strViewDumpDatabases = 'Ver o volcado das bases de datos';
$strWebServerUploadDirectory = 'directorio de subida (upload) do servidor web';
@@ -725,23 +746,8 @@ $strYes = 'Si';
$strZeroRemovesTheLimit = 'Nota: Se estas opcións se configuran como 0 (cero) elimina-se o limite.';
$strZip = 'comprimido no formato "zip"';
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php
index f1b926343b..47ecc5146a 100644
--- a/lang/georgian-utf-8.inc.php
+++ b/lang/georgian-utf-8.inc.php
@@ -767,4 +767,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/german-iso-8859-1.inc.php b/lang/german-iso-8859-1.inc.php
index 4ba3349d9d..56993854a6 100644
--- a/lang/german-iso-8859-1.inc.php
+++ b/lang/german-iso-8859-1.inc.php
@@ -746,4 +746,10 @@ $strIndexWarningPrimary = 'INDEX und PRIMARY Index-Typen sollten nicht gleichzei
$strIndexWarningUnique = 'INDEX und UNIQUE Index-Typen sollten nicht gleichzeitig für die Spalte `%s` gesetzt sein';
$strIndexWarningMultiple = 'Es sollte nicht mehr als ein Index des Typs %s für die Spalte `%s` gesetzt sein';
$strIndexWarningTable = 'Warnungen bei den Indizen der Tabelle `%s`';
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php
index a662567683..3cde918c0e 100644
--- a/lang/german-utf-8.inc.php
+++ b/lang/german-utf-8.inc.php
@@ -747,4 +747,10 @@ $strIndexWarningPrimary = 'INDEX und PRIMARY Index-Typen sollten nicht gleichzei
$strIndexWarningUnique = 'INDEX und UNIQUE Index-Typen sollten nicht gleichzeitig für die Spalte `%s` gesetzt sein';
$strIndexWarningMultiple = 'Es sollte nicht mehr als ein Index des Typs %s für die Spalte `%s` gesetzt sein';
$strIndexWarningTable = 'Warnungen bei den Indizen der Tabelle `%s`';
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/greek-iso-8859-7.inc.php b/lang/greek-iso-8859-7.inc.php
index cf3e0a70f0..ac05537d43 100644
--- a/lang/greek-iso-8859-7.inc.php
+++ b/lang/greek-iso-8859-7.inc.php
@@ -747,4 +747,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php
index 0ffd94aab4..3a735b76b6 100644
--- a/lang/greek-utf-8.inc.php
+++ b/lang/greek-utf-8.inc.php
@@ -748,4 +748,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/hebrew-iso-8859-8-i.inc.php b/lang/hebrew-iso-8859-8-i.inc.php
index fde0b33dde..5fcbb9e8fa 100644
--- a/lang/hebrew-iso-8859-8-i.inc.php
+++ b/lang/hebrew-iso-8859-8-i.inc.php
@@ -763,4 +763,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php
index fe79b9ed5f..69ec7e7c5c 100644
--- a/lang/hebrew-utf-8.inc.php
+++ b/lang/hebrew-utf-8.inc.php
@@ -764,4 +764,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php
index 59fcc413b7..354b2fd50b 100644
--- a/lang/hindi-utf-8.inc.php
+++ b/lang/hindi-utf-8.inc.php
@@ -771,4 +771,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/hungarian-iso-8859-2.inc.php b/lang/hungarian-iso-8859-2.inc.php
index 493d24462b..93e366e1d3 100644
--- a/lang/hungarian-iso-8859-2.inc.php
+++ b/lang/hungarian-iso-8859-2.inc.php
@@ -745,4 +745,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php
index 2af11e7e8a..ebfc38c881 100644
--- a/lang/hungarian-utf-8.inc.php
+++ b/lang/hungarian-utf-8.inc.php
@@ -746,4 +746,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/indonesian-iso-8859-1.inc.php b/lang/indonesian-iso-8859-1.inc.php
index f4f09e376d..9878d2ffe3 100644
--- a/lang/indonesian-iso-8859-1.inc.php
+++ b/lang/indonesian-iso-8859-1.inc.php
@@ -18,7 +18,7 @@ $datefmt = '%d. %B %Y jam %H:%M';
$timespanfmt = '%s hari, %s jam, %s menit dan %s detik';
$strAPrimaryKey = 'Primary key telah ditambahkan pada %s';
-$strAbortedClients = 'Dibatalkan';
+$strAbortedClients = 'Pembatalan';
$strAbsolutePathToDocSqlDir = 'Silakan menentukan Absolute Path pada webserver yang menunjuk ke direktori docSQL';
$strAccessDenied = 'Akses ditolak';
$strAccessDeniedExplanation = 'phpMyAdmin telah berusaha untuk membuka koneksi ke server MySQL tetapi koneksi ditolak oleh server. Silakan periksa kembali nama host, nama pengguna dan kata sandi pada file config.inc.php untuk memastikan kecocokannya dengan informasi yang telah diberikan oleh administrator server MySQL.';
@@ -28,9 +28,10 @@ $strAddConstraints = 'Menambahkan pembatas';
$strAddDeleteColumn = 'Menambahkan/Hapus kolom';
$strAddDeleteRow = 'Menambahkan/Hapus baris';
$strAddDropDatabase = 'Menambahkan DROP DATABASE';
-$strAddHeaderComment = 'Menambahkan komentar sendiri pada Header (\\n membelahkan garis)';
-$strAddIfNotExists = 'Menambahkan IF NOT EXISTS';
-$strAddIntoComments = 'Menambahkan pada komentar';
+$strAddFields = 'Menambahkan %s field(s)';
+$strAddHeaderComment = 'Menambahkan komentar individual pada Header (\\n membelahkan garis)';
+$strAddIfNotExists = 'Berikut IF \'NOT EXISTS\'';
+$strAddIntoComments = 'Penambahkan pada komentar:';
$strAddNewField = 'Menambahkan field baru';
$strAddPrivilegesOnDb = 'Menambahkan hak (privileges) pada database berikut';
$strAddPrivilegesOnTbl = 'Menambahkan hak (privileges) pada tabel berikut';
@@ -42,9 +43,9 @@ $strAddedColumnComment = 'Komentar untuk kolum telah ditambahkan';
$strAddedColumnRelation = 'Relasi untuk kolum telah ditambahkan';
$strAdministration = 'Administrasi';
$strAffectedRows = 'Baris yang terlibat:';
-$strAfter = 'Sisipkan setelah %s';
-$strAfterInsertBack = 'Kembali';
-$strAfterInsertNewInsert = 'Sisipkan baris baru';
+$strAfter = 'sisipkan setelah %s';
+$strAfterInsertBack = 'kembali';
+$strAfterInsertNewInsert = 'sisipkan baris baru berikutnya';
$strAfterInsertSame = 'Kembali ke halaman ini';
$strAll = 'Semua';
$strAllTableSameWidth = 'Tampilkan seluruh tabel dengan lebar yang sama?';
@@ -54,7 +55,8 @@ $strAnalyzeTable = 'Analisa tabel';
$strAnd = 'dan';
$strAny = 'Setiap';
$strAnyHost = 'Setiap host';
-$strAnyUser = 'Setiap pemakai';
+$strAnyUser = 'Setiap pengguna';
+$strApproximateCount = 'Kemungkinan hanya perkiraan saja. Lihat FAQ 3.11';
$strArabic = 'Bahasa Arab';
$strArmenian = 'Bahasa Armenia';
$strAscending = 'Urutan menaik';
@@ -68,14 +70,21 @@ $strBack = 'Kembali';
$strBaltic = 'Bahasa Baltik';
$strBeginCut = 'Mulai potong (CUT)';
$strBeginRaw = 'MULAI mentah (RAW)';
+$strBinLogEventType = 'Tipe Kejadian';
+$strBinLogInfo = 'Informasi';
+$strBinLogName = 'Catat nama';
+$strBinLogOriginalPosition = 'Posisi aslinya';
+$strBinLogPosition = 'Posisi';
+$strBinLogServerId = 'ID Server';
$strBinary = 'Binari';
$strBinaryDoNotEdit = 'Binari - jangan di-edit';
-$strBookmarkAllUsers = 'Izinkan kepada seluruh pemakai untuk mengakses Bookmark ini';
-$strBookmarkDeleted = 'Bookmark telah dihapus.';
+$strBinaryLog = 'Log binari';
+$strBookmarkAllUsers = 'Izinkan semua pengguna untuk mengakses simpanan ini';
+$strBookmarkDeleted = 'Penyimpanan telah dihapus.';
$strBookmarkLabel = 'Judul';
-$strBookmarkOptions = 'Pilihan untuk Bookmark';
-$strBookmarkQuery = 'Bookmark query SQL ';
-$strBookmarkThis = 'Bookmark SQL-query ini';
+$strBookmarkOptions = 'Pilihan untuk simpan';
+$strBookmarkQuery = 'Ingat pada pencarian SQL ';
+$strBookmarkThis = 'Simpan pencarian SQL ini';
$strBookmarkView = 'Hanya melihat';
$strBrowse = 'Browse';
$strBrowseForeignValues = 'Menjelajahi nilai luar';
@@ -90,38 +99,39 @@ $strCantLoad = 'gagal loading ekstensi %s,<br />mohon periksa kembali konfiguras
$strCantLoadRecodeIconv = 'Gagal loading iconv atau perubahan kode extension untuk konversi charset diperlukan. Silakan konfigurasikan php untuk menggunakan extensions yang diperlukan atau matikan fasilitas konversi Charset pada phpMyAdmin.';
$strCantRenameIdxToPrimary = 'Gagal ubah nama Indeks ke PRIMARY!';
$strCantUseRecodeIconv = 'Gagal menggunakan iconv, libiconv atau fungsi recode_string selama ekstensi masih dalam keadaan di-load. Periksa kembali konfigurasi PHP.';
-$strCardinality = 'Huruf besar atau kecil';
+$strCardinality = 'Bilangan Pokok';
$strCarriage = 'Di baris baru: \\r';
$strCaseInsensitive = 'peka terhadap huruf besar/kecil';
$strCaseSensitive = 'tidak peka terhadap huruf besar/kecil';
$strCentralEuropean = 'Eropa Tengah';
$strChange = 'Ubah';
-$strChangeCopyMode = 'Ciptakan pemakai baru dengan hak-hak yang sama dan ...';
+$strChangeCopyMode = 'Ciptakan pengguna baru dengan hak-hak yang sama dan ...';
$strChangeCopyModeCopy = '... mempertahankan yang lama.';
$strChangeCopyModeDeleteAndReload = ' ... hapuskan yang lama dari User Table, kemudian reload hak-hak.';
$strChangeCopyModeJustDelete = ' ... hapus yang lama dari User Table.';
$strChangeCopyModeRevoke = ' ... cabut seluruh hak yang aktif, kemudian hapuskan yang lama.';
-$strChangeCopyUser = 'Ubah informasi Login / Salip pemakai';
+$strChangeCopyUser = 'Ubah informasi Login / Salip pengguna';
$strChangeDisplay = 'Pilih Field untuk ditampilkan';
$strChangePassword = 'Ubah Kata Sandi';
$strCharset = 'Perangkat karakter (Charset)';
-$strCharsetOfFile = 'Kumpulan karakter (Character Set) dari file:';
-$strCharsets = 'Pilihan Karakter';
-$strCharsetsAndCollations = 'Pilihan karakter dan pembandingan';
-$strCheckAll = 'Tandakan semua';
+$strCharsetOfFile = 'Penyusunan karakter dalam file:';
+$strCharsets = 'Penyusunan Karakter';
+$strCharsetsAndCollations = 'Penyusunan karakter dan tabel urutan';
+$strCheckAll = 'Pilih semua';
$strCheckOverhead = 'Periksa Overheaded';
$strCheckPrivs = 'Periksa hak-hak';
$strCheckPrivsLong = 'Periksa hak-hak untuk database &quot;%s&quot;.';
$strCheckTable = 'Periksa tabel';
$strChoosePage = 'Silakan pilih halaman untuk diubah';
$strColComFeat = 'Tampilkan komentar kolom';
-$strCollation = 'Pembandingan';
+$strCollation = 'Penyortiran';
$strColumnNames = 'Nama kolom';
$strColumnPrivileges = 'Hak (privileges) khusus terhadap kolum';
$strCommand = 'Perintah';
$strComments = 'Komentar';
$strCommentsForTable = 'KOMENTAR UNTUK TABEL';
-$strCompleteInserts = 'Penyisipan lengkap';
+$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible';
+$strCompleteInserts = 'INSERT lengkap';
$strCompression = 'Kompresi';
$strConfigFileError = 'phpMyAdmin gagal membaca file konfigurasi!<br />Hal ini diakibatkan oleh Parse Error atau file tidak ditemukan.<br />Silakan bukakan file konfigurasi dengan cara mengunakan link dibawah ini. Mohon perhatikan PHP Error Message(s) yang akan ditampilkan. Seringkali sebuah tanda kutip atau titik-koma ketinggalan.<br />Jika muncul sebuah halaman kosong, artinya tidak ada masalah.';
$strConfigureTableCoord = 'Silakan konfigurasikan koordinasi bagi tabel %s';
@@ -130,6 +140,7 @@ $strConnections = 'Koneksi';
$strConstraintsForDumped = 'Ketidakleluasaan untuk tabel pelimpahan (Dumped Tables)';
$strConstraintsForTable = 'Ketidakleluasaan untuk tabel';
$strCookiesRequired = 'Mulai dari sini Cookies harus diaktifkan.';
+$strCopyDatabaseOK = 'Database %s telah disalin ke %s';
$strCopyTable = 'Salin tabel ke (database<b>.</b>nama tabel):';
$strCopyTableOK = 'Tabel %s telah disalin ke %s.';
$strCopyTableSameNames = 'Penyalinan tabel pada diri-sendiri tidak bisa dilakukan!';
@@ -149,6 +160,7 @@ $strCzech = 'Bahasa Ceko';
$strCzechSlovak = 'Cecko-Slovakia';
$strDBComment = 'Komentar Database: ';
+$strDBCopy = 'Salin database ke';
$strDBGContext = 'Susunan';
$strDBGContextID = 'Susunan ID';
$strDBGHits = 'Hits';
@@ -180,28 +192,28 @@ $strDefault = 'Default';
$strDefaultValueHelp = 'Untuk nilai (value) default cukup diisi single value saja tanpa menggunakan backslash, escaping atau quotes dan dengan menggunakan format sbb.: a';
$strDefragment = 'Defragmentasikan tabel';
$strDelOld = 'Halaman ini berisi referensi tentang tabel yang sudah tidak ada. Apakah Anda ingin hapus referensi yang bersangkutan?';
-$strDelayedInserts = 'Gunakan Delayed Inserts';
+$strDelayedInserts = 'Gunakan perintah INSERT memperlambat';
$strDelete = 'Hapus';
-$strDeleteAndFlush = 'Hapus pemakai dan Reload hak-hak (Privileges).';
+$strDeleteAndFlush = 'Hapus pengguna, lantas Reload hak-hak (Privileges).';
$strDeleteAndFlushDescr = 'Ini cara yang terbaik tetapi akan memakan waktu cukup lama.';
$strDeleted = 'Baris telah dihapus';
$strDeletedRows = 'Baris yang dihapus:';
$strDeleting = 'Menghapus %s';
-$strDescending = 'Menurun';
+$strDescending = 'Urutan menurun';
$strDescription = 'Deskripsi';
$strDictionary = 'kamus';
-$strDisableForeignChecks = 'Matikan pengechekan kunci asing';
+$strDisableForeignChecks = 'Tanpa pemeriksaan kunci asing';
$strDisabled = 'Tidak aktif';
$strDisplayFeat = 'Tampilkan ciri-ciri';
-$strDisplayOrder = 'Urutan tampilan berdasarkan:';
+$strDisplayOrder = 'Urut tampilan berdasarkan:';
$strDisplayPDF = 'Tampilkan skema PDF';
-$strDoAQuery = 'Cari berdasarkan data contoh ("query by example") (wildcard: "%")';
+$strDoAQuery = 'cari berdasarkan data contoh ("query by example") (wildcard: "%")';
$strDoYouReally = 'Apakah anda ingin ';
$strDocu = 'Dokumentasi';
-$strDrop = 'Hapus Field ini';
-$strDropDatabaseStrongWarning = 'Anda akan MENGHAPUSKAN SELURUH database!';
+$strDrop = 'Hapus';
+$strDropDatabaseStrongWarning = 'Anda akan MENGHAPUS SELURUH database!';
$strDropSelectedDatabases = 'Hapus database pilihan';
-$strDropUsersDb = 'Hapus database yang memiliki nama yang sama dengan pemakainya.';
+$strDropUsersDb = 'Hapus database yang memiliki nama yang sama dengan pengguna.';
$strDumpSaved = 'Dump (Skema) disimpan pada file %s.';
$strDumpXRows = 'Dump %s baris bermula pada baris %s.';
$strDumpingData = 'Dumping data untuk tabel';
@@ -211,7 +223,7 @@ $strEdit = 'Ubah';
$strEditPDFPages = 'Ubah halaman PDF';
$strEditPrivileges = 'Ubah hak akses (privilege)';
$strEffective = 'Efektif';
-$strEmpty = 'Hapus semua Record';
+$strEmpty = 'Mengosongkan';
$strEmptyResultSet = 'MySQL balikkan hasil kosong (a.k. baris yang kosong).';
$strEnabled = 'Aktif';
$strEncloseInTransaction = 'Menyertakan ekspor dalam transaksi';
@@ -219,18 +231,19 @@ $strEnd = 'Terakhir';
$strEndCut = 'Akhiri potong (CUT)';
$strEndRaw = 'AKHIRI mentah (RAW)';
$strEnglish = 'Bahasa Ingris';
-$strEnglishPrivileges = ' Catatan: Nama privilege MySQL adalah dalam bahasa Ingris ';
+$strEnglishPrivileges = ' Catatan: Nama privilege MySQL dalam bahasa Ingris ';
$strError = 'Error';
+$strEscapeWildcards = 'Wildcard _ dan % sebaiknya diakhiri dengan tanda \ untuk mengunakannya secara harfiah';
$strEstonian = 'Bahasa Estonia';
$strExcelEdition = 'Edisi Excel';
$strExcelOptions = 'Pilihan Excel';
$strExecuteBookmarked = 'Eksekusikan pencarian dengan mengikuti penunjuk halaman';
$strExplain = 'Terangkan SQL';
$strExport = 'Ekspor';
-$strExtendedInserts = 'Penyisipan diperluas';
+$strExtendedInserts = 'INSERT memperluas';
$strExtra = 'Ekstra';
-$strFailedAttempts = 'Percobaan yang telah gagal';
+$strFailedAttempts = 'Gagal';
$strField = 'Field';
$strFieldHasBeenDropped = 'Field %s telah dihapus';
$strFields = 'Field';
@@ -240,11 +253,11 @@ $strFieldsEscapedBy = 'Field dikembalikan oleh';
$strFieldsTerminatedBy = 'Fields diputus oleh';
$strFileAlreadyExists = 'File %s sudah ada pada server. Gantikan nama file atau periksa pilihan Overwrite.';
$strFileCouldNotBeRead = 'Gagal membaca File';
-$strFileNameTemplate = 'Template nama file';
+$strFileNameTemplate = 'Konvensi nama file';
$strFileNameTemplateHelp = 'Gunakan__DB__sebagai nama Database,__TABLE__sebagai nama tabel dan %sany strftime%s sebagai spesifikasi waktu. Ekstensi akan ditambahkan secara otomatis. Teks lainnya akan dipertahankan.';
-$strFileNameTemplateRemember = 'ingat template';
+$strFileNameTemplateRemember = 'ingat konvensi';
$strFixed = 'telah diperbaiki';
-$strFlushPrivilegesNote = 'Perhatian: phpMyAdmin mengambil data tentang hak-hak dari pemakai secara langsung dari tabel Hak Istimewa (Privileges) MySQL. Isi dari tabel tersebut bisa berbeda dari Hak Istimewa (Privileges) yang digunakan oleh Server bila pernah diubah. Bila begitu disarankan untuk %sReload Hak Istimewa (Privileges)%s sebelum melanjut.';
+$strFlushPrivilegesNote = 'Perhatian: phpMyAdmin membaca data tentang pengguna secara langsung dari tabel profil pengguna MySQL. Isi dari tabel bisa saja berbeda dengan profil pengguna yang digunakan oleh Server pada saat ini bila tabel tsb. pernah diubah secara manual. Disarankan untuk %sme-reload profil pengguna%s sebelum melanjut.';
$strFlushTable = 'Tutup tabel ("FLUSH")';
$strFormEmpty = 'Data dalam form kurang !';
$strFormat = 'Format';
@@ -260,15 +273,15 @@ $strGlobal = 'global';
$strGlobalPrivileges = 'Hak Istimewa (Privileges) Global';
$strGlobalValue = 'Nilai Global';
$strGo = 'Go';
-$strGrantOption = 'Mengizinkan';
+$strGrantOption = 'Izin';
$strGreek = 'Bahasa Yunani';
-$strGzip = '"Dikompress dengan GZip"';
+$strGzip = 'Dikompress dengan GZip';
$strHasBeenAltered = 'telah diubah.';
$strHasBeenCreated = 'telah diciptakan.';
$strHaveToShow = 'Sekurang-kurangnya satu kolom harus dipilih untuk ditampilkan';
$strHebrew = 'Bahasa Yahudi';
-$strHexForBinary = 'Gunakan hexadesimal untuk file binari';
+$strHexForBinary = 'Gunakan cara hexadesimal untuk field binari';
$strHome = 'Home';
$strHomepageOfficial = 'Homepage resmi phpMyAdmin';
$strHost = 'Host';
@@ -280,7 +293,7 @@ $strId = 'ID';
$strIdxFulltext = 'Teks penuh';
$strIfYouWish = 'Jika Anda hanya ingin memuat beberapa kolom saja dari tabel, silakan gunakan tanda koma sebagai pemisah.';
$strIgnore = 'Abaikan';
-$strIgnoreInserts = 'Gunakan Ignore Inserts';
+$strIgnoreInserts = 'Gunakan perintah INSERT dengan mengabaikan kesalahan';
$strIgnoringFile = 'Abaikan file %s';
$strImportDocSQL = 'Impor file docSQL';
$strImportFiles = 'Impor file';
@@ -290,11 +303,16 @@ $strIndex = 'Indeks';
$strIndexHasBeenDropped = 'Indeks %s telah dihapus';
$strIndexName = 'Nama indeks&nbsp;:';
$strIndexType = 'Tipe indeks&nbsp;:';
+$strIndexWarningMultiple = 'Lebih dari satu kunci %s untuk kolom `%s` telah dibuat ';
+$strIndexWarningPrimary = 'Kunci PRIMARY dan INDEKS sebaiknya jangan di-set secara bersamaan untuk kolom `%s`';
+$strIndexWarningTable = 'Ditemukan masalah dengan indeks dalam tabel `%s`';
+$strIndexWarningUnique = 'Kunci UNIK and INDEKS sebaiknya jangan di-set secara bersamaan untuk kolom `%s`';
$strIndexes = 'Indeks';
$strInnodbStat = 'Status dari InnoDB';
-$strInsecureMySQL = 'File konfigurasi Anda ditentukan dengan pemakai Root dan tanpa adanya Kata Sandi (sama dengan Default MySQL Privileged Account). Jika MySQL-Server dijalankan dengan sedemikian, server Anda terbuka lebar untuk suatu penyerangan. Disarankan untuk memperbaiki kelemahan keamanan (security hole) ini.';
+$strInsecureMySQL = 'File konfigurasi Anda ditentukan dengan pengguna Root dan tanpa adanya Kata Sandi (sama dengan Default MySQL Privileged Account). Jika MySQL-Server dijalankan dengan sedemikian, server Anda terbuka lebar untuk suatu penyerangan. Disarankan untuk memperbaiki kelemahan keamanan (security hole) ini.';
$strInsert = 'Sisipkan';
$strInsertAsNewRow = 'Sisipkan sebagai baris baru';
+$strInsertBookmarkTitle = 'Silakan masukkan judul untuk simpanan';
$strInsertNewRow = 'Sisipkan baris baru';
$strInsertTextfiles = 'Sisipkan data baru dari textfile pada tabel';
$strInsertedRowId = 'Menyisip baris id:';
@@ -305,11 +323,11 @@ $strInternalRelations = 'Relasi internal';
$strJapanese = 'Bahasa Jepang';
$strJumpToDB = 'Lompat langsung ke database &quot;%s&quot;.';
-$strJustDelete = 'Tinggal hapuskan pemakai dari tabel Hak Istimewa (Privileges).';
-$strJustDeleteDescr = 'Pemakai yang &quot;dihapus&quot; tetap berhak untuk mengakses Server seperti biasa sampai Hak Istimewa (Privileges) di-reload.';
+$strJustDelete = 'Hapus pengguna dari dari tabel daftar pengguna.';
+$strJustDeleteDescr = 'Pengguna yang &quot;dihapus&quot; tetap berhak untuk mengakses Server seperti biasa sampai Hak Istimewa (Privileges) di-reload.';
$strKeepPass = 'Jangan ubah Kata Sandi';
-$strKeyname = 'Nama kunci (Keyname)';
+$strKeyname = 'Nama Kunci';
$strKill = 'Tutup';
$strKorean = 'Bahasa Korea';
@@ -334,7 +352,7 @@ $strLithuanian = 'Bahasa Lithuania';
$strLoadExplanation = 'Cara yang terbaik sudah aktif secara Default tetapi bisa dirubah bila gagal.';
$strLoadMethod = 'Caranya LOAD';
$strLocalhost = 'Lokal';
-$strLocationTextfile = 'Lokasi dari textfile';
+$strLocationTextfile = 'dari File';
$strLogPassword = 'Kata Sandi:';
$strLogServer = 'Server';
$strLogUsername = 'Nama Pengguna:';
@@ -343,7 +361,7 @@ $strLoginInformation = 'Informasi Login';
$strLogout = 'Logout';
$strMIMETypesForTable = 'TIPE MIME UNTUK TABEL';
-$strMIME_MIMEtype = 'tipe MIME';
+$strMIME_MIMEtype = 'Tipe MIME';
$strMIME_available_mime = 'Tipe MIME yang tersedia';
$strMIME_available_transform = 'Transformasi yang tersedia';
$strMIME_description = 'Deskripsi';
@@ -364,18 +382,19 @@ $strMoveTableSameNames = 'Memindahkan tabel ke diri-sendiri tidak bisa dilakukan
$strMultilingual = 'berbagai bahasa';
$strMustSelectFile = 'Anda perlu pilih file untuk disisipkan terlebih dahulu.';
$strMySQLCharset = 'Charset MySQL';
-$strMySQLConnectionCollation = 'Pembandingan koneksi MySQL';
+$strMySQLConnectionCollation = 'Penyortiran koneksi MySQL';
$strMySQLReloaded = 'MySQL telah di-reload.';
$strMySQLSaid = 'MySQL menyatakan: ';
$strMySQLServerProcess = 'MySQL versi %pma_s1% dijalankan pada %pma_s2% sebagai %pma_s3%';
$strMySQLShowProcess = 'Tampilkan Proses';
-$strMySQLShowStatus = 'Tampilkan informasi runtime dari MySQL';
+$strMySQLShowStatus = 'Tampilkan informasi runtime MySQL';
$strMySQLShowVars = 'Tampilkan variabel sistem MySQL';
$strName = 'Nama';
$strNeedPrimaryKey = 'Disarankan untuk menetapkan Primary Key pada tabel ini.';
$strNext = 'Berikutnya';
$strNo = 'Tidak';
+$strNoActivity = 'Tidak ada aktifitas selama %s detik atau lebih. Silakan login kembali';
$strNoDatabases = 'Database tidak ditemukan';
$strNoDatabasesSelected = 'Database belum dipilih.';
$strNoDescription = 'tanpa keterangan';
@@ -395,6 +414,7 @@ $strNoRights = 'Hak Akses Anda untuk melanjut tidak cukup!';
$strNoRowsSelected = 'Tidak ada baris yang dipilih';
$strNoSpace = 'Tidak cukup ruang untuk menyimpan %s.';
$strNoTablesFound = 'Tidak ada tabel dalam database.';
+$strNoThemeSupport = 'Tidak ada dukungan untuk desain penampilan. Mohon periksa kembali konfigurasi dan/atau desain penampilan dalam direktori %s.';
$strNoUsersFound = 'Pengguna tidak ditemukan.';
$strNoValidateSQL = 'Melewati pengesahan (validation) SQL';
$strNone = 'tanpa';
@@ -403,7 +423,7 @@ $strNotOK = 'tidak oke';
$strNotSet = '<b>%s</b> tabel tidak ditemukan atau tidak diset di %s';
$strNotValidNumber = ' bukan nomor baris yang berlaku!';
$strNull = 'Kosong';
-$strNumSearchResultsInTable = '%s Rekord dalam tabel <i>%s</i>';
+$strNumSearchResultsInTable = '%s catatan dalam tabel <i>%s</i>';
$strNumSearchResultsTotal = '<b>Jumlah:</b> <i>%s</i> rekord';
$strNumTables = 'Tabel';
@@ -426,6 +446,7 @@ $strPartialText = 'Teks yang disingkat';
$strPassword = 'Kata Sandi';
$strPasswordChanged = 'Sukses mengubah Kata Sandi untuk %s .';
$strPasswordEmpty = 'Kata Sandi kosong!';
+$strPasswordHashing = 'Pengernaian Kata Sandi (Password Hashing)';
$strPasswordNotSame = 'Kata Sandi tidak sama!';
$strPdfDbSchema = 'Skema dari database "%s" - Halaman %s';
$strPdfInvalidTblName = 'Tabel "%s" tidak ditemukan!';
@@ -442,7 +463,7 @@ $strPolish = 'Polandia';
$strPortrait = 'Gambaran';
$strPos1 = 'Awal';
$strPrevious = 'Sebelumnya';
-$strPrimary = 'PRIMARY';
+$strPrimary = 'Kunci Utama';
$strPrimaryKeyHasBeenDropped = 'Kunci utama telah dihapus';
$strPrimaryKeyName = 'Nama Kunci utama diwajibkan... PRIMARY!';
$strPrimaryKeyWarning = '(Tanda nama "PRIMARY" <b>wajib</b> sebagai satu-satunya nama dan <b>hanya</b> sebagai Kunci utama saja!)';
@@ -459,26 +480,26 @@ $strPrivDescDropDb = 'Mengizinkan untuk hapus database dan tabel.';
$strPrivDescDropTbl = 'Mengizinkan untuk hapus tabel.';
$strPrivDescExecute = 'Mengizinkan untuk berjalan dengan prosedur yang tersimpan; tidak ada efek dalam versi MySQL ini.';
$strPrivDescFile = 'Mengizinkan untuk impor data dari file dan ekspor data kedalam file.';
-$strPrivDescGrant = 'Mengizinkan untuk menambah pemakai dan Hak Istimewa (Privileges) tanpa harus me-reload ulang tabel Hak Istimewa.';
+$strPrivDescGrant = 'Mengizinkan untuk menambah pengguna dan Hak Istimewa (Privileges) tanpa harus me-reload ulang tabel Hak Istimewa.';
$strPrivDescIndex = 'Mengizinkan untuk menciptakan dan hapus Indeks.';
$strPrivDescInsert = 'Mengizinkan untuk tambah dan ganti data.';
$strPrivDescLockTables = 'Mengizinkan untuk mengunci tabel dalam Thread yang lagi berjalan.';
-$strPrivDescMaxConnections = 'Membatasi jumlah koneksi baru yang diperbolehkan untuk setiap pemakai dalam batas waktu satu jam.';
-$strPrivDescMaxQuestions = 'Membatasi jumlah pencarian (Queries) yang diperbolehkan untuk setiap pemakai dalam batas waktu satu jam.';
-$strPrivDescMaxUpdates = 'Membatasi jumlah perintah untuk merubah sebuah tabel atau database untuk setiap pemakai dalam batas waktu satu jam.';
-$strPrivDescProcess3 = 'Mengizinkan untuk hentikan proses yang dimiliki pemakai lain.';
+$strPrivDescMaxConnections = 'Membatasi jumlah koneksi baru yang diperbolehkan untuk setiap pengguna dalam batas waktu satu jam.';
+$strPrivDescMaxQuestions = 'Membatasi jumlah pencarian (Queries) yang diperbolehkan untuk setiap pengguna dalam batas waktu satu jam.';
+$strPrivDescMaxUpdates = 'Membatasi jumlah perintah untuk merubah sebuah tabel atau database untuk setiap pengguna dalam batas waktu satu jam.';
+$strPrivDescProcess3 = 'Mengizinkan untuk hentikan proses yang dimiliki pengguna lain.';
$strPrivDescProcess4 = 'Mengizinkan untuk tampilkan seluruh pencarian dalam daftar proses.';
$strPrivDescReferences = 'Tidak ada efek dalam versi MySQL yang digunakan.';
$strPrivDescReload = 'Mengizinkan untuk reload stelan dari server dan untuk flush cache dari server.';
-$strPrivDescReplClient = 'Memberi hak kepada pemakai untuk menanyakan lokasi dari slaves / masters.';
+$strPrivDescReplClient = 'Memberi hak kepada pengguna untuk menanyakan lokasi dari slaves / masters.';
$strPrivDescReplSlave = 'Digunakan untuk replikasi dari slaves.';
$strPrivDescSelect = 'Mengizinkan untuk baca data.';
$strPrivDescShowDb = 'Memberi akses ke seluruh daftar database.';
$strPrivDescShutdown = 'Mengizinkan untuk shut-down server.';
-$strPrivDescSuper = 'Mengizinkan untuk tetap konek meskipun jumlah batas koneksi telah tercapai; diperlukan untuk hampir semua operasi administratif seperti stelan variabel global atau untuk mematikan sebuah Thread yang dimiliki oleh pemakai lain.';
+$strPrivDescSuper = 'Mengizinkan untuk tetap konek meskipun jumlah batas koneksi telah tercapai; diperlukan untuk hampir semua operasi administratif seperti stelan variabel global atau untuk mematikan sebuah Thread yang dimiliki oleh pengguna lain.';
$strPrivDescUpdate = 'Mengizinkan untuk ubah data.';
$strPrivDescUsage = 'Tanpa Hak Istimewa (Privileges).';
-$strPrivileges = 'Hak Akses (Privilege)';
+$strPrivileges = 'Hak Akses';
$strPrivilegesReloaded = 'Sukses reload Hak Istimewa (Privileges).';
$strProcesslist = 'Daftar proses';
$strPutColNames = 'Letakkan nama Fields pada baris pertama';
@@ -490,24 +511,24 @@ $strQueryFrame = 'Jendela Pencarian';
$strQueryOnDb = 'Pencarian SQL dalam database <b>%s</b>:';
$strQuerySQLHistory = 'Sejarah SQL';
$strQueryStatistics = '<b>Informasi statistik</b>: Sejak dihidupkan, %s pencarian telah dikirim kepada server.';
-$strQueryTime = 'Pencarian membutuhkan %01.4f detik';
+$strQueryTime = 'pencarian membutuhkan waktu %01.4f detik';
$strQueryType = 'Tipe Pencarian';
$strQueryWindowLock = 'Jangan timpahkan pencarian ini dari jendela luar';
$strReType = 'Ketik ulang';
-$strReceived = 'Diterima';
-$strRecords = 'Rekord';
+$strReceived = 'Penerimaan';
+$strRecords = 'Catatan';
$strReferentialIntegrity = 'Cek integriti referensial:';
$strRefresh = 'Menyegarkan';
$strRelationNotWorking = 'Fasilitas penambahan untuk bekerja dengan tabel yang di-link di nonaktifkan. Untuk mengetahui sebabnya silakan klik %sdisini%s.';
$strRelationView = 'Tampilan relasi';
$strRelationalSchema = 'Skema Relational';
-$strRelations = 'Relasi';
+$strRelations = 'Tabel Relasi';
$strRelationsForTable = 'RELASI UNTUK TABEL';
-$strReloadFailed = 'Gagal me-reload MySQL.';
-$strReloadMySQL = 'Reload MySQL';
+$strReloadFailed = 'Gagal memanggil ulang tabel pengguna.';
+$strReloadMySQL = 'Panggil ulang tabel pengguna';
$strReloadingThePrivileges = 'Reload Hak Istimewa (Privileges)';
-$strRemoveSelectedUsers = 'Hapus pemakai pilihan';
+$strRemoveSelectedUsers = 'Hapus pengguna yang dipilih';
$strRenameDatabaseOK = 'Nama database %s telah diubah menjadi %s';
$strRenameTable = 'Ubah nama tabel menjadi ';
$strRenameTableOK = 'Nama tabel %s telah diubah menjadi %s';
@@ -518,12 +539,12 @@ $strReplaceTable = 'Ganti data tabel dengan file';
$strReset = 'Reset';
$strResourceLimits = 'Batas dari sumber';
$strRevoke = 'Cabut';
-$strRevokeAndDelete = 'Hapus pemakai setelah cabut seluruh Hak Istimewa (Privileges) yang aktif dari pemakai yang bersangkutan.';
-$strRevokeAndDeleteDescr = 'Pemakai yang bersangkutan tetap memiliki hak untuk USAGE sampai seluruh Hak Istimewa (Privileges) di-reload kembali.';
+$strRevokeAndDelete = 'Cabut seluruh Hak Istimewa (Privileges) dari pengguna, lantas hapus pengguna tsb. dari daftar tabel pengguna.';
+$strRevokeAndDeleteDescr = 'Pengguna yang bersangkutan tetap memiliki hak untuk USAGE sampai seluruh Hak Istimewa (Privileges) di-reload kembali.';
$strRevokeMessage = 'Hak akses untuk %s telah dicabut';
$strRomanian = 'Romania';
-$strRowLength = 'Ukuran panjang baris';
-$strRowSize = ' Ukuran baris ';
+$strRowLength = 'Panjangnya baris';
+$strRowSize = ' Besarnya baris ';
$strRows = 'Baris';
$strRowsFrom = 'baris dimulai dari rekord #';
$strRowsModeFlippedHorizontal = 'horisontal (rotated headers)';
@@ -532,7 +553,7 @@ $strRowsModeOptions = 'diatur dengan urutan %s dan mengulang header setelah %s s
$strRowsModeVertical = 'vertikal';
$strRowsStatistic = 'Statistik Baris';
$strRunQuery = 'Jalankan pencarian SQL';
-$strRunSQLQuery = 'Jalankan pencarian SQL pada database %s';
+$strRunSQLQuery = 'Melaksanakan perintah SQL pada database %s';
$strRunning = 'dijalankan pada %s';
$strRussian = 'Bahasa Rusia';
@@ -562,20 +583,21 @@ $strSearchType = 'Cari:';
$strSecretRequired = 'File konfigurasi membutuhkan susunan kata-kata rahasia (blowfish_secret).';
$strSelectADb = 'Silakan pilih database';
$strSelectAll = 'Pilih semua';
-$strSelectFields = 'Pilih fields (minimal satu):';
+$strSelectBinaryLog = 'Pilih Log binari untuk ditinjau';
+$strSelectFields = 'Pilihan field (min. satu):';
$strSelectNumRows = 'dalam susunan pemeriksaan';
$strSelectTables = 'Pilih tabel';
$strSend = 'Kirimkan ke';
-$strSent = 'Dikirim';
+$strSent = 'Pengiriman';
$strServer = 'Server';
$strServerChoice = 'Pilihan Server';
$strServerNotResponding = 'Server tidak menjawab';
$strServerStatus = 'Informasi Runtime';
-$strServerStatusUptime = 'MySQL server ini telah berjalan secara berturut-turut selama %s. Server dijalankan pada %s.';
-$strServerTabProcesslist = 'Proses-Proses';
+$strServerStatusUptime = 'MySQL server ini telah berjalan secara berturut-turut selama %s. Server dijalankan pada tanggal %s.';
+$strServerTabProcesslist = 'Proses Aktif';
$strServerTabVariables = 'Variabel';
$strServerTrafficNotes = '<b>Server traffic</b>: Tabel ini menampilkan statistik jaringan lalu-lintas server MySQL sejak dihidupkan.';
-$strServerVars = 'Variabel dan stelan dari server';
+$strServerVars = 'Variabel dan penyetelan server';
$strServerVersion = 'Versi Server';
$strSessionValue = 'Nilai dari Session';
$strSetEnumVal = 'Jika tipe field sama dengan "enum" atau "set", silakan masukkan nilai dengan format: \'a\',\'b\',\'c\'...<br />Jika sebuah backslash ("\") atau suatu tanda kutip ("\'") diperlukan, tanda tersebut perlu ditutupi dengan tanda backslash (seb. contoh \'\\\\xyz\' atau \'a\\\'b\').';
@@ -585,10 +607,10 @@ $strShowColor = 'Tampilkan warna';
$strShowDatadictAs = 'Format dari kamus data';
$strShowFullQueries = 'Tampilkan pencarian yang lengkap';
$strShowGrid = 'Tampilkan garis';
-$strShowPHPInfo = 'Tampilkan informasi tentang PHP';
+$strShowPHPInfo = 'Tampilkan informasi PHP';
$strShowTableDimension = 'Tampilkan ukuran dari tabel';
$strShowTables = 'Tampilkan tabel';
-$strShowThisQuery = ' Tampilkan ulang pencarian SQL ';
+$strShowThisQuery = ' Tampilkan ulang perintah SQL ';
$strShowingRecords = 'Tampilan baris';
$strSimplifiedChinese = 'Bahasa Cina sederhana';
$strSingly = '(unik)';
@@ -603,20 +625,21 @@ $strSplitWordsWithSpace = 'Kata dipisahkan oleh karakter spasi (" ").';
$strStatCheckTime = 'Pemeriksaan terakhir';
$strStatCreateTime = 'Pembuatan';
$strStatUpdateTime = 'Update terakhir';
-$strStatement = 'Pernyataan';
+$strStatement = 'Keterangan';
$strStatus = 'Status';
$strStrucCSV = 'Data CSV';
$strStrucData = 'Struktur dan data';
-$strStrucDrop = 'Menambahkan \'Hapus tabel\'';
+$strStrucDrop = 'Berikut \'HAPUS TABEL\'';
$strStrucExcelCSV = 'CSV untuk data MS Excel';
$strStrucNativeExcel = 'Data asli MS Excel';
$strStrucOnly = 'Struktur saja';
-$strStructPropose = 'Ajukan struktur tabel';
+$strStructPropose = 'Menganalisa struktur tabel';
$strStructure = 'Struktur';
$strSubmit = 'Kirim';
$strSuccess = 'Sukses menjalankan perintah SQL';
$strSum = 'Jumlah';
$strSwedish = 'Bahasa Swedia';
+$strSwitchToDatabase = 'Pindah ke database yang disalin';
$strSwitchToTable = 'Pindah ke tabel salinan';
$strTable = 'Tabel';
@@ -638,11 +661,11 @@ $strThai = 'Bahasa Thailand';
$strTheContent = 'Isi file telah disisipkan.';
$strTheContents = 'Isi file telah diganti dengan isi tabel yang dipilih dengan kunci utama atau kunci unik.';
$strTheTerminator = 'Pemisah field.';
-$strTheme = 'Tema / Gaya';
+$strTheme = 'Desain Penampilan';
$strThisHost = 'Host yang ini';
$strThisNotDirectory = 'Ini bukan direktori';
$strThreadSuccessfullyKilled = 'Sukses hentikan Thread %s.';
-$strTime = 'Waktu';
+$strTime = 'Jangka Waktu';
$strToggleScratchboard = 'pindah buku catatan (Scratchboard)';
$strTotal = 'jumlah';
$strTotalUC = 'Jumlah';
@@ -665,30 +688,31 @@ $strTurkish = 'Bahasa Turki';
$strType = 'Jenis';
$strUkrainian = 'Bahasa Ukrainia';
-$strUncheckAll = 'Uncheck semua';
+$strUncheckAll = 'Hapus pilihan';
$strUnicode = 'Unikode';
$strUnique = 'Unik';
$strUnknown = 'tidak diketahui';
$strUnselectAll = 'Unselect semua';
$strUpdComTab = 'Mohon belajari dokumentasi untuk mengetahui cara meng-update tabel Column_comments Anda';
$strUpdatePrivMessage = 'Hak Akses (privilege) untuk %s telah di-update.';
-$strUpdateProfileMessage = 'Profil pemakai telah di-update.';
+$strUpdateProfileMessage = 'Profil pengguna telah di-update.';
$strUpdateQuery = 'Update proses pencarian';
$strUpgrade = 'Disarankan untuk meng-update ke %s versi %s atau lebih baru.';
$strUsage = 'Penggunaan';
-$strUseBackquotes = 'Gunakan backquotes dengan nama tabel dan nama field';
+$strUseBackquotes = 'Nama tabel dan nama field dalam tanda kutip biasa';
$strUseHostTable = 'Gunakan Host Table';
+$strUseTabKey = 'Gunakan tombol TAB untuk maju dari angka ke angka atau gunakan CTRL+panah untuk maju kemana saja';
$strUseTables = 'Gunakan tabel';
$strUseTextField = 'Gunakan text field';
$strUseThisValue = 'gunakan nilai ini';
-$strUser = 'Pemakai';
-$strUserAlreadyExists = 'Pemakai %s telah terdaftar!';
-$strUserEmpty = 'Nama pemakai masih kosong!';
-$strUserName = 'Nama pemakai';
-$strUserNotFound = 'Pemakai yang dipilih tidak ditemukan pada tabel hak (privilege table).';
-$strUserOverview = 'Pandangan Umum Pemakai';
-$strUsersDeleted = 'Sukses menghapus Pemakai yang dipilih.';
-$strUsersHavingAccessToDb = 'Pemakai memiliki akses ke &quot;%s&quot;';
+$strUser = 'Pengguna';
+$strUserAlreadyExists = 'Pengguna %s telah terdaftar!';
+$strUserEmpty = 'Nama pengguna masih kosong!';
+$strUserName = 'Nama pengguna';
+$strUserNotFound = 'Pengguna yang dipilih tidak ditemukan pada tabel hak (privilege table).';
+$strUserOverview = 'Pandangan Umum Pengguna';
+$strUsersDeleted = 'Sukses menghapus Pengguna yang dipilih.';
+$strUsersHavingAccessToDb = 'Pengguna memiliki akses ke &quot;%s&quot;';
$strValidateSQL = 'Mengesahkan (validate) SQL';
$strValidatorError = 'Pengesahan SQL tidak dapat disahkan. Mohon periksa kembali ekstension PHP yang diperlukan seperti yang tercatat dalam %sdokumentasi%s.';
@@ -704,38 +728,20 @@ $strWelcome = 'Selamat Datang di %s';
$strWestEuropean = 'Eropa Barat';
$strWildcard = 'wildcard';
$strWindowNotFound = 'Mengupdate jendela browser gagal. Ada kemungkinan Anda telah menutup jendela induknya atau pilihan keamanan pada browser Anda melarang untuk mengupdate dengan cara Cross-Window';
-$strWithChecked = 'Dengan pilihan:';
+$strWithChecked = 'yang ditandai:';
$strWritingCommentNotPossible = 'Penulisan komentar tidak dapat dilaksanakan';
$strWritingRelationNotPossible = 'Penulisan relasi tidak dapat dilaksanakan';
-$strWrongUser = 'Nama Pemakai/Kata Sandi salah. Akses ditolak.';
+$strWrongUser = 'Nama Pengguna/Kata Sandi salah. Akses ditolak.';
$strXML = 'XML';
$strYes = 'Ya';
$strZeroRemovesTheLimit = 'Perhatian: Perubahan pilihan ini ke posisi 0 (zero) akan menghapus batas yang telah ditentukan.';
-$strZip = '"Dikompress dengan Zip"';
+$strZip = 'Dikompress dengan Zip';
-$strAddFields = 'Add %s field(s)'; //to translate
-$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
-$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php
index 59d4e1e7c3..837767dbec 100644
--- a/lang/indonesian-utf-8.inc.php
+++ b/lang/indonesian-utf-8.inc.php
@@ -19,7 +19,7 @@ $datefmt = '%d. %B %Y jam %H:%M';
$timespanfmt = '%s hari, %s jam, %s menit dan %s detik';
$strAPrimaryKey = 'Primary key telah ditambahkan pada %s';
-$strAbortedClients = 'Dibatalkan';
+$strAbortedClients = 'Pembatalan';
$strAbsolutePathToDocSqlDir = 'Silakan menentukan Absolute Path pada webserver yang menunjuk ke direktori docSQL';
$strAccessDenied = 'Akses ditolak';
$strAccessDeniedExplanation = 'phpMyAdmin telah berusaha untuk membuka koneksi ke server MySQL tetapi koneksi ditolak oleh server. Silakan periksa kembali nama host, nama pengguna dan kata sandi pada file config.inc.php untuk memastikan kecocokannya dengan informasi yang telah diberikan oleh administrator server MySQL.';
@@ -29,9 +29,10 @@ $strAddConstraints = 'Menambahkan pembatas';
$strAddDeleteColumn = 'Menambahkan/Hapus kolom';
$strAddDeleteRow = 'Menambahkan/Hapus baris';
$strAddDropDatabase = 'Menambahkan DROP DATABASE';
-$strAddHeaderComment = 'Menambahkan komentar sendiri pada Header (\\n membelahkan garis)';
-$strAddIfNotExists = 'Menambahkan IF NOT EXISTS';
-$strAddIntoComments = 'Menambahkan pada komentar';
+$strAddFields = 'Menambahkan %s field(s)';
+$strAddHeaderComment = 'Menambahkan komentar individual pada Header (\\n membelahkan garis)';
+$strAddIfNotExists = 'Berikut IF \'NOT EXISTS\'';
+$strAddIntoComments = 'Penambahkan pada komentar:';
$strAddNewField = 'Menambahkan field baru';
$strAddPrivilegesOnDb = 'Menambahkan hak (privileges) pada database berikut';
$strAddPrivilegesOnTbl = 'Menambahkan hak (privileges) pada tabel berikut';
@@ -43,9 +44,9 @@ $strAddedColumnComment = 'Komentar untuk kolum telah ditambahkan';
$strAddedColumnRelation = 'Relasi untuk kolum telah ditambahkan';
$strAdministration = 'Administrasi';
$strAffectedRows = 'Baris yang terlibat:';
-$strAfter = 'Sisipkan setelah %s';
-$strAfterInsertBack = 'Kembali';
-$strAfterInsertNewInsert = 'Sisipkan baris baru';
+$strAfter = 'sisipkan setelah %s';
+$strAfterInsertBack = 'kembali';
+$strAfterInsertNewInsert = 'sisipkan baris baru berikutnya';
$strAfterInsertSame = 'Kembali ke halaman ini';
$strAll = 'Semua';
$strAllTableSameWidth = 'Tampilkan seluruh tabel dengan lebar yang sama?';
@@ -55,7 +56,8 @@ $strAnalyzeTable = 'Analisa tabel';
$strAnd = 'dan';
$strAny = 'Setiap';
$strAnyHost = 'Setiap host';
-$strAnyUser = 'Setiap pemakai';
+$strAnyUser = 'Setiap pengguna';
+$strApproximateCount = 'Kemungkinan hanya perkiraan saja. Lihat FAQ 3.11';
$strArabic = 'Bahasa Arab';
$strArmenian = 'Bahasa Armenia';
$strAscending = 'Urutan menaik';
@@ -69,14 +71,21 @@ $strBack = 'Kembali';
$strBaltic = 'Bahasa Baltik';
$strBeginCut = 'Mulai potong (CUT)';
$strBeginRaw = 'MULAI mentah (RAW)';
+$strBinLogEventType = 'Tipe Kejadian';
+$strBinLogInfo = 'Informasi';
+$strBinLogName = 'Catat nama';
+$strBinLogOriginalPosition = 'Posisi aslinya';
+$strBinLogPosition = 'Posisi';
+$strBinLogServerId = 'ID Server';
$strBinary = 'Binari';
$strBinaryDoNotEdit = 'Binari - jangan di-edit';
-$strBookmarkAllUsers = 'Izinkan kepada seluruh pemakai untuk mengakses Bookmark ini';
-$strBookmarkDeleted = 'Bookmark telah dihapus.';
+$strBinaryLog = 'Log binari';
+$strBookmarkAllUsers = 'Izinkan semua pengguna untuk mengakses simpanan ini';
+$strBookmarkDeleted = 'Penyimpanan telah dihapus.';
$strBookmarkLabel = 'Judul';
-$strBookmarkOptions = 'Pilihan untuk Bookmark';
-$strBookmarkQuery = 'Bookmark query SQL ';
-$strBookmarkThis = 'Bookmark SQL-query ini';
+$strBookmarkOptions = 'Pilihan untuk simpan';
+$strBookmarkQuery = 'Ingat pada pencarian SQL ';
+$strBookmarkThis = 'Simpan pencarian SQL ini';
$strBookmarkView = 'Hanya melihat';
$strBrowse = 'Browse';
$strBrowseForeignValues = 'Menjelajahi nilai luar';
@@ -91,38 +100,39 @@ $strCantLoad = 'gagal loading ekstensi %s,<br />mohon periksa kembali konfiguras
$strCantLoadRecodeIconv = 'Gagal loading iconv atau perubahan kode extension untuk konversi charset diperlukan. Silakan konfigurasikan php untuk menggunakan extensions yang diperlukan atau matikan fasilitas konversi Charset pada phpMyAdmin.';
$strCantRenameIdxToPrimary = 'Gagal ubah nama Indeks ke PRIMARY!';
$strCantUseRecodeIconv = 'Gagal menggunakan iconv, libiconv atau fungsi recode_string selama ekstensi masih dalam keadaan di-load. Periksa kembali konfigurasi PHP.';
-$strCardinality = 'Huruf besar atau kecil';
+$strCardinality = 'Bilangan Pokok';
$strCarriage = 'Di baris baru: \\r';
$strCaseInsensitive = 'peka terhadap huruf besar/kecil';
$strCaseSensitive = 'tidak peka terhadap huruf besar/kecil';
$strCentralEuropean = 'Eropa Tengah';
$strChange = 'Ubah';
-$strChangeCopyMode = 'Ciptakan pemakai baru dengan hak-hak yang sama dan ...';
+$strChangeCopyMode = 'Ciptakan pengguna baru dengan hak-hak yang sama dan ...';
$strChangeCopyModeCopy = '... mempertahankan yang lama.';
$strChangeCopyModeDeleteAndReload = ' ... hapuskan yang lama dari User Table, kemudian reload hak-hak.';
$strChangeCopyModeJustDelete = ' ... hapus yang lama dari User Table.';
$strChangeCopyModeRevoke = ' ... cabut seluruh hak yang aktif, kemudian hapuskan yang lama.';
-$strChangeCopyUser = 'Ubah informasi Login / Salip pemakai';
+$strChangeCopyUser = 'Ubah informasi Login / Salip pengguna';
$strChangeDisplay = 'Pilih Field untuk ditampilkan';
$strChangePassword = 'Ubah Kata Sandi';
$strCharset = 'Perangkat karakter (Charset)';
-$strCharsetOfFile = 'Kumpulan karakter (Character Set) dari file:';
-$strCharsets = 'Pilihan Karakter';
-$strCharsetsAndCollations = 'Pilihan karakter dan pembandingan';
-$strCheckAll = 'Tandakan semua';
+$strCharsetOfFile = 'Penyusunan karakter dalam file:';
+$strCharsets = 'Penyusunan Karakter';
+$strCharsetsAndCollations = 'Penyusunan karakter dan tabel urutan';
+$strCheckAll = 'Pilih semua';
$strCheckOverhead = 'Periksa Overheaded';
$strCheckPrivs = 'Periksa hak-hak';
$strCheckPrivsLong = 'Periksa hak-hak untuk database &quot;%s&quot;.';
$strCheckTable = 'Periksa tabel';
$strChoosePage = 'Silakan pilih halaman untuk diubah';
$strColComFeat = 'Tampilkan komentar kolom';
-$strCollation = 'Pembandingan';
+$strCollation = 'Penyortiran';
$strColumnNames = 'Nama kolom';
$strColumnPrivileges = 'Hak (privileges) khusus terhadap kolum';
$strCommand = 'Perintah';
$strComments = 'Komentar';
$strCommentsForTable = 'KOMENTAR UNTUK TABEL';
-$strCompleteInserts = 'Penyisipan lengkap';
+$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible';
+$strCompleteInserts = 'INSERT lengkap';
$strCompression = 'Kompresi';
$strConfigFileError = 'phpMyAdmin gagal membaca file konfigurasi!<br />Hal ini diakibatkan oleh Parse Error atau file tidak ditemukan.<br />Silakan bukakan file konfigurasi dengan cara mengunakan link dibawah ini. Mohon perhatikan PHP Error Message(s) yang akan ditampilkan. Seringkali sebuah tanda kutip atau titik-koma ketinggalan.<br />Jika muncul sebuah halaman kosong, artinya tidak ada masalah.';
$strConfigureTableCoord = 'Silakan konfigurasikan koordinasi bagi tabel %s';
@@ -131,6 +141,7 @@ $strConnections = 'Koneksi';
$strConstraintsForDumped = 'Ketidakleluasaan untuk tabel pelimpahan (Dumped Tables)';
$strConstraintsForTable = 'Ketidakleluasaan untuk tabel';
$strCookiesRequired = 'Mulai dari sini Cookies harus diaktifkan.';
+$strCopyDatabaseOK = 'Database %s telah disalin ke %s';
$strCopyTable = 'Salin tabel ke (database<b>.</b>nama tabel):';
$strCopyTableOK = 'Tabel %s telah disalin ke %s.';
$strCopyTableSameNames = 'Penyalinan tabel pada diri-sendiri tidak bisa dilakukan!';
@@ -150,6 +161,7 @@ $strCzech = 'Bahasa Ceko';
$strCzechSlovak = 'Cecko-Slovakia';
$strDBComment = 'Komentar Database: ';
+$strDBCopy = 'Salin database ke';
$strDBGContext = 'Susunan';
$strDBGContextID = 'Susunan ID';
$strDBGHits = 'Hits';
@@ -181,28 +193,28 @@ $strDefault = 'Default';
$strDefaultValueHelp = 'Untuk nilai (value) default cukup diisi single value saja tanpa menggunakan backslash, escaping atau quotes dan dengan menggunakan format sbb.: a';
$strDefragment = 'Defragmentasikan tabel';
$strDelOld = 'Halaman ini berisi referensi tentang tabel yang sudah tidak ada. Apakah Anda ingin hapus referensi yang bersangkutan?';
-$strDelayedInserts = 'Gunakan Delayed Inserts';
+$strDelayedInserts = 'Gunakan perintah INSERT memperlambat';
$strDelete = 'Hapus';
-$strDeleteAndFlush = 'Hapus pemakai dan Reload hak-hak (Privileges).';
+$strDeleteAndFlush = 'Hapus pengguna, lantas Reload hak-hak (Privileges).';
$strDeleteAndFlushDescr = 'Ini cara yang terbaik tetapi akan memakan waktu cukup lama.';
$strDeleted = 'Baris telah dihapus';
$strDeletedRows = 'Baris yang dihapus:';
$strDeleting = 'Menghapus %s';
-$strDescending = 'Menurun';
+$strDescending = 'Urutan menurun';
$strDescription = 'Deskripsi';
$strDictionary = 'kamus';
-$strDisableForeignChecks = 'Matikan pengechekan kunci asing';
+$strDisableForeignChecks = 'Tanpa pemeriksaan kunci asing';
$strDisabled = 'Tidak aktif';
$strDisplayFeat = 'Tampilkan ciri-ciri';
-$strDisplayOrder = 'Urutan tampilan berdasarkan:';
+$strDisplayOrder = 'Urut tampilan berdasarkan:';
$strDisplayPDF = 'Tampilkan skema PDF';
-$strDoAQuery = 'Cari berdasarkan data contoh ("query by example") (wildcard: "%")';
+$strDoAQuery = 'cari berdasarkan data contoh ("query by example") (wildcard: "%")';
$strDoYouReally = 'Apakah anda ingin ';
$strDocu = 'Dokumentasi';
-$strDrop = 'Hapus Field ini';
-$strDropDatabaseStrongWarning = 'Anda akan MENGHAPUSKAN SELURUH database!';
+$strDrop = 'Hapus';
+$strDropDatabaseStrongWarning = 'Anda akan MENGHAPUS SELURUH database!';
$strDropSelectedDatabases = 'Hapus database pilihan';
-$strDropUsersDb = 'Hapus database yang memiliki nama yang sama dengan pemakainya.';
+$strDropUsersDb = 'Hapus database yang memiliki nama yang sama dengan pengguna.';
$strDumpSaved = 'Dump (Skema) disimpan pada file %s.';
$strDumpXRows = 'Dump %s baris bermula pada baris %s.';
$strDumpingData = 'Dumping data untuk tabel';
@@ -212,7 +224,7 @@ $strEdit = 'Ubah';
$strEditPDFPages = 'Ubah halaman PDF';
$strEditPrivileges = 'Ubah hak akses (privilege)';
$strEffective = 'Efektif';
-$strEmpty = 'Hapus semua Record';
+$strEmpty = 'Mengosongkan';
$strEmptyResultSet = 'MySQL balikkan hasil kosong (a.k. baris yang kosong).';
$strEnabled = 'Aktif';
$strEncloseInTransaction = 'Menyertakan ekspor dalam transaksi';
@@ -220,18 +232,19 @@ $strEnd = 'Terakhir';
$strEndCut = 'Akhiri potong (CUT)';
$strEndRaw = 'AKHIRI mentah (RAW)';
$strEnglish = 'Bahasa Ingris';
-$strEnglishPrivileges = ' Catatan: Nama privilege MySQL adalah dalam bahasa Ingris ';
+$strEnglishPrivileges = ' Catatan: Nama privilege MySQL dalam bahasa Ingris ';
$strError = 'Error';
+$strEscapeWildcards = 'Wildcard _ dan % sebaiknya diakhiri dengan tanda \ untuk mengunakannya secara harfiah';
$strEstonian = 'Bahasa Estonia';
$strExcelEdition = 'Edisi Excel';
$strExcelOptions = 'Pilihan Excel';
$strExecuteBookmarked = 'Eksekusikan pencarian dengan mengikuti penunjuk halaman';
$strExplain = 'Terangkan SQL';
$strExport = 'Ekspor';
-$strExtendedInserts = 'Penyisipan diperluas';
+$strExtendedInserts = 'INSERT memperluas';
$strExtra = 'Ekstra';
-$strFailedAttempts = 'Percobaan yang telah gagal';
+$strFailedAttempts = 'Gagal';
$strField = 'Field';
$strFieldHasBeenDropped = 'Field %s telah dihapus';
$strFields = 'Field';
@@ -241,11 +254,11 @@ $strFieldsEscapedBy = 'Field dikembalikan oleh';
$strFieldsTerminatedBy = 'Fields diputus oleh';
$strFileAlreadyExists = 'File %s sudah ada pada server. Gantikan nama file atau periksa pilihan Overwrite.';
$strFileCouldNotBeRead = 'Gagal membaca File';
-$strFileNameTemplate = 'Template nama file';
+$strFileNameTemplate = 'Konvensi nama file';
$strFileNameTemplateHelp = 'Gunakan__DB__sebagai nama Database,__TABLE__sebagai nama tabel dan %sany strftime%s sebagai spesifikasi waktu. Ekstensi akan ditambahkan secara otomatis. Teks lainnya akan dipertahankan.';
-$strFileNameTemplateRemember = 'ingat template';
+$strFileNameTemplateRemember = 'ingat konvensi';
$strFixed = 'telah diperbaiki';
-$strFlushPrivilegesNote = 'Perhatian: phpMyAdmin mengambil data tentang hak-hak dari pemakai secara langsung dari tabel Hak Istimewa (Privileges) MySQL. Isi dari tabel tersebut bisa berbeda dari Hak Istimewa (Privileges) yang digunakan oleh Server bila pernah diubah. Bila begitu disarankan untuk %sReload Hak Istimewa (Privileges)%s sebelum melanjut.';
+$strFlushPrivilegesNote = 'Perhatian: phpMyAdmin membaca data tentang pengguna secara langsung dari tabel profil pengguna MySQL. Isi dari tabel bisa saja berbeda dengan profil pengguna yang digunakan oleh Server pada saat ini bila tabel tsb. pernah diubah secara manual. Disarankan untuk %sme-reload profil pengguna%s sebelum melanjut.';
$strFlushTable = 'Tutup tabel ("FLUSH")';
$strFormEmpty = 'Data dalam form kurang !';
$strFormat = 'Format';
@@ -261,15 +274,15 @@ $strGlobal = 'global';
$strGlobalPrivileges = 'Hak Istimewa (Privileges) Global';
$strGlobalValue = 'Nilai Global';
$strGo = 'Go';
-$strGrantOption = 'Mengizinkan';
+$strGrantOption = 'Izin';
$strGreek = 'Bahasa Yunani';
-$strGzip = '"Dikompress dengan GZip"';
+$strGzip = 'Dikompress dengan GZip';
$strHasBeenAltered = 'telah diubah.';
$strHasBeenCreated = 'telah diciptakan.';
$strHaveToShow = 'Sekurang-kurangnya satu kolom harus dipilih untuk ditampilkan';
$strHebrew = 'Bahasa Yahudi';
-$strHexForBinary = 'Gunakan hexadesimal untuk file binari';
+$strHexForBinary = 'Gunakan cara hexadesimal untuk field binari';
$strHome = 'Home';
$strHomepageOfficial = 'Homepage resmi phpMyAdmin';
$strHost = 'Host';
@@ -281,7 +294,7 @@ $strId = 'ID';
$strIdxFulltext = 'Teks penuh';
$strIfYouWish = 'Jika Anda hanya ingin memuat beberapa kolom saja dari tabel, silakan gunakan tanda koma sebagai pemisah.';
$strIgnore = 'Abaikan';
-$strIgnoreInserts = 'Gunakan Ignore Inserts';
+$strIgnoreInserts = 'Gunakan perintah INSERT dengan mengabaikan kesalahan';
$strIgnoringFile = 'Abaikan file %s';
$strImportDocSQL = 'Impor file docSQL';
$strImportFiles = 'Impor file';
@@ -291,11 +304,16 @@ $strIndex = 'Indeks';
$strIndexHasBeenDropped = 'Indeks %s telah dihapus';
$strIndexName = 'Nama indeks&nbsp;:';
$strIndexType = 'Tipe indeks&nbsp;:';
+$strIndexWarningMultiple = 'Lebih dari satu kunci %s untuk kolom `%s` telah dibuat ';
+$strIndexWarningPrimary = 'Kunci PRIMARY dan INDEKS sebaiknya jangan di-set secara bersamaan untuk kolom `%s`';
+$strIndexWarningTable = 'Ditemukan masalah dengan indeks dalam tabel `%s`';
+$strIndexWarningUnique = 'Kunci UNIK and INDEKS sebaiknya jangan di-set secara bersamaan untuk kolom `%s`';
$strIndexes = 'Indeks';
$strInnodbStat = 'Status dari InnoDB';
-$strInsecureMySQL = 'File konfigurasi Anda ditentukan dengan pemakai Root dan tanpa adanya Kata Sandi (sama dengan Default MySQL Privileged Account). Jika MySQL-Server dijalankan dengan sedemikian, server Anda terbuka lebar untuk suatu penyerangan. Disarankan untuk memperbaiki kelemahan keamanan (security hole) ini.';
+$strInsecureMySQL = 'File konfigurasi Anda ditentukan dengan pengguna Root dan tanpa adanya Kata Sandi (sama dengan Default MySQL Privileged Account). Jika MySQL-Server dijalankan dengan sedemikian, server Anda terbuka lebar untuk suatu penyerangan. Disarankan untuk memperbaiki kelemahan keamanan (security hole) ini.';
$strInsert = 'Sisipkan';
$strInsertAsNewRow = 'Sisipkan sebagai baris baru';
+$strInsertBookmarkTitle = 'Silakan masukkan judul untuk simpanan';
$strInsertNewRow = 'Sisipkan baris baru';
$strInsertTextfiles = 'Sisipkan data baru dari textfile pada tabel';
$strInsertedRowId = 'Menyisip baris id:';
@@ -306,11 +324,11 @@ $strInternalRelations = 'Relasi internal';
$strJapanese = 'Bahasa Jepang';
$strJumpToDB = 'Lompat langsung ke database &quot;%s&quot;.';
-$strJustDelete = 'Tinggal hapuskan pemakai dari tabel Hak Istimewa (Privileges).';
-$strJustDeleteDescr = 'Pemakai yang &quot;dihapus&quot; tetap berhak untuk mengakses Server seperti biasa sampai Hak Istimewa (Privileges) di-reload.';
+$strJustDelete = 'Hapus pengguna dari dari tabel daftar pengguna.';
+$strJustDeleteDescr = 'Pengguna yang &quot;dihapus&quot; tetap berhak untuk mengakses Server seperti biasa sampai Hak Istimewa (Privileges) di-reload.';
$strKeepPass = 'Jangan ubah Kata Sandi';
-$strKeyname = 'Nama kunci (Keyname)';
+$strKeyname = 'Nama Kunci';
$strKill = 'Tutup';
$strKorean = 'Bahasa Korea';
@@ -335,7 +353,7 @@ $strLithuanian = 'Bahasa Lithuania';
$strLoadExplanation = 'Cara yang terbaik sudah aktif secara Default tetapi bisa dirubah bila gagal.';
$strLoadMethod = 'Caranya LOAD';
$strLocalhost = 'Lokal';
-$strLocationTextfile = 'Lokasi dari textfile';
+$strLocationTextfile = 'dari File';
$strLogPassword = 'Kata Sandi:';
$strLogServer = 'Server';
$strLogUsername = 'Nama Pengguna:';
@@ -344,7 +362,7 @@ $strLoginInformation = 'Informasi Login';
$strLogout = 'Logout';
$strMIMETypesForTable = 'TIPE MIME UNTUK TABEL';
-$strMIME_MIMEtype = 'tipe MIME';
+$strMIME_MIMEtype = 'Tipe MIME';
$strMIME_available_mime = 'Tipe MIME yang tersedia';
$strMIME_available_transform = 'Transformasi yang tersedia';
$strMIME_description = 'Deskripsi';
@@ -365,18 +383,19 @@ $strMoveTableSameNames = 'Memindahkan tabel ke diri-sendiri tidak bisa dilakukan
$strMultilingual = 'berbagai bahasa';
$strMustSelectFile = 'Anda perlu pilih file untuk disisipkan terlebih dahulu.';
$strMySQLCharset = 'Charset MySQL';
-$strMySQLConnectionCollation = 'Pembandingan koneksi MySQL';
+$strMySQLConnectionCollation = 'Penyortiran koneksi MySQL';
$strMySQLReloaded = 'MySQL telah di-reload.';
$strMySQLSaid = 'MySQL menyatakan: ';
$strMySQLServerProcess = 'MySQL versi %pma_s1% dijalankan pada %pma_s2% sebagai %pma_s3%';
$strMySQLShowProcess = 'Tampilkan Proses';
-$strMySQLShowStatus = 'Tampilkan informasi runtime dari MySQL';
+$strMySQLShowStatus = 'Tampilkan informasi runtime MySQL';
$strMySQLShowVars = 'Tampilkan variabel sistem MySQL';
$strName = 'Nama';
$strNeedPrimaryKey = 'Disarankan untuk menetapkan Primary Key pada tabel ini.';
$strNext = 'Berikutnya';
$strNo = 'Tidak';
+$strNoActivity = 'Tidak ada aktifitas selama %s detik atau lebih. Silakan login kembali';
$strNoDatabases = 'Database tidak ditemukan';
$strNoDatabasesSelected = 'Database belum dipilih.';
$strNoDescription = 'tanpa keterangan';
@@ -396,6 +415,7 @@ $strNoRights = 'Hak Akses Anda untuk melanjut tidak cukup!';
$strNoRowsSelected = 'Tidak ada baris yang dipilih';
$strNoSpace = 'Tidak cukup ruang untuk menyimpan %s.';
$strNoTablesFound = 'Tidak ada tabel dalam database.';
+$strNoThemeSupport = 'Tidak ada dukungan untuk desain penampilan. Mohon periksa kembali konfigurasi dan/atau desain penampilan dalam direktori %s.';
$strNoUsersFound = 'Pengguna tidak ditemukan.';
$strNoValidateSQL = 'Melewati pengesahan (validation) SQL';
$strNone = 'tanpa';
@@ -404,7 +424,7 @@ $strNotOK = 'tidak oke';
$strNotSet = '<b>%s</b> tabel tidak ditemukan atau tidak diset di %s';
$strNotValidNumber = ' bukan nomor baris yang berlaku!';
$strNull = 'Kosong';
-$strNumSearchResultsInTable = '%s Rekord dalam tabel <i>%s</i>';
+$strNumSearchResultsInTable = '%s catatan dalam tabel <i>%s</i>';
$strNumSearchResultsTotal = '<b>Jumlah:</b> <i>%s</i> rekord';
$strNumTables = 'Tabel';
@@ -427,6 +447,7 @@ $strPartialText = 'Teks yang disingkat';
$strPassword = 'Kata Sandi';
$strPasswordChanged = 'Sukses mengubah Kata Sandi untuk %s .';
$strPasswordEmpty = 'Kata Sandi kosong!';
+$strPasswordHashing = 'Pengernaian Kata Sandi (Password Hashing)';
$strPasswordNotSame = 'Kata Sandi tidak sama!';
$strPdfDbSchema = 'Skema dari database "%s" - Halaman %s';
$strPdfInvalidTblName = 'Tabel "%s" tidak ditemukan!';
@@ -443,7 +464,7 @@ $strPolish = 'Polandia';
$strPortrait = 'Gambaran';
$strPos1 = 'Awal';
$strPrevious = 'Sebelumnya';
-$strPrimary = 'PRIMARY';
+$strPrimary = 'Kunci Utama';
$strPrimaryKeyHasBeenDropped = 'Kunci utama telah dihapus';
$strPrimaryKeyName = 'Nama Kunci utama diwajibkan... PRIMARY!';
$strPrimaryKeyWarning = '(Tanda nama "PRIMARY" <b>wajib</b> sebagai satu-satunya nama dan <b>hanya</b> sebagai Kunci utama saja!)';
@@ -460,26 +481,26 @@ $strPrivDescDropDb = 'Mengizinkan untuk hapus database dan tabel.';
$strPrivDescDropTbl = 'Mengizinkan untuk hapus tabel.';
$strPrivDescExecute = 'Mengizinkan untuk berjalan dengan prosedur yang tersimpan; tidak ada efek dalam versi MySQL ini.';
$strPrivDescFile = 'Mengizinkan untuk impor data dari file dan ekspor data kedalam file.';
-$strPrivDescGrant = 'Mengizinkan untuk menambah pemakai dan Hak Istimewa (Privileges) tanpa harus me-reload ulang tabel Hak Istimewa.';
+$strPrivDescGrant = 'Mengizinkan untuk menambah pengguna dan Hak Istimewa (Privileges) tanpa harus me-reload ulang tabel Hak Istimewa.';
$strPrivDescIndex = 'Mengizinkan untuk menciptakan dan hapus Indeks.';
$strPrivDescInsert = 'Mengizinkan untuk tambah dan ganti data.';
$strPrivDescLockTables = 'Mengizinkan untuk mengunci tabel dalam Thread yang lagi berjalan.';
-$strPrivDescMaxConnections = 'Membatasi jumlah koneksi baru yang diperbolehkan untuk setiap pemakai dalam batas waktu satu jam.';
-$strPrivDescMaxQuestions = 'Membatasi jumlah pencarian (Queries) yang diperbolehkan untuk setiap pemakai dalam batas waktu satu jam.';
-$strPrivDescMaxUpdates = 'Membatasi jumlah perintah untuk merubah sebuah tabel atau database untuk setiap pemakai dalam batas waktu satu jam.';
-$strPrivDescProcess3 = 'Mengizinkan untuk hentikan proses yang dimiliki pemakai lain.';
+$strPrivDescMaxConnections = 'Membatasi jumlah koneksi baru yang diperbolehkan untuk setiap pengguna dalam batas waktu satu jam.';
+$strPrivDescMaxQuestions = 'Membatasi jumlah pencarian (Queries) yang diperbolehkan untuk setiap pengguna dalam batas waktu satu jam.';
+$strPrivDescMaxUpdates = 'Membatasi jumlah perintah untuk merubah sebuah tabel atau database untuk setiap pengguna dalam batas waktu satu jam.';
+$strPrivDescProcess3 = 'Mengizinkan untuk hentikan proses yang dimiliki pengguna lain.';
$strPrivDescProcess4 = 'Mengizinkan untuk tampilkan seluruh pencarian dalam daftar proses.';
$strPrivDescReferences = 'Tidak ada efek dalam versi MySQL yang digunakan.';
$strPrivDescReload = 'Mengizinkan untuk reload stelan dari server dan untuk flush cache dari server.';
-$strPrivDescReplClient = 'Memberi hak kepada pemakai untuk menanyakan lokasi dari slaves / masters.';
+$strPrivDescReplClient = 'Memberi hak kepada pengguna untuk menanyakan lokasi dari slaves / masters.';
$strPrivDescReplSlave = 'Digunakan untuk replikasi dari slaves.';
$strPrivDescSelect = 'Mengizinkan untuk baca data.';
$strPrivDescShowDb = 'Memberi akses ke seluruh daftar database.';
$strPrivDescShutdown = 'Mengizinkan untuk shut-down server.';
-$strPrivDescSuper = 'Mengizinkan untuk tetap konek meskipun jumlah batas koneksi telah tercapai; diperlukan untuk hampir semua operasi administratif seperti stelan variabel global atau untuk mematikan sebuah Thread yang dimiliki oleh pemakai lain.';
+$strPrivDescSuper = 'Mengizinkan untuk tetap konek meskipun jumlah batas koneksi telah tercapai; diperlukan untuk hampir semua operasi administratif seperti stelan variabel global atau untuk mematikan sebuah Thread yang dimiliki oleh pengguna lain.';
$strPrivDescUpdate = 'Mengizinkan untuk ubah data.';
$strPrivDescUsage = 'Tanpa Hak Istimewa (Privileges).';
-$strPrivileges = 'Hak Akses (Privilege)';
+$strPrivileges = 'Hak Akses';
$strPrivilegesReloaded = 'Sukses reload Hak Istimewa (Privileges).';
$strProcesslist = 'Daftar proses';
$strPutColNames = 'Letakkan nama Fields pada baris pertama';
@@ -491,24 +512,24 @@ $strQueryFrame = 'Jendela Pencarian';
$strQueryOnDb = 'Pencarian SQL dalam database <b>%s</b>:';
$strQuerySQLHistory = 'Sejarah SQL';
$strQueryStatistics = '<b>Informasi statistik</b>: Sejak dihidupkan, %s pencarian telah dikirim kepada server.';
-$strQueryTime = 'Pencarian membutuhkan %01.4f detik';
+$strQueryTime = 'pencarian membutuhkan waktu %01.4f detik';
$strQueryType = 'Tipe Pencarian';
$strQueryWindowLock = 'Jangan timpahkan pencarian ini dari jendela luar';
$strReType = 'Ketik ulang';
-$strReceived = 'Diterima';
-$strRecords = 'Rekord';
+$strReceived = 'Penerimaan';
+$strRecords = 'Catatan';
$strReferentialIntegrity = 'Cek integriti referensial:';
$strRefresh = 'Menyegarkan';
$strRelationNotWorking = 'Fasilitas penambahan untuk bekerja dengan tabel yang di-link di nonaktifkan. Untuk mengetahui sebabnya silakan klik %sdisini%s.';
$strRelationView = 'Tampilan relasi';
$strRelationalSchema = 'Skema Relational';
-$strRelations = 'Relasi';
+$strRelations = 'Tabel Relasi';
$strRelationsForTable = 'RELASI UNTUK TABEL';
-$strReloadFailed = 'Gagal me-reload MySQL.';
-$strReloadMySQL = 'Reload MySQL';
+$strReloadFailed = 'Gagal memanggil ulang tabel pengguna.';
+$strReloadMySQL = 'Panggil ulang tabel pengguna';
$strReloadingThePrivileges = 'Reload Hak Istimewa (Privileges)';
-$strRemoveSelectedUsers = 'Hapus pemakai pilihan';
+$strRemoveSelectedUsers = 'Hapus pengguna yang dipilih';
$strRenameDatabaseOK = 'Nama database %s telah diubah menjadi %s';
$strRenameTable = 'Ubah nama tabel menjadi ';
$strRenameTableOK = 'Nama tabel %s telah diubah menjadi %s';
@@ -519,12 +540,12 @@ $strReplaceTable = 'Ganti data tabel dengan file';
$strReset = 'Reset';
$strResourceLimits = 'Batas dari sumber';
$strRevoke = 'Cabut';
-$strRevokeAndDelete = 'Hapus pemakai setelah cabut seluruh Hak Istimewa (Privileges) yang aktif dari pemakai yang bersangkutan.';
-$strRevokeAndDeleteDescr = 'Pemakai yang bersangkutan tetap memiliki hak untuk USAGE sampai seluruh Hak Istimewa (Privileges) di-reload kembali.';
+$strRevokeAndDelete = 'Cabut seluruh Hak Istimewa (Privileges) dari pengguna, lantas hapus pengguna tsb. dari daftar tabel pengguna.';
+$strRevokeAndDeleteDescr = 'Pengguna yang bersangkutan tetap memiliki hak untuk USAGE sampai seluruh Hak Istimewa (Privileges) di-reload kembali.';
$strRevokeMessage = 'Hak akses untuk %s telah dicabut';
$strRomanian = 'Romania';
-$strRowLength = 'Ukuran panjang baris';
-$strRowSize = ' Ukuran baris ';
+$strRowLength = 'Panjangnya baris';
+$strRowSize = ' Besarnya baris ';
$strRows = 'Baris';
$strRowsFrom = 'baris dimulai dari rekord #';
$strRowsModeFlippedHorizontal = 'horisontal (rotated headers)';
@@ -533,7 +554,7 @@ $strRowsModeOptions = 'diatur dengan urutan %s dan mengulang header setelah %s s
$strRowsModeVertical = 'vertikal';
$strRowsStatistic = 'Statistik Baris';
$strRunQuery = 'Jalankan pencarian SQL';
-$strRunSQLQuery = 'Jalankan pencarian SQL pada database %s';
+$strRunSQLQuery = 'Melaksanakan perintah SQL pada database %s';
$strRunning = 'dijalankan pada %s';
$strRussian = 'Bahasa Rusia';
@@ -563,20 +584,21 @@ $strSearchType = 'Cari:';
$strSecretRequired = 'File konfigurasi membutuhkan susunan kata-kata rahasia (blowfish_secret).';
$strSelectADb = 'Silakan pilih database';
$strSelectAll = 'Pilih semua';
-$strSelectFields = 'Pilih fields (minimal satu):';
+$strSelectBinaryLog = 'Pilih Log binari untuk ditinjau';
+$strSelectFields = 'Pilihan field (min. satu):';
$strSelectNumRows = 'dalam susunan pemeriksaan';
$strSelectTables = 'Pilih tabel';
$strSend = 'Kirimkan ke';
-$strSent = 'Dikirim';
+$strSent = 'Pengiriman';
$strServer = 'Server';
$strServerChoice = 'Pilihan Server';
$strServerNotResponding = 'Server tidak menjawab';
$strServerStatus = 'Informasi Runtime';
-$strServerStatusUptime = 'MySQL server ini telah berjalan secara berturut-turut selama %s. Server dijalankan pada %s.';
-$strServerTabProcesslist = 'Proses-Proses';
+$strServerStatusUptime = 'MySQL server ini telah berjalan secara berturut-turut selama %s. Server dijalankan pada tanggal %s.';
+$strServerTabProcesslist = 'Proses Aktif';
$strServerTabVariables = 'Variabel';
$strServerTrafficNotes = '<b>Server traffic</b>: Tabel ini menampilkan statistik jaringan lalu-lintas server MySQL sejak dihidupkan.';
-$strServerVars = 'Variabel dan stelan dari server';
+$strServerVars = 'Variabel dan penyetelan server';
$strServerVersion = 'Versi Server';
$strSessionValue = 'Nilai dari Session';
$strSetEnumVal = 'Jika tipe field sama dengan "enum" atau "set", silakan masukkan nilai dengan format: \'a\',\'b\',\'c\'...<br />Jika sebuah backslash ("\") atau suatu tanda kutip ("\'") diperlukan, tanda tersebut perlu ditutupi dengan tanda backslash (seb. contoh \'\\\\xyz\' atau \'a\\\'b\').';
@@ -586,10 +608,10 @@ $strShowColor = 'Tampilkan warna';
$strShowDatadictAs = 'Format dari kamus data';
$strShowFullQueries = 'Tampilkan pencarian yang lengkap';
$strShowGrid = 'Tampilkan garis';
-$strShowPHPInfo = 'Tampilkan informasi tentang PHP';
+$strShowPHPInfo = 'Tampilkan informasi PHP';
$strShowTableDimension = 'Tampilkan ukuran dari tabel';
$strShowTables = 'Tampilkan tabel';
-$strShowThisQuery = ' Tampilkan ulang pencarian SQL ';
+$strShowThisQuery = ' Tampilkan ulang perintah SQL ';
$strShowingRecords = 'Tampilan baris';
$strSimplifiedChinese = 'Bahasa Cina sederhana';
$strSingly = '(unik)';
@@ -604,20 +626,21 @@ $strSplitWordsWithSpace = 'Kata dipisahkan oleh karakter spasi (" ").';
$strStatCheckTime = 'Pemeriksaan terakhir';
$strStatCreateTime = 'Pembuatan';
$strStatUpdateTime = 'Update terakhir';
-$strStatement = 'Pernyataan';
+$strStatement = 'Keterangan';
$strStatus = 'Status';
$strStrucCSV = 'Data CSV';
$strStrucData = 'Struktur dan data';
-$strStrucDrop = 'Menambahkan \'Hapus tabel\'';
+$strStrucDrop = 'Berikut \'HAPUS TABEL\'';
$strStrucExcelCSV = 'CSV untuk data MS Excel';
$strStrucNativeExcel = 'Data asli MS Excel';
$strStrucOnly = 'Struktur saja';
-$strStructPropose = 'Ajukan struktur tabel';
+$strStructPropose = 'Menganalisa struktur tabel';
$strStructure = 'Struktur';
$strSubmit = 'Kirim';
$strSuccess = 'Sukses menjalankan perintah SQL';
$strSum = 'Jumlah';
$strSwedish = 'Bahasa Swedia';
+$strSwitchToDatabase = 'Pindah ke database yang disalin';
$strSwitchToTable = 'Pindah ke tabel salinan';
$strTable = 'Tabel';
@@ -639,11 +662,11 @@ $strThai = 'Bahasa Thailand';
$strTheContent = 'Isi file telah disisipkan.';
$strTheContents = 'Isi file telah diganti dengan isi tabel yang dipilih dengan kunci utama atau kunci unik.';
$strTheTerminator = 'Pemisah field.';
-$strTheme = 'Tema / Gaya';
+$strTheme = 'Desain Penampilan';
$strThisHost = 'Host yang ini';
$strThisNotDirectory = 'Ini bukan direktori';
$strThreadSuccessfullyKilled = 'Sukses hentikan Thread %s.';
-$strTime = 'Waktu';
+$strTime = 'Jangka Waktu';
$strToggleScratchboard = 'pindah buku catatan (Scratchboard)';
$strTotal = 'jumlah';
$strTotalUC = 'Jumlah';
@@ -666,30 +689,31 @@ $strTurkish = 'Bahasa Turki';
$strType = 'Jenis';
$strUkrainian = 'Bahasa Ukrainia';
-$strUncheckAll = 'Uncheck semua';
+$strUncheckAll = 'Hapus pilihan';
$strUnicode = 'Unikode';
$strUnique = 'Unik';
$strUnknown = 'tidak diketahui';
$strUnselectAll = 'Unselect semua';
$strUpdComTab = 'Mohon belajari dokumentasi untuk mengetahui cara meng-update tabel Column_comments Anda';
$strUpdatePrivMessage = 'Hak Akses (privilege) untuk %s telah di-update.';
-$strUpdateProfileMessage = 'Profil pemakai telah di-update.';
+$strUpdateProfileMessage = 'Profil pengguna telah di-update.';
$strUpdateQuery = 'Update proses pencarian';
$strUpgrade = 'Disarankan untuk meng-update ke %s versi %s atau lebih baru.';
$strUsage = 'Penggunaan';
-$strUseBackquotes = 'Gunakan backquotes dengan nama tabel dan nama field';
+$strUseBackquotes = 'Nama tabel dan nama field dalam tanda kutip biasa';
$strUseHostTable = 'Gunakan Host Table';
+$strUseTabKey = 'Gunakan tombol TAB untuk maju dari angka ke angka atau gunakan CTRL+panah untuk maju kemana saja';
$strUseTables = 'Gunakan tabel';
$strUseTextField = 'Gunakan text field';
$strUseThisValue = 'gunakan nilai ini';
-$strUser = 'Pemakai';
-$strUserAlreadyExists = 'Pemakai %s telah terdaftar!';
-$strUserEmpty = 'Nama pemakai masih kosong!';
-$strUserName = 'Nama pemakai';
-$strUserNotFound = 'Pemakai yang dipilih tidak ditemukan pada tabel hak (privilege table).';
-$strUserOverview = 'Pandangan Umum Pemakai';
-$strUsersDeleted = 'Sukses menghapus Pemakai yang dipilih.';
-$strUsersHavingAccessToDb = 'Pemakai memiliki akses ke &quot;%s&quot;';
+$strUser = 'Pengguna';
+$strUserAlreadyExists = 'Pengguna %s telah terdaftar!';
+$strUserEmpty = 'Nama pengguna masih kosong!';
+$strUserName = 'Nama pengguna';
+$strUserNotFound = 'Pengguna yang dipilih tidak ditemukan pada tabel hak (privilege table).';
+$strUserOverview = 'Pandangan Umum Pengguna';
+$strUsersDeleted = 'Sukses menghapus Pengguna yang dipilih.';
+$strUsersHavingAccessToDb = 'Pengguna memiliki akses ke &quot;%s&quot;';
$strValidateSQL = 'Mengesahkan (validate) SQL';
$strValidatorError = 'Pengesahan SQL tidak dapat disahkan. Mohon periksa kembali ekstension PHP yang diperlukan seperti yang tercatat dalam %sdokumentasi%s.';
@@ -705,38 +729,20 @@ $strWelcome = 'Selamat Datang di %s';
$strWestEuropean = 'Eropa Barat';
$strWildcard = 'wildcard';
$strWindowNotFound = 'Mengupdate jendela browser gagal. Ada kemungkinan Anda telah menutup jendela induknya atau pilihan keamanan pada browser Anda melarang untuk mengupdate dengan cara Cross-Window';
-$strWithChecked = 'Dengan pilihan:';
+$strWithChecked = 'yang ditandai:';
$strWritingCommentNotPossible = 'Penulisan komentar tidak dapat dilaksanakan';
$strWritingRelationNotPossible = 'Penulisan relasi tidak dapat dilaksanakan';
-$strWrongUser = 'Nama Pemakai/Kata Sandi salah. Akses ditolak.';
+$strWrongUser = 'Nama Pengguna/Kata Sandi salah. Akses ditolak.';
$strXML = 'XML';
$strYes = 'Ya';
$strZeroRemovesTheLimit = 'Perhatian: Perubahan pilihan ini ke posisi 0 (zero) akan menghapus batas yang telah ditentukan.';
-$strZip = '"Dikompress dengan Zip"';
+$strZip = 'Dikompress dengan Zip';
-$strAddFields = 'Add %s field(s)'; //to translate
-$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
-$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/italian-iso-8859-1.inc.php b/lang/italian-iso-8859-1.inc.php
index 684ca5087c..220796ee91 100644
--- a/lang/italian-iso-8859-1.inc.php
+++ b/lang/italian-iso-8859-1.inc.php
@@ -743,4 +743,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php
index 2e8ae64154..19951966fc 100644
--- a/lang/italian-utf-8.inc.php
+++ b/lang/italian-utf-8.inc.php
@@ -744,4 +744,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/japanese-euc.inc.php b/lang/japanese-euc.inc.php
index 24189484c9..699cca6ac2 100644
--- a/lang/japanese-euc.inc.php
+++ b/lang/japanese-euc.inc.php
@@ -30,9 +30,10 @@ $strAccessDeniedExplanation = 'phpMyAdmin ¤Ï¡¢MySQL ¥µ¡¼¥Ð¡¼¤ËÀܳ¤·¤è¤¦¤È¤·¤Þ¤·
$strAction = '¼Â¹Ô';
$strAddAutoIncrement = '¡ÖAUTO_INCREMENT¡×ÃͤòÄɲÃ';
$strAddConstraints = 'À©¸ÂÄɲÃ';
-$strAddDeleteColumn = '¥Õ¥£¡¼¥ë¥ÉÎó¤Î¡ÖÄɲῺï½ü¡×';
-$strAddDeleteRow = '¾ò·ï¹Ô¤Î¡ÖÄɲῺï½ü¡×';
+$strAddDeleteColumn = '¥Õ¥£¡¼¥ë¥ÉÎó¤Î¡ÖÄɲÃ/ºï½ü¡×';
+$strAddDeleteRow = '¾ò·ï¹Ô¤Î¡ÖÄɲÃ/ºï½ü¡×';
$strAddDropDatabase = '¡ÖDROP DATABASE¡×¤òÄɲÃ';
+$strAddFields = '%s ¸Ä¤Î¥Õ¥£¡¼¥ë¥É¤òÄɲÃ';
$strAddHeaderComment = '¥Ø¥Ã¥À¡¼¤Ø¥«¥¹¥¿¥à¥³¥á¥ó¥È¤òÄɲà (\\n ¤Ç²þ¹Ô)';
$strAddIfNotExists = '¡ÖIF NOT EXISTS¡×¤òÄɲÃ';
$strAddIntoComments = '¥³¥á¥ó¥ÈÄɲÃ';
@@ -73,8 +74,14 @@ $strBack = 'Ìá¤ë';
$strBaltic = '¥Ð¥ë¥È½ô¸ì';
$strBeginCut = 'ÀÚ¤ê¼è¤ê³«»Ï';
$strBeginRaw = 'RAW ³«»Ï';
+$strBinLogEventType = '¥¤¥Ù¥ó¥È¥¿¥¤¥×';
+$strBinLogInfo = '¾ðÊó';
+$strBinLogName = '¥í¥°Ì¾';
+$strBinLogPosition = '°ÌÃÖ';
+$strBinLogServerId = '¥µ¡¼¥Ð¡¼ ID';
$strBinary = ' ¥Ð¥¤¥Ê¥ê ';
$strBinaryDoNotEdit = ' ¥Ð¥¤¥Ê¥ê - ½¤Àµ½ÐÍè¤Þ¤»¤ó';
+$strBinaryLog = '¥Ð¥¤¥Ê¥ê¥í¥°';
$strBookmarkAllUsers = '¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¡¼¤¬¤³¤Î¥Ö¥Ã¥¯¥Þ¡¼¥¯¤ò¥¢¥¯¥»¥¹½ÐÍè¤ë';
$strBookmarkDeleted = '¥Ö¥Ã¥¯¥Þ¡¼¥¯¤òÀµ¾ï¤Ëºï½ü¤·¤Þ¤·¤¿¡£';
$strBookmarkLabel = '¥é¥Ù¥ë';
@@ -97,6 +104,8 @@ $strCantRenameIdxToPrimary = '¥¤¥ó¥Ç¥Ã¥¯¥¹¤Î̾Á°¤ò PRIMARY ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó¡£';
$strCantUseRecodeIconv = 'iconv¡¢libiconv¡¢recode_string ¤Î¤É¤Î´Ø¿ô¤â»ÈÍѽÐÍè¤Þ¤»¤ó¡£php ¤ÎÀßÄê¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£';
$strCardinality = '¥«¡¼¥Ç¥£¥Ê¥ê¥Æ¥£';
$strCarriage = '¥­¥ã¥ê¥Ã¥¸¥ê¥¿¡¼¥ó: \\r';
+$strCaseInsensitive = '±Ñ»ú¤ÎÂç¾®¤ò¶èÊ̤·¤Ê¤¤';
+$strCaseSensitive = '±Ñ»ú¤ÎÂç¾®¤ò¶èÊ̤¹¤ë';
$strCentralEuropean = 'Ãæ±û¥è¡¼¥í¥Ã¥Ñ¿Í';
$strChange = 'Êѹ¹';
$strChangeCopyMode = 'Ʊ¤¸Æø¢¤ò»ý¤Ã¤¿¿·µ¬¤Î¥æ¡¼¥¶¡¼¤òºî¤ë...';
@@ -140,7 +149,7 @@ $strCreate = 'ºîÀ®';
$strCreateIndex = '&nbsp;%s&nbsp; ¤ÎÎó¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¤ÎºîÀ®';
$strCreateIndexTopic = '¿·¤·¤¤¥¤¥ó¥Ç¥Ã¥¯¥¹¤ÎºîÀ®';
$strCreateNewDatabase = '¿·¤·¤¤DB¤òºîÀ®¤·¤Þ¤¹¡£';
-$strCreateNewTable = '¸½ºß¤ÎDB¤Ë¿·¤·¤¤¥Æ¡¼¥Ö¥ë¤òºîÀ®¤·¤Þ¤¹¡£ %s --> ';
+$strCreateNewTable = '¸½ºß¤ÎDB¤Ë¿·¤·¤¤¥Æ¡¼¥Ö¥ë¤òºîÀ®¤¹¤ë %s --> ';
$strCreatePage = '¿·µ¬¥Ú¡¼¥¸¤ÎºîÀ®';
$strCreatePdfFeat = 'PDF ºîÀ®µ¡Ç½';
$strCreationDates = 'ºîÀ®/¹¹¿·/¸¡ºº¤ÎÆüÉÕ¤òÄɲÃ';
@@ -195,7 +204,7 @@ $strDictionary = '¼­½ñ';
$strDisableForeignChecks = '³°Éô¥­¡¼¤Î¸¡ºº¤ò̵¸ú¤Ë';
$strDisabled = '̵¸ú';
$strDisplayFeat = '¥Æ¡¼¥Ö¥ë¾ðÊóɽ¼¨µ¡Ç½';
-$strDisplayOrder = 'ȯɽ½çÈÖ:';
+$strDisplayOrder = 'ɽ¼¨½ç½ø:';
$strDisplayPDF = 'PDF ¥¹¥­¡¼¥Þ¤Îɽ¼¨';
$strDoAQuery = '"Îã¤ÎQUERY"¤ò¼Â¹Ô (¥ï¥¤¥ë¥É¥«¡¼¥É: "%")';
$strDoYouReally = 'ËÜÅö¤Ë¼Â¹Ô¤·¤Æ¤âÎɤ¤¤Ç¤¹¤«¡© --> ';
@@ -224,7 +233,7 @@ $strEnglish = '±Ñ¸ì';
$strEnglishPrivileges = ' Ãí°Õ: MySQL¤ÎÆø¢¤Î̾Á°¤Ï±Ñ¸ì¤Çɽ¼¨¤·¤Æ¤¤¤Þ¤¹¡£';
$strError = '¥¨¥é¡¼';
$strEstonian = '¥¨¥¹¥È¥Ë¥¢¸ì';
-$strExcelEdition = 'Excel ÈÇ';
+$strExcelEdition = 'Excel ¤Î¼ïÎà';
$strExcelOptions = 'Excel ¥ª¥×¥·¥ç¥ó';
$strExecuteBookmarked = '¥Ö¥Ã¥¯¥Þ¡¼¥¯¤µ¤ì¤¿¥¯¥¨¥ê¡¼¤ò¼Â¹Ô';
$strExplain = 'Explain SQL';
@@ -297,8 +306,10 @@ $strInnodbStat = 'InnoDB ¥¹¥Æ¡¼¥¿¥¹';
$strInsecureMySQL = '¤¢¤Ê¤¿¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤ÎÀßÄ꤬ MySQL ¥Ç¥Õ¥©¥ë¥È¤ÎÆø¢¥¢¥«¥¦¥ó¥È¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹ (root ¥æ¡¼¥¶¡¼¤Ç¥Ñ¥¹¥ï¡¼¥É¤Ê¤·) ¡£ MySQL ¥µ¡¼¥Ð¡¼¤â¤³¤Î¥Ç¥Õ¥©¥ë¥ÈÀßÄê¤ÇÆ°ºî¤·¤Æ¤¤¤ë¤Î¤Ç¡¢¿¯Æþ¼Ô¤ËÂФ·¤Æ̵ËÉÈ÷¤Ç¤¹¡£¤³¤Î¥»¥­¥å¥ê¥Æ¥£¡¼¥Û¡¼¥ë¤Ïɬ¤ºÊĤ¶¤·¤Æ²¼¤µ¤¤¡£';
$strInsert = 'ÄɲÃ';
$strInsertAsNewRow = '¿·¤·¤¤¹Ô¤È¤·¤Æ¤ÎÄɲÃ';
+$strInsertBookmarkTitle = '¥Ö¥Ã¥¯¥Þ¡¼¥¯¤Î¥¿¥¤¥È¥ë¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£';
$strInsertNewRow = '¿·¤·¤¤¹Ô¤ÎÄɲÃ';
$strInsertTextfiles = '¥Æ¡¼¥Ö¥ë¤Ë¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤ÎÄɲÃ';
+$strInsertedRowId = '¥¤¥ó¥µ¡¼¥È¤·¤¿¹Ô ID:';
$strInsertedRows = 'Äɲ䵤줿¹Ô¿ô:';
$strInstructions = '¼Â»ÜÎã';
$strInternalNotNecessary = '* InnoDB ¤¬Â¸ºß¤¹¤ë¾ì¹ç¡¢ÆâÉô¥ê¥ì¡¼¥·¥ç¥ó¤ÏɬÍפǤϤ¢¤ê¤Þ¤»¤ó¡£';
@@ -350,7 +361,7 @@ $strMaximumSize = 'ºÇÂ祵¥¤¥º: %s%s';
$strModifications = '¤òÀµ¤·¤¯½¤Àµ¤·¤Þ¤·¤¿¡£';
$strModify = '½¤Àµ';
$strModifyIndexTopic = '¥¤¥ó¥Ç¥Ã¥¯¥¹¤ÎÊѹ¹';
-$strMoreStatusVars = '¤µ¤é¤ËÊÑ¿ô¤Î¾õÂÖ';
+$strMoreStatusVars = '¤½¤Î¾¤ÎÊÑ¿ô¤Î¾õÂÖ';
$strMoveTable = '¥Æ¡¼¥Ö¥ë¤ò(database<b>.</b>table)¤Ë°ÜÆ°:';
$strMoveTableOK = '¥Æ¡¼¥Ö¥ë %s ¤¬ %s °ÜÆ°¤µ¤ì¤Þ¤·¤¿¡£';
$strMoveTableSameNames = 'Ʊ¤¸¥Æ¡¼¥Ö¥ë¤Ë°ÜÆ°¤Ç¤­¤Þ¤»¤ó!';
@@ -387,6 +398,7 @@ $strNoQuery = 'SQL ¥¯¥¨¥ê¡¼Ìµ¤·';
$strNoRights = '¸½ºßÆø¢¤ò»ý¤Ã¤Æ¤Ê¤¤¤Î¤Ç¤³¤³¤ËÆþ¤ì¤Þ¤»¤ó¡£';
$strNoRowsSelected = '¹Ô¤ÏÁªÂò¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£';
$strNoTablesFound = '¸½ºß¤Î DB ¤Ë¥Æ¡¼¥Ö¥ë¤Ï¤¢¤ê¤Þ¤»¤ó¡£';
+$strNoThemeSupport = '¥Æ¡¼¥Þ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¡£ÀßÄê¤È¥Æ¡¼¥Þ¥Ç¥£¥ì¥¯¥È¥ê %s ¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£';
$strNoUsersFound = '³ºÅö¥æ¡¼¥¶¡¼¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£';
$strNoValidateSQL = 'SQL ¸¡¾Ú¤ò¥¹¥­¥Ã¥×';
$strNone = '̵¤·';
@@ -424,6 +436,7 @@ $strPdfNoTables = '¥Æ¡¼¥Ö¥ë¤¬¤¢¤ê¤Þ¤»¤ó';
$strPerHour = '»þËè';
$strPerMinute = '/ʬ';
$strPerSecond = '/ÉÃ';
+$strPersian = '¥Ú¥ë¥·¥¢¸ì';
$strPhoneBook = 'ÅÅÏÃÄ¢';
$strPhp = 'PHP ¥³¡¼¥É¤ÎºîÀ®';
$strPmaDocumentation = 'phpMyAdmin ¤Î¥É¥­¥å¥á¥ó¥È';
@@ -501,6 +514,7 @@ $strRenameTable = '¥Æ¡¼¥Ö¥ë̾¤ÎÊѹ¹';
$strRenameTableOK = '%s ¤ò %s ¤Ë̾Á°¤òÊѹ¹¤·¤Þ¤·¤¿¡£';
$strRepairTable = '¥Æ¡¼¥Ö¥ë¤òÉüµì¤·¤Þ¤¹¡£';
$strReplace = 'ÃÖ¤­´¹¤¨¤ë';
+$strReplaceNULLBy = 'NULL ¤ò»ØÄê¤Îʸ»úÎó¤ÇÃÖ¤­´¹¤¨¤ë';
$strReplaceTable = '¥Õ¥¡¥¤¥ë¤Ç¥Æ¡¼¥Ö¥ë¤òÃÖ¤­´¹¤¨¤ë';
$strReset = '¥ê¥»¥Ã¥È';
$strResourceLimits = ' ¥ê¥½¡¼¥¹¤ÎÀ©¸Â';
@@ -514,7 +528,7 @@ $strRowSize = ' ¹Ô¤Î¥µ¥¤¥º ';
$strRows = '¹Ô';
$strRowsFrom = '³«»Ï¹Ô';
$strRowsModeHorizontal = '¿åÊ¿';
-$strRowsModeOptions = 'Êý¸þ: %s : %s Î󤺤ĥإåÀ¡¼¤ò·«¤êÊÖ¤·È¯É½¤¹¤ë';
+$strRowsModeOptions = 'Êý¸þ: %s : %s Î󤺤ĥإåÀ¡¼¤ò·«¤êÊÖ¤·É½¼¨¤¹¤ë';
$strRowsModeVertical = '½Åľ';
$strRowsStatistic = '¹Ô¤ÎÅý·×';
$strRunQuery = '¥¯¥¨¥ê¡¼¤Î¼Â¹Ô';
@@ -566,14 +580,14 @@ $strServerVersion = '¥µ¡¼¥Ð¡¼¤Î¥Ð¡¼¥¸¥ç¥ó';
$strSessionValue = '¥»¥Ã¥·¥ç¥óÃÍ';
$strSetEnumVal = '¥Õ¥£¡¼¥ë¥É¥¿¥¤¥×¤¬"enum"Ëô¤Ï"set"¤Î¾ì¹ç¤ÏÃͤò¤³¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¤ò»È¤Ã¤ÆÆþÎϤ·¤Æ²¼¤µ¤¤: \'a\',\'b\',\'c\'...<br />¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¡Ö"\"¡×Ëô¤Ï¥¯¥ª¡¼¥È¡Ö"\'"¡×¤òÆþÎϤ·¤¿¤¤¤È¡¢Æ¬¤Ë¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤òÉÕ¤±¤Æ²¼¤µ¤¤¡ÖÎã: \'\\\\xyz\' or \'a\\\'b\'¡×¡£';
$strShow = 'ɽ¼¨';
-$strShowAll = 'Á´¤Æȯɽ';
+$strShowAll = 'Á´¤Æɽ¼¨';
$strShowColor = '¿§É½¼¨';
$strShowDatadictAs = '¥Ç¡¼¥¿¼­½ñ¥Õ¥©¡¼¥Þ¥Ã¥È';
$strShowFullQueries = '¥Õ¥ë¥¯¥¨¥ê¡¼¤òɽ¼¨';
$strShowGrid = '¥°¥ê¥Ã¥É¤Îɽ¼¨';
$strShowPHPInfo = 'PHP ¾ðÊó';
$strShowTableDimension = '¥Æ¡¼¥Ö¥ë¤ÎÂ礭¤µ¤òɽ¼¨';
-$strShowTables = '¥Æ¡¼¥Ö¥ë¤Îȯɽ';
+$strShowTables = '¥Æ¡¼¥Ö¥ë¤Îɽ¼¨';
$strShowThisQuery = ' ¼Â¹Ô¤·¤¿¥¯¥¨¥ê¡¼¤ò¤³¤³¤Ëɽ¼¨¤¹¤ë';
$strShowingRecords = '¥ì¥³¡¼¥Éɽ¼¨';
$strSimplifiedChinese = '´ÊÂλúÃæ¹ñ¸ì';
@@ -603,6 +617,7 @@ $strSubmit = '¼Â¹Ô';
$strSuccess = 'SQL ¥¯¥¨¥ê¡¼¤¬Àµ¾ï¤Ë¼Â¹Ô¤µ¤ì¤Þ¤·¤¿¡£';
$strSum = '¹ç·×';
$strSwedish = '¥¹¥¦¥§¡¼¥Ç¥ó¸ì';
+$strSwitchToDatabase = '¥³¥Ô¡¼¤·¤¿¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÀÚ¤êÂؤ¨';
$strSwitchToTable = '¥³¥Ô¡¼¤·¤¿¥Æ¡¼¥Ö¥ë¤ËÀÚ¤êÂؤ¨';
$strTable = '¥Æ¡¼¥Ö¥ë ';
@@ -643,9 +658,9 @@ $strUnicode = '¥æ¥Ë¥³¡¼¥É';
$strUnique = 'Í£°ì';
$strUnknown = 'ÉÔÌÀ';
$strUnselectAll = 'Á´²òÊü';
-$strUpdatePrivMessage = '%s ¤ÎÆø¢¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Þ¤·¤¿¡£';
-$strUpdateProfileMessage = '¥×¥í¥Õ¥¡¥¤¥ë¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Þ¤·¤¿¡£';
-$strUpdateQuery = '¥¯¥¨¥ê¡¼¤Î¥¢¥Ã¥×¥Ç¡¼¥È';
+$strUpdatePrivMessage = '%s ¤ÎÆø¢¤ò¹¹¿·¤·¤Þ¤·¤¿¡£';
+$strUpdateProfileMessage = '¥×¥í¥Õ¥¡¥¤¥ë¤ò¹¹¿·¤·¤Þ¤·¤¿¡£';
+$strUpdateQuery = '¥¯¥¨¥ê¡¼¤Î¹¹¿·';
$strUpgrade = '%s %s ¤«¤½¤ì°Ü¹Ô¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¤Ù¤­¤Ç¤¹¡£';
$strUsage = '»ÈÍÑÎÌ';
$strUseBackquotes = 'µÕ¥¯¥ª¡¼¥È¤Ç¥Æ¡¼¥Ö¥ë̾¤ä¥Õ¥£¡¼¥ë¥É̾¤ò°Ï¤à';
@@ -670,7 +685,7 @@ $strViewDumpDB = 'DB¤Î¥À¥ó¥×(¥¹¥­¡¼¥Þ)ɽ¼¨';
$strViewDumpDatabases = '¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥À¥ó¥×¥Ó¥å¡¼ (¥¹¥­¡¼¥Þ)';
$strWebServerUploadDirectory = '¥¦¥§¥Ö¥µ¡¼¥Ð¡¼¾å¤Ç¥¢¥Ã¥×¥í¡¼¥É';
-$strWebServerUploadDirectoryError = '¥¢¥Ã¥×¥í¡¼¥É¤ò¹Ô¤¦¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¢¤ê¤Þ¤»¤ó¡£¡£';
+$strWebServerUploadDirectoryError = '¥¢¥Ã¥×¥í¡¼¥É¤ò¹Ô¤¦¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¢¤ê¤Þ¤»¤ó¡£';
$strWelcome = '%s ¤Ø¤è¤¦¤³¤½';
$strWestEuropean = 'À¾¥è¡¼¥í¥Ã¥Ñ¿Í';
$strWildcard = '¥ï¥¤¥ë¥É¥«¡¼¥É';
@@ -689,14 +704,23 @@ $strZeroRemovesTheLimit = 'Ãí°Õ: ¥ª¥×¥·¥ç¥ó¤ò 0 (¥¼¥í)¤ËÀßÄꤹ¤ë¤ÈÀ©¸Â¤¬¤Ê¤¯¤Ê¤ê
$strZip = '"zip Êý¼°"';
// To translate:
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+
+$strBinLogOriginalPosition = 'Original position'; //to translate
-$strCaseInsensitive = 'case-insensitive'; //to translate
-$strCaseSensitive = 'case-sensitive'; //to translate
$strCommentsForTable = 'COMMENTS FOR TABLE'; //to translate
+$strCompatibleHashing = 'MySQL&nbsp;4.0 ¸ß´¹'; //to translate
+$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
+$strDBCopy = 'Copy database to'; //to translate
$strDropDatabaseStrongWarning = 'You are about to DESTROY a complete database!'; //to translate
-$strInsertedRowId = 'Inserted row id:'; //to translate
+$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
+
+$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
+$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
+$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strLatexContinuedCaption = 'Continued table caption';//to translate
@@ -709,16 +733,20 @@ $strMIME_transformation_options = 'Transformation options';//to translate
$strMIME_transformation_options_note = 'Please enter the values for transformation options using this format: \'a\',\'b\',\'c\'...<br />If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, backslashes it (for example \'\\\\xyz\' or \'a\\\'b\').';//to translate
$strMIME_without = 'MIME-types printed in italics do not have a seperate transformation function';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
$strNoSpace = 'Insufficient space to save the file %s.'; //to translate
$strOperator = 'Operator'; //to translate
+$strPasswordHashing = 'Password Hashing'; //to translate
+
$strQueryTime = 'Query took %01.4f sec';//to translate
$strRelationsForTable = 'RELATIONS FOR TABLE'; //to translate
-$strReplaceNULLBy = 'Replace NULL by'; //to translate
$strRowsModeFlippedHorizontal = 'horizontal (rotated headers)';//to translate
+$strSelectBinaryLog = 'Select binary log to view'; //to translate
+
$strTakeIt = 'take it'; //to translate
$strTransformation_application_octetstream__download = 'Display a link to download the binary data of a field. First option is the filename of the binary file. Second option is a possible fieldname of a table row containing the filename. If you provide a second option you need to have the first option set to an empty string'; //to translate
$strTransformation_image_jpeg__inline = 'Displays a clickable thumbnail; options: width,height in pixels (keeps the original ratio)'; //to translate
@@ -734,29 +762,11 @@ $strTransformation_text_plain__unformatted = 'Displays HTML code as HTML entitie
$strTruncateQueries = 'Truncate Shown Queries'; //to translate
$strUpdComTab = 'Please see Documentation on how to update your Column_comments Table'; //to translate
+$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
$strUsersHavingAccessToDb = 'Users having access to &quot;%s&quot;'; //to translate
-$strPersian = 'Persian'; //to translate
-$strAddFields = 'Add %s field(s)'; //to translate
-$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
-$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/japanese-sjis.inc.php b/lang/japanese-sjis.inc.php
index 029766e6e6..6f059bae15 100644
--- a/lang/japanese-sjis.inc.php
+++ b/lang/japanese-sjis.inc.php
@@ -7,7 +7,6 @@
*/
$charset = 'SHIFT_JIS';
-$allow_recoding = TRUE;
$text_dir = 'ltr';
$left_font_family = 'verdana, arial, helvetica, geneva, sans-serif';
$right_font_family = 'arial, helvetica, geneva, sans-serif';
@@ -31,9 +30,10 @@ $strAccessDeniedExplanation = 'phpMyAdmin ‚ÍAMySQL ƒT[ƒo[‚ÉÚ‘±‚µ‚悤‚Æ‚µ‚Ü‚µ
$strAction = 'ŽÀs';
$strAddAutoIncrement = 'uAUTO_INCREMENTv’l‚ð’ljÁ';
$strAddConstraints = '§ŒÀ’ljÁ';
-$strAddDeleteColumn = 'ƒtƒB[ƒ‹ƒh—ñ‚Ìu’ljÁ^íœv';
-$strAddDeleteRow = 'ðŒs‚Ìu’ljÁ^íœv';
+$strAddDeleteColumn = 'ƒtƒB[ƒ‹ƒh—ñ‚Ìu’ljÁ/íœv';
+$strAddDeleteRow = 'ðŒs‚Ìu’ljÁ/íœv';
$strAddDropDatabase = 'uDROP DATABASEv‚ð’ljÁ';
+$strAddFields = '%s ŒÂ‚̃tƒB[ƒ‹ƒh‚ð’ljÁ';
$strAddHeaderComment = 'ƒwƒbƒ_[‚ÖƒJƒXƒ^ƒ€ƒRƒƒ“ƒg‚ð’ljÁ (\\n ‚ʼnüs)';
$strAddIfNotExists = 'uIF NOT EXISTSv‚ð’ljÁ';
$strAddIntoComments = 'ƒRƒƒ“ƒg’ljÁ';
@@ -74,8 +74,14 @@ $strBack = '–ß‚é';
$strBaltic = 'ƒoƒ‹ƒg”Œê';
$strBeginCut = 'Ø‚èŽæ‚èŠJŽn';
$strBeginRaw = 'RAW ŠJŽn';
+$strBinLogEventType = 'ƒCƒxƒ“ƒgƒ^ƒCƒv';
+$strBinLogInfo = 'î•ñ';
+$strBinLogName = 'ƒƒO–¼';
+$strBinLogPosition = 'ˆÊ’u';
+$strBinLogServerId = 'ƒT[ƒo[ ID';
$strBinary = ' ƒoƒCƒiƒŠ ';
$strBinaryDoNotEdit = ' ƒoƒCƒiƒŠ - C³o—ˆ‚Ü‚¹‚ñ';
+$strBinaryLog = 'ƒoƒCƒiƒŠƒƒO';
$strBookmarkAllUsers = '‚·‚ׂẴ†[ƒU[‚ª‚±‚̃uƒbƒNƒ}[ƒN‚ðƒAƒNƒZƒXo—ˆ‚é';
$strBookmarkDeleted = 'ƒuƒbƒNƒ}[ƒN‚ð³í‚É휂µ‚Ü‚µ‚½B';
$strBookmarkLabel = 'ƒ‰ƒxƒ‹';
@@ -98,6 +104,8 @@ $strCantRenameIdxToPrimary = 'ƒCƒ“ƒfƒbƒNƒX‚Ì–¼‘O‚ð PRIMARY ‚É•ÏX‚Å‚«‚Ü‚¹‚ñB';
$strCantUseRecodeIconv = 'iconvAlibiconvArecode_string ‚Ì‚Ç‚ÌŠÖ”‚àŽg—po—ˆ‚Ü‚¹‚ñBphp ‚ÌÝ’è‚ðƒ`ƒFƒbƒN‚µ‚Ä‚­‚¾‚³‚¢B';
$strCardinality = 'ƒJ[ƒfƒBƒiƒŠƒeƒB';
$strCarriage = 'ƒLƒƒƒŠƒbƒWƒŠƒ^[ƒ“: \\r';
+$strCaseInsensitive = '‰pŽš‚̑嬂ð‹æ•Ê‚µ‚È‚¢';
+$strCaseSensitive = '‰pŽš‚̑嬂ð‹æ•Ê‚·‚é';
$strCentralEuropean = '’†‰›ƒˆ[ƒƒbƒpl';
$strChange = '•ÏX';
$strChangeCopyMode = '“¯‚¶“ÁŒ ‚ðŽ‚Á‚½V‹K‚̃†[ƒU[‚ðì‚é...';
@@ -141,9 +149,9 @@ $strCreate = 'ì¬';
$strCreateIndex = '&nbsp;%s&nbsp; ‚Ì—ñ‚̃Cƒ“ƒfƒbƒNƒX‚Ìì¬';
$strCreateIndexTopic = 'V‚µ‚¢ƒCƒ“ƒfƒbƒNƒX‚Ìì¬';
$strCreateNewDatabase = 'V‚µ‚¢DB‚ð쬂µ‚Ü‚·B';
-$strCreateNewTable = 'Œ»Ý‚ÌDB‚ÉV‚µ‚¢ƒe[ƒuƒ‹‚ð쬂µ‚Ü‚·B %s --> ';
+$strCreateNewTable = 'Œ»Ý‚ÌDB‚ÉV‚µ‚¢ƒe[ƒuƒ‹‚ð쬂·‚é %s --> ';
$strCreatePage = 'V‹Kƒy[ƒW‚Ìì¬';
-$strCreatePdfFeat = 'PDF 쬋@”\\';
+$strCreatePdfFeat = 'PDF 쬋@”\ ';
$strCreationDates = 'ì¬/XV/ŒŸ¸‚Ì“ú•t‚ð’ljÁ';
$strCriteria = 'iž‚ÝŠî€';
$strCroatian = 'ƒNƒƒAƒ`ƒAŒê';
@@ -196,7 +204,7 @@ $strDictionary = 'Ž«‘';
$strDisableForeignChecks = 'ŠO•”ƒL[‚ÌŒŸ¸‚𖳌ø‚É';
$strDisabled = '–³Œø';
$strDisplayFeat = 'ƒe[ƒuƒ‹î•ñ•\Ž¦‹@”\ ';
-$strDisplayOrder = '”­•\‡”Ô:';
+$strDisplayOrder = '•\Ž¦‡˜:';
$strDisplayPDF = 'PDF ƒXƒL[ƒ}‚Ì•\Ž¦';
$strDoAQuery = '"—á‚ÌQUERY"‚ðŽÀs (ƒƒCƒ‹ƒhƒJ[ƒh: "%")';
$strDoYouReally = '–{“–‚ÉŽÀs‚µ‚Ä‚à—Ç‚¢‚Å‚·‚©H --> ';
@@ -225,7 +233,7 @@ $strEnglish = '‰pŒê';
$strEnglishPrivileges = ' ’ˆÓ: MySQL‚Ì“ÁŒ ‚Ì–¼‘O‚͉pŒê‚Å•\Ž¦‚µ‚Ä‚¢‚Ü‚·B';
$strError = 'ƒGƒ‰[';
$strEstonian = 'ƒGƒXƒgƒjƒAŒê';
-$strExcelEdition = 'Excel Ӂ';
+$strExcelEdition = 'Excel ‚ÌŽí—Þ';
$strExcelOptions = 'Excel ƒIƒvƒVƒ‡ƒ“';
$strExecuteBookmarked = 'ƒuƒbƒNƒ}[ƒN‚³‚ꂽƒNƒGƒŠ[‚ðŽÀs';
$strExplain = 'Explain SQL';
@@ -298,8 +306,10 @@ $strInnodbStat = 'InnoDB ƒXƒe[ƒ^ƒX';
$strInsecureMySQL = '‚ ‚È‚½‚̃Rƒ“ƒtƒBƒOƒŒ[ƒVƒ‡ƒ“ƒtƒ@ƒCƒ‹‚Ìݒ肪 MySQL ƒfƒtƒHƒ‹ƒg‚Ì“ÁŒ ƒAƒJƒEƒ“ƒg‚É‚È‚Á‚Ä‚¢‚Ü‚· (root ƒ†[ƒU[‚ŃpƒXƒ[ƒh‚È‚µ) B MySQL ƒT[ƒo[‚à‚±‚̃fƒtƒHƒ‹ƒgÝ’è‚Å“®ì‚µ‚Ä‚¢‚é‚Ì‚ÅAN“üŽÒ‚ɑ΂µ‚Ä–³–h”õ‚Å‚·B‚±‚̃ZƒLƒ…ƒŠƒeƒB[ƒz[ƒ‹‚Í•K‚¸•Â‚´‚µ‚ĉº‚³‚¢B';
$strInsert = '’ljÁ';
$strInsertAsNewRow = 'V‚µ‚¢s‚Æ‚µ‚Ă̒ljÁ';
+$strInsertBookmarkTitle = 'ƒuƒbƒNƒ}[ƒN‚̃^ƒCƒgƒ‹‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B';
$strInsertNewRow = 'V‚µ‚¢s‚̒ljÁ';
$strInsertTextfiles = 'ƒe[ƒuƒ‹‚ɃeƒLƒXƒgƒtƒ@ƒCƒ‹‚̒ljÁ';
+$strInsertedRowId = 'ƒCƒ“ƒT[ƒg‚µ‚½s ID:';
$strInsertedRows = '’ljÁ‚³‚ꂽs”:';
$strInstructions = 'ŽÀŽ{—á';
$strInternalNotNecessary = '* InnoDB ‚ª‘¶Ý‚·‚éê‡A“à•”ƒŠƒŒ[ƒVƒ‡ƒ“‚Í•K—v‚Å‚Í‚ ‚è‚Ü‚¹‚ñB';
@@ -351,7 +361,7 @@ $strMaximumSize = 'Å‘åƒTƒCƒY: %s%s';
$strModifications = '‚𳂵‚­C³‚µ‚Ü‚µ‚½B';
$strModify = 'C³';
$strModifyIndexTopic = 'ƒCƒ“ƒfƒbƒNƒX‚Ì•ÏX';
-$strMoreStatusVars = '‚³‚ç‚É•Ï”‚Ìó‘Ô';
+$strMoreStatusVars = '‚»‚Ì‘¼‚Ì•Ï”‚Ìó‘Ô';
$strMoveTable = 'ƒe[ƒuƒ‹‚ð(database<b>.</b>table)‚Ɉړ®:';
$strMoveTableOK = 'ƒe[ƒuƒ‹ %s ‚ª %s ˆÚ“®‚³‚ê‚Ü‚µ‚½B';
$strMoveTableSameNames = '“¯‚¶ƒe[ƒuƒ‹‚Ɉړ®‚Å‚«‚Ü‚¹‚ñ!';
@@ -388,6 +398,7 @@ $strNoQuery = 'SQL ƒNƒGƒŠ[–³‚µ';
$strNoRights = 'Œ»Ý“ÁŒ ‚ðŽ‚Á‚Ä‚È‚¢‚Ì‚Å‚±‚±‚É“ü‚ê‚Ü‚¹‚ñB';
$strNoRowsSelected = 's‚Í‘I‘ð‚³‚ê‚Ü‚¹‚ñ‚Å‚µ‚½B';
$strNoTablesFound = 'Œ»Ý‚Ì DB ‚Ƀe[ƒuƒ‹‚Í‚ ‚è‚Ü‚¹‚ñB';
+$strNoThemeSupport = 'ƒe[ƒ}‚ðƒTƒ|[ƒg‚µ‚Ä‚¢‚Ü‚¹‚ñBÝ’è‚ƃe[ƒ}ƒfƒBƒŒƒNƒgƒŠ %s ‚ðŠm”F‚µ‚Ä‚­‚¾‚³‚¢B';
$strNoUsersFound = 'ŠY“–ƒ†[ƒU[‚ÍŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B';
$strNoValidateSQL = 'SQL ŒŸØ‚ðƒXƒLƒbƒv';
$strNone = '–³‚µ';
@@ -425,6 +436,7 @@ $strPdfNoTables = 'ƒe[ƒuƒ‹‚ª‚ ‚è‚Ü‚¹‚ñ';
$strPerHour = 'Žž–ˆ';
$strPerMinute = '/•ª';
$strPerSecond = '/•b';
+$strPersian = 'ƒyƒ‹ƒVƒAŒê';
$strPhoneBook = '“d˜b’ ';
$strPhp = 'PHP ƒR[ƒh‚Ìì¬';
$strPmaDocumentation = 'phpMyAdmin ‚̃hƒLƒ…ƒƒ“ƒg';
@@ -502,6 +514,7 @@ $strRenameTable = 'ƒe[ƒuƒ‹–¼‚Ì•ÏX';
$strRenameTableOK = '%s ‚ð %s ‚É–¼‘O‚ð•ÏX‚µ‚Ü‚µ‚½B';
$strRepairTable = 'ƒe[ƒuƒ‹‚𕜋Œ‚µ‚Ü‚·B';
$strReplace = '’u‚«Š·‚¦‚é';
+$strReplaceNULLBy = 'NULL ‚ðŽw’è‚Ì•¶Žš—ñ‚Å’u‚«Š·‚¦‚é';
$strReplaceTable = 'ƒtƒ@ƒCƒ‹‚Ńe[ƒuƒ‹‚ð’u‚«Š·‚¦‚é';
$strReset = 'ƒŠƒZƒbƒg';
$strResourceLimits = ' ƒŠƒ\[ƒX‚̧ŒÀ';
@@ -513,9 +526,9 @@ $strRomanian = 'ƒ‹[ƒ}ƒjƒAŒê';
$strRowLength = 's‚Ì’·‚³';
$strRowSize = ' s‚̃TƒCƒY ';
$strRows = 's';
-$strRowsFrom = 'ŠJŽns ';
+$strRowsFrom = 'ŠJŽns';
$strRowsModeHorizontal = '…•½';
-$strRowsModeOptions = '•ûŒü: %s : %s —ñ‚¸‚ƒwƒbƒ_[‚ðŒJ‚è•Ô‚µ”­•\‚·‚é';
+$strRowsModeOptions = '•ûŒü: %s : %s —ñ‚¸‚ƒwƒbƒ_[‚ðŒJ‚è•Ô‚µ•\Ž¦‚·‚é';
$strRowsModeVertical = 'd’¼';
$strRowsStatistic = 's‚Ì“Œv';
$strRunQuery = 'ƒNƒGƒŠ[‚ÌŽÀs';
@@ -567,14 +580,14 @@ $strServerVersion = 'ƒT[ƒo[‚̃o[ƒWƒ‡ƒ“';
$strSessionValue = 'ƒZƒbƒVƒ‡ƒ“’l';
$strSetEnumVal = 'ƒtƒB[ƒ‹ƒhƒ^ƒCƒv‚ª"enum"–”‚Í"set"‚Ìꇂ͒l‚ð‚±‚ÌƒtƒH[ƒ}ƒbƒg‚ðŽg‚Á‚Ä“ü—Í‚µ‚ĉº‚³‚¢: \'a\',\'b\',\'c\'...<br />ƒoƒbƒNƒXƒ‰ƒbƒVƒ…u"\"v–”‚̓NƒI[ƒgu"\'"v‚ð“ü—Í‚µ‚½‚¢‚ÆA“ª‚ɃoƒbƒNƒXƒ‰ƒbƒVƒ…‚ð•t‚¯‚ĉº‚³‚¢u—á: \'\\\\xyz\' or \'a\\\'b\'vB';
$strShow = '•\Ž¦';
-$strShowAll = '‘S‚Ä”­•\ ';
+$strShowAll = '‘S‚Ä•\Ž¦';
$strShowColor = 'F•\Ž¦';
$strShowDatadictAs = 'ƒf[ƒ^Ž«‘ƒtƒH[ƒ}ƒbƒg';
$strShowFullQueries = 'ƒtƒ‹ƒNƒGƒŠ[‚ð•\Ž¦';
$strShowGrid = 'ƒOƒŠƒbƒh‚Ì•\Ž¦';
$strShowPHPInfo = 'PHP î•ñ';
$strShowTableDimension = 'ƒe[ƒuƒ‹‚Ì‘å‚«‚³‚ð•\Ž¦';
-$strShowTables = 'ƒe[ƒuƒ‹‚Ì”­•\ ';
+$strShowTables = 'ƒe[ƒuƒ‹‚Ì•\Ž¦';
$strShowThisQuery = ' ŽÀs‚µ‚½ƒNƒGƒŠ[‚ð‚±‚±‚É•\Ž¦‚·‚é';
$strShowingRecords = 'ƒŒƒR[ƒh•\Ž¦';
$strSimplifiedChinese = 'ŠÈ‘ÌŽš’†‘Œê';
@@ -604,6 +617,7 @@ $strSubmit = 'ŽÀs';
$strSuccess = 'SQL ƒNƒGƒŠ[‚ª³í‚ÉŽÀs‚³‚ê‚Ü‚µ‚½B';
$strSum = '‡Œv';
$strSwedish = 'ƒXƒEƒF[ƒfƒ“Œê';
+$strSwitchToDatabase = 'ƒRƒs[‚µ‚½ƒf[ƒ^ƒx[ƒX‚ÉØ‚è‘Ö‚¦';
$strSwitchToTable = 'ƒRƒs[‚µ‚½ƒe[ƒuƒ‹‚ÉØ‚è‘Ö‚¦';
$strTable = 'ƒe[ƒuƒ‹ ';
@@ -644,9 +658,9 @@ $strUnicode = 'ƒ†ƒjƒR[ƒh';
$strUnique = '—Bˆê';
$strUnknown = '•s–¾';
$strUnselectAll = '‘S‰ð•ú';
-$strUpdatePrivMessage = '%s ‚Ì“ÁŒ ‚ðƒAƒbƒvƒf[ƒg‚µ‚Ü‚µ‚½B';
-$strUpdateProfileMessage = 'ƒvƒƒtƒ@ƒCƒ‹‚ðƒAƒbƒvƒf[ƒg‚µ‚Ü‚µ‚½B';
-$strUpdateQuery = 'ƒNƒGƒŠ[‚̃Aƒbƒvƒf[ƒg';
+$strUpdatePrivMessage = '%s ‚Ì“ÁŒ ‚ðXV‚µ‚Ü‚µ‚½B';
+$strUpdateProfileMessage = 'ƒvƒƒtƒ@ƒCƒ‹‚ðXV‚µ‚Ü‚µ‚½B';
+$strUpdateQuery = 'ƒNƒGƒŠ[‚ÌXV';
$strUpgrade = '%s %s ‚©‚»‚êˆÚs‚ɃAƒbƒvƒOƒŒ[ƒh‚·‚é‚ׂ«‚Å‚·B';
$strUsage = 'Žg—p—Ê';
$strUseBackquotes = '‹tƒNƒI[ƒg‚Ńe[ƒuƒ‹–¼‚âƒtƒB[ƒ‹ƒh–¼‚ðˆÍ‚Þ';
@@ -671,7 +685,7 @@ $strViewDumpDB = 'DB‚̃_ƒ“ƒv(ƒXƒL[ƒ})•\Ž¦';
$strViewDumpDatabases = 'ƒf[ƒ^ƒx[ƒX‚̃_ƒ“ƒvƒrƒ…[ (ƒXƒL[ƒ})';
$strWebServerUploadDirectory = 'ƒEƒFƒuƒT[ƒo[ã‚ŃAƒbƒvƒ[ƒh';
-$strWebServerUploadDirectoryError = 'ƒAƒbƒvƒ[ƒh‚ðs‚¤ƒfƒBƒŒƒNƒgƒŠ‚ª‚ ‚è‚Ü‚¹‚ñBB';
+$strWebServerUploadDirectoryError = 'ƒAƒbƒvƒ[ƒh‚ðs‚¤ƒfƒBƒŒƒNƒgƒŠ‚ª‚ ‚è‚Ü‚¹‚ñB';
$strWelcome = '%s ‚ւ悤‚±‚»';
$strWestEuropean = '¼ƒˆ[ƒƒbƒpl';
$strWildcard = 'ƒƒCƒ‹ƒhƒJ[ƒh';
@@ -690,14 +704,23 @@ $strZeroRemovesTheLimit = '’ˆÓ: ƒIƒvƒVƒ‡ƒ“‚ð 0 (ƒ[ƒ)‚ÉÝ’è‚·‚é‚ƧŒÀ‚ª‚È‚­‚È‚è
$strZip = '"zip •ûŽ®"';
// To translate:
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+
+$strBinLogOriginalPosition = 'Original position'; //to translate
-$strCaseInsensitive = 'case-insensitive'; //to translate
-$strCaseSensitive = 'case-sensitive'; //to translate
$strCommentsForTable = 'COMMENTS FOR TABLE'; //to translate
+$strCompatibleHashing = 'MySQL&nbsp;4.0 ŒÝŠ·'; //to translate
+$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
+$strDBCopy = 'Copy database to'; //to translate
$strDropDatabaseStrongWarning = 'You are about to DESTROY a complete database!'; //to translate
-$strInsertedRowId = 'Inserted row id:'; //to translate
+$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
+
+$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
+$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
+$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strLatexContinuedCaption = 'Continued table caption';//to translate
@@ -710,16 +733,20 @@ $strMIME_transformation_options = 'Transformation options';//to translate
$strMIME_transformation_options_note = 'Please enter the values for transformation options using this format: \'a\',\'b\',\'c\'...<br />If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, backslashes it (for example \'\\\\xyz\' or \'a\\\'b\').';//to translate
$strMIME_without = 'MIME-types printed in italics do not have a seperate transformation function';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
$strNoSpace = 'Insufficient space to save the file %s.'; //to translate
$strOperator = 'Operator'; //to translate
+$strPasswordHashing = 'Password Hashing'; //to translate
+
$strQueryTime = 'Query took %01.4f sec';//to translate
$strRelationsForTable = 'RELATIONS FOR TABLE'; //to translate
-$strReplaceNULLBy = 'Replace NULL by'; //to translate
$strRowsModeFlippedHorizontal = 'horizontal (rotated headers)';//to translate
+$strSelectBinaryLog = 'Select binary log to view'; //to translate
+
$strTakeIt = 'take it'; //to translate
$strTransformation_application_octetstream__download = 'Display a link to download the binary data of a field. First option is the filename of the binary file. Second option is a possible fieldname of a table row containing the filename. If you provide a second option you need to have the first option set to an empty string'; //to translate
$strTransformation_image_jpeg__inline = 'Displays a clickable thumbnail; options: width,height in pixels (keeps the original ratio)'; //to translate
@@ -735,29 +762,11 @@ $strTransformation_text_plain__unformatted = 'Displays HTML code as HTML entitie
$strTruncateQueries = 'Truncate Shown Queries'; //to translate
$strUpdComTab = 'Please see Documentation on how to update your Column_comments Table'; //to translate
+$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
$strUsersHavingAccessToDb = 'Users having access to &quot;%s&quot;'; //to translate
-$strPersian = 'Persian'; //to translate
-$strAddFields = 'Add %s field(s)'; //to translate
-$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
-$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php
index a8a659c55b..48f5ceee86 100644
--- a/lang/japanese-utf-8.inc.php
+++ b/lang/japanese-utf-8.inc.php
@@ -6,7 +6,7 @@
* Tadashi Jokagi <elf2000 at users.sourceforge.net>
*/
-$charset = 'utf-8';
+$charset = 'UTF-8';
$allow_recoding = TRUE;
$text_dir = 'ltr';
$left_font_family = 'verdana, arial, helvetica, geneva, sans-serif';
@@ -31,9 +31,10 @@ $strAccessDeniedExplanation = 'phpMyAdmin ã¯ã€MySQL サーãƒãƒ¼ã«æŽ¥ç¶šã—ã‚
$strAction = '実行';
$strAddAutoIncrement = '「AUTO_INCREMENTã€å€¤ã‚’追加';
$strAddConstraints = '制é™è¿½åŠ ';
-$strAddDeleteColumn = 'フィールド列ã®ã€Œè¿½åŠ ï¼å‰Šé™¤ã€';
-$strAddDeleteRow = 'æ¡ä»¶è¡Œã®ã€Œè¿½åŠ ï¼å‰Šé™¤ã€';
+$strAddDeleteColumn = 'フィールド列ã®ã€Œè¿½åŠ /削除ã€';
+$strAddDeleteRow = 'æ¡ä»¶è¡Œã®ã€Œè¿½åŠ /削除ã€';
$strAddDropDatabase = '「DROP DATABASEã€ã‚’追加';
+$strAddFields = '%s 個ã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã‚’追加';
$strAddHeaderComment = 'ヘッダーã¸ã‚«ã‚¹ã‚¿ãƒ ã‚³ãƒ¡ãƒ³ãƒˆã‚’追加 (\\n ã§æ”¹è¡Œ)';
$strAddIfNotExists = '「IF NOT EXISTSã€ã‚’追加';
$strAddIntoComments = 'コメント追加';
@@ -74,8 +75,14 @@ $strBack = '戻る';
$strBaltic = 'ãƒãƒ«ãƒˆè«¸èªž';
$strBeginCut = '切りå–り開始';
$strBeginRaw = 'RAW 開始';
+$strBinLogEventType = 'イベントタイプ';
+$strBinLogInfo = '情報';
+$strBinLogName = 'ログå';
+$strBinLogPosition = 'ä½ç½®';
+$strBinLogServerId = 'サーãƒãƒ¼ ID';
$strBinary = ' ãƒã‚¤ãƒŠãƒª ';
$strBinaryDoNotEdit = ' ãƒã‚¤ãƒŠãƒª - 修正出æ¥ã¾ã›ã‚“';
+$strBinaryLog = 'ãƒã‚¤ãƒŠãƒªãƒ­ã‚°';
$strBookmarkAllUsers = 'ã™ã¹ã¦ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ãŒã“ã®ãƒ–ックマークをアクセス出æ¥ã‚‹';
$strBookmarkDeleted = 'ブックマークを正常ã«å‰Šé™¤ã—ã¾ã—ãŸã€‚';
$strBookmarkLabel = 'ラベル';
@@ -98,6 +105,8 @@ $strCantRenameIdxToPrimary = 'インデックスã®åå‰ã‚’ PRIMARY ã«å¤‰æ›´ã
$strCantUseRecodeIconv = 'iconvã€libiconvã€recode_string ã®ã©ã®é–¢æ•°ã‚‚使用出æ¥ã¾ã›ã‚“。php ã®è¨­å®šã‚’ãƒã‚§ãƒƒã‚¯ã—ã¦ãã ã•ã„。';
$strCardinality = 'カーディナリティ';
$strCarriage = 'キャリッジリターン: \\r';
+$strCaseInsensitive = '英字ã®å¤§å°ã‚’区別ã—ãªã„';
+$strCaseSensitive = '英字ã®å¤§å°ã‚’区別ã™ã‚‹';
$strCentralEuropean = '中央ヨーロッパ人';
$strChange = '変更';
$strChangeCopyMode = 'åŒã˜ç‰¹æ¨©ã‚’æŒã£ãŸæ–°è¦ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’作る...';
@@ -141,7 +150,7 @@ $strCreate = '作æˆ';
$strCreateIndex = '&nbsp;%s&nbsp; ã®åˆ—ã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã®ä½œæˆ';
$strCreateIndexTopic = 'æ–°ã—ã„インデックスã®ä½œæˆ';
$strCreateNewDatabase = 'æ–°ã—ã„DBを作æˆã—ã¾ã™ã€‚';
-$strCreateNewTable = 'ç¾åœ¨ã®DBã«æ–°ã—ã„テーブルを作æˆã—ã¾ã™ã€‚ %s --> ';
+$strCreateNewTable = 'ç¾åœ¨ã®DBã«æ–°ã—ã„テーブルを作æˆã™ã‚‹ %s --> ';
$strCreatePage = 'æ–°è¦ãƒšãƒ¼ã‚¸ã®ä½œæˆ';
$strCreatePdfFeat = 'PDF 作æˆæ©Ÿèƒ½';
$strCreationDates = '作æˆ/æ›´æ–°/検査ã®æ—¥ä»˜ã‚’追加';
@@ -196,7 +205,7 @@ $strDictionary = '辞書';
$strDisableForeignChecks = '外部キーã®æ¤œæŸ»ã‚’無効ã«';
$strDisabled = '無効';
$strDisplayFeat = 'テーブル情報表示機能';
-$strDisplayOrder = '発表順番:';
+$strDisplayOrder = '表示順åº:';
$strDisplayPDF = 'PDF スキーマã®è¡¨ç¤º';
$strDoAQuery = '"例ã®QUERY"を実行 (ワイルドカード: "%")';
$strDoYouReally = '本当ã«å®Ÿè¡Œã—ã¦ã‚‚良ã„ã§ã™ã‹ï¼Ÿ --> ';
@@ -225,7 +234,7 @@ $strEnglish = '英語';
$strEnglishPrivileges = ' 注æ„: MySQLã®ç‰¹æ¨©ã®åå‰ã¯è‹±èªžã§è¡¨ç¤ºã—ã¦ã„ã¾ã™ã€‚';
$strError = 'エラー';
$strEstonian = 'エストニア語';
-$strExcelEdition = 'Excel 版';
+$strExcelEdition = 'Excel ã®ç¨®é¡ž';
$strExcelOptions = 'Excel オプション';
$strExecuteBookmarked = 'ブックマークã•ã‚ŒãŸã‚¯ã‚¨ãƒªãƒ¼ã‚’実行';
$strExplain = 'Explain SQL';
@@ -298,8 +307,10 @@ $strInnodbStat = 'InnoDB ステータス';
$strInsecureMySQL = 'ã‚ãªãŸã®ã‚³ãƒ³ãƒ•ã‚£ã‚°ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ãƒ•ã‚¡ã‚¤ãƒ«ã®è¨­å®šãŒ MySQL デフォルトã®ç‰¹æ¨©ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«ãªã£ã¦ã„ã¾ã™ (root ユーザーã§ãƒ‘スワードãªã—) 。 MySQL サーãƒãƒ¼ã‚‚ã“ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆè¨­å®šã§å‹•ä½œã—ã¦ã„ã‚‹ã®ã§ã€ä¾µå…¥è€…ã«å¯¾ã—ã¦ç„¡é˜²å‚™ã§ã™ã€‚ã“ã®ã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£ãƒ¼ãƒ›ãƒ¼ãƒ«ã¯å¿…ãšé–‰ã–ã—ã¦ä¸‹ã•ã„。';
$strInsert = '追加';
$strInsertAsNewRow = 'æ–°ã—ã„è¡Œã¨ã—ã¦ã®è¿½åŠ ';
+$strInsertBookmarkTitle = 'ブックマークã®ã‚¿ã‚¤ãƒˆãƒ«ã‚’入力ã—ã¦ãã ã•ã„。';
$strInsertNewRow = 'æ–°ã—ã„è¡Œã®è¿½åŠ ';
$strInsertTextfiles = 'テーブルã«ãƒ†ã‚­ã‚¹ãƒˆãƒ•ã‚¡ã‚¤ãƒ«ã®è¿½åŠ ';
+$strInsertedRowId = 'インサートã—ãŸè¡Œ ID:';
$strInsertedRows = '追加ã•ã‚ŒãŸè¡Œæ•°:';
$strInstructions = '実施例';
$strInternalNotNecessary = '* InnoDB ãŒå­˜åœ¨ã™ã‚‹å ´åˆã€å†…部リレーションã¯å¿…è¦ã§ã¯ã‚ã‚Šã¾ã›ã‚“。';
@@ -351,7 +362,7 @@ $strMaximumSize = '最大サイズ: %s%s';
$strModifications = 'ã‚’æ­£ã—ã修正ã—ã¾ã—ãŸã€‚';
$strModify = '修正';
$strModifyIndexTopic = 'インデックスã®å¤‰æ›´';
-$strMoreStatusVars = 'ã•ã‚‰ã«å¤‰æ•°ã®çŠ¶æ…‹';
+$strMoreStatusVars = 'ãã®ä»–ã®å¤‰æ•°ã®çŠ¶æ…‹';
$strMoveTable = 'テーブルを(database<b>.</b>table)ã«ç§»å‹•:';
$strMoveTableOK = 'テーブル %s ㌠%s 移動ã•ã‚Œã¾ã—ãŸã€‚';
$strMoveTableSameNames = 'åŒã˜ãƒ†ãƒ¼ãƒ–ルã«ç§»å‹•ã§ãã¾ã›ã‚“!';
@@ -388,6 +399,7 @@ $strNoQuery = 'SQL クエリー無ã—';
$strNoRights = 'ç¾åœ¨ç‰¹æ¨©ã‚’æŒã£ã¦ãªã„ã®ã§ã“ã“ã«å…¥ã‚Œã¾ã›ã‚“。';
$strNoRowsSelected = 'è¡Œã¯é¸æŠžã•ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚';
$strNoTablesFound = 'ç¾åœ¨ã® DB ã«ãƒ†ãƒ¼ãƒ–ルã¯ã‚ã‚Šã¾ã›ã‚“。';
+$strNoThemeSupport = 'テーマをサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“。設定ã¨ãƒ†ãƒ¼ãƒžãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª %s を確èªã—ã¦ãã ã•ã„。';
$strNoUsersFound = '該当ユーザーã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚';
$strNoValidateSQL = 'SQL 検証をスキップ';
$strNone = 'ç„¡ã—';
@@ -425,6 +437,7 @@ $strPdfNoTables = 'テーブルãŒã‚ã‚Šã¾ã›ã‚“';
$strPerHour = '時毎';
$strPerMinute = '/分';
$strPerSecond = '/秒';
+$strPersian = 'ペルシア語';
$strPhoneBook = '電話帳';
$strPhp = 'PHP コードã®ä½œæˆ';
$strPmaDocumentation = 'phpMyAdmin ã®ãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆ';
@@ -502,6 +515,7 @@ $strRenameTable = 'テーブルåã®å¤‰æ›´';
$strRenameTableOK = '%s ã‚’ %s ã«åå‰ã‚’変更ã—ã¾ã—ãŸã€‚';
$strRepairTable = 'テーブルを復旧ã—ã¾ã™ã€‚';
$strReplace = 'ç½®ãæ›ãˆã‚‹';
+$strReplaceNULLBy = 'NULL を指定ã®æ–‡å­—列ã§ç½®ãæ›ãˆã‚‹';
$strReplaceTable = 'ファイルã§ãƒ†ãƒ¼ãƒ–ルを置ãæ›ãˆã‚‹';
$strReset = 'リセット';
$strResourceLimits = ' リソースã®åˆ¶é™';
@@ -515,7 +529,7 @@ $strRowSize = ' è¡Œã®ã‚µã‚¤ã‚º ';
$strRows = '行';
$strRowsFrom = '開始行';
$strRowsModeHorizontal = 'æ°´å¹³';
-$strRowsModeOptions = 'æ–¹å‘: %s : %s 列ãšã¤ãƒ˜ãƒƒãƒ€ãƒ¼ã‚’ç¹°ã‚Šè¿”ã—発表ã™ã‚‹';
+$strRowsModeOptions = 'æ–¹å‘: %s : %s 列ãšã¤ãƒ˜ãƒƒãƒ€ãƒ¼ã‚’ç¹°ã‚Šè¿”ã—表示ã™ã‚‹';
$strRowsModeVertical = 'é‡ç›´';
$strRowsStatistic = 'è¡Œã®çµ±è¨ˆ';
$strRunQuery = 'クエリーã®å®Ÿè¡Œ';
@@ -567,14 +581,14 @@ $strServerVersion = 'サーãƒãƒ¼ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³';
$strSessionValue = 'セッション値';
$strSetEnumVal = 'フィールドタイプãŒ"enum"åˆã¯"set"ã®å ´åˆã¯å€¤ã‚’ã“ã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã‚’使ã£ã¦å…¥åŠ›ã—ã¦ä¸‹ã•ã„: \'a\',\'b\',\'c\'...<br />ãƒãƒƒã‚¯ã‚¹ãƒ©ãƒƒã‚·ãƒ¥ã€Œ"\"ã€åˆã¯ã‚¯ã‚ªãƒ¼ãƒˆã€Œ"\'"ã€ã‚’入力ã—ãŸã„ã¨ã€é ­ã«ãƒãƒƒã‚¯ã‚¹ãƒ©ãƒƒã‚·ãƒ¥ã‚’付ã‘ã¦ä¸‹ã•ã„「例: \'\\\\xyz\' or \'a\\\'b\'ã€ã€‚';
$strShow = '表示';
-$strShowAll = 'å…¨ã¦ç™ºè¡¨';
+$strShowAll = 'å…¨ã¦è¡¨ç¤º';
$strShowColor = '色表示';
$strShowDatadictAs = 'データ辞書フォーマット';
$strShowFullQueries = 'フルクエリーを表示';
$strShowGrid = 'グリッドã®è¡¨ç¤º';
$strShowPHPInfo = 'PHP 情報';
$strShowTableDimension = 'テーブルã®å¤§ãã•ã‚’表示';
-$strShowTables = 'テーブルã®ç™ºè¡¨';
+$strShowTables = 'テーブルã®è¡¨ç¤º';
$strShowThisQuery = ' 実行ã—ãŸã‚¯ã‚¨ãƒªãƒ¼ã‚’ã“ã“ã«è¡¨ç¤ºã™ã‚‹';
$strShowingRecords = 'レコード表示';
$strSimplifiedChinese = '簡体字中国語';
@@ -604,6 +618,7 @@ $strSubmit = '実行';
$strSuccess = 'SQL クエリーãŒæ­£å¸¸ã«å®Ÿè¡Œã•ã‚Œã¾ã—ãŸã€‚';
$strSum = 'åˆè¨ˆ';
$strSwedish = 'スウェーデン語';
+$strSwitchToDatabase = 'コピーã—ãŸãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã«åˆ‡ã‚Šæ›¿ãˆ';
$strSwitchToTable = 'コピーã—ãŸãƒ†ãƒ¼ãƒ–ルã«åˆ‡ã‚Šæ›¿ãˆ';
$strTable = 'テーブル ';
@@ -644,9 +659,9 @@ $strUnicode = 'ユニコード';
$strUnique = '唯一';
$strUnknown = 'ä¸æ˜Ž';
$strUnselectAll = '全解放';
-$strUpdatePrivMessage = '%s ã®ç‰¹æ¨©ã‚’アップデートã—ã¾ã—ãŸã€‚';
-$strUpdateProfileMessage = 'プロファイルをアップデートã—ã¾ã—ãŸã€‚';
-$strUpdateQuery = 'クエリーã®ã‚¢ãƒƒãƒ—デート';
+$strUpdatePrivMessage = '%s ã®ç‰¹æ¨©ã‚’æ›´æ–°ã—ã¾ã—ãŸã€‚';
+$strUpdateProfileMessage = 'プロファイルを更新ã—ã¾ã—ãŸã€‚';
+$strUpdateQuery = 'クエリーã®æ›´æ–°';
$strUpgrade = '%s %s ã‹ãれ移行ã«ã‚¢ãƒƒãƒ—グレードã™ã‚‹ã¹ãã§ã™ã€‚';
$strUsage = '使用é‡';
$strUseBackquotes = '逆クオートã§ãƒ†ãƒ¼ãƒ–ルåやフィールドåを囲む';
@@ -671,7 +686,7 @@ $strViewDumpDB = 'DBã®ãƒ€ãƒ³ãƒ—(スキーマ)表示';
$strViewDumpDatabases = 'データベースã®ãƒ€ãƒ³ãƒ—ビュー (スキーマ)';
$strWebServerUploadDirectory = 'ウェブサーãƒãƒ¼ä¸Šã§ã‚¢ãƒƒãƒ—ロード';
-$strWebServerUploadDirectoryError = 'アップロードを行ã†ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãŒã‚ã‚Šã¾ã›ã‚“。。';
+$strWebServerUploadDirectoryError = 'アップロードを行ã†ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãŒã‚ã‚Šã¾ã›ã‚“。';
$strWelcome = '%s ã¸ã‚ˆã†ã“ã';
$strWestEuropean = '西ヨーロッパ人';
$strWildcard = 'ワイルドカード';
@@ -690,14 +705,23 @@ $strZeroRemovesTheLimit = '注æ„: オプションを 0 (ゼロ)ã«è¨­å®šã™ã‚‹ã
$strZip = '"zip æ–¹å¼"';
// To translate:
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+
+$strBinLogOriginalPosition = 'Original position'; //to translate
-$strCaseInsensitive = 'case-insensitive'; //to translate
-$strCaseSensitive = 'case-sensitive'; //to translate
$strCommentsForTable = 'COMMENTS FOR TABLE'; //to translate
+$strCompatibleHashing = 'MySQL&nbsp;4.0 互æ›'; //to translate
+$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
+$strDBCopy = 'Copy database to'; //to translate
$strDropDatabaseStrongWarning = 'You are about to DESTROY a complete database!'; //to translate
-$strInsertedRowId = 'Inserted row id:'; //to translate
+$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
+
+$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
+$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
+$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strLatexContinuedCaption = 'Continued table caption';//to translate
@@ -710,16 +734,20 @@ $strMIME_transformation_options = 'Transformation options';//to translate
$strMIME_transformation_options_note = 'Please enter the values for transformation options using this format: \'a\',\'b\',\'c\'...<br />If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, backslashes it (for example \'\\\\xyz\' or \'a\\\'b\').';//to translate
$strMIME_without = 'MIME-types printed in italics do not have a seperate transformation function';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
$strNoSpace = 'Insufficient space to save the file %s.'; //to translate
$strOperator = 'Operator'; //to translate
+$strPasswordHashing = 'Password Hashing'; //to translate
+
$strQueryTime = 'Query took %01.4f sec';//to translate
$strRelationsForTable = 'RELATIONS FOR TABLE'; //to translate
-$strReplaceNULLBy = 'Replace NULL by'; //to translate
$strRowsModeFlippedHorizontal = 'horizontal (rotated headers)';//to translate
+$strSelectBinaryLog = 'Select binary log to view'; //to translate
+
$strTakeIt = 'take it'; //to translate
$strTransformation_application_octetstream__download = 'Display a link to download the binary data of a field. First option is the filename of the binary file. Second option is a possible fieldname of a table row containing the filename. If you provide a second option you need to have the first option set to an empty string'; //to translate
$strTransformation_image_jpeg__inline = 'Displays a clickable thumbnail; options: width,height in pixels (keeps the original ratio)'; //to translate
@@ -735,29 +763,11 @@ $strTransformation_text_plain__unformatted = 'Displays HTML code as HTML entitie
$strTruncateQueries = 'Truncate Shown Queries'; //to translate
$strUpdComTab = 'Please see Documentation on how to update your Column_comments Table'; //to translate
+$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
$strUsersHavingAccessToDb = 'Users having access to &quot;%s&quot;'; //to translate
-$strPersian = 'Persian'; //to translate
-$strAddFields = 'Add %s field(s)'; //to translate
-$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
-$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/korean-euc-kr.inc.php b/lang/korean-euc-kr.inc.php
index bd07cd7b43..de6cf3df05 100644
--- a/lang/korean-euc-kr.inc.php
+++ b/lang/korean-euc-kr.inc.php
@@ -761,4 +761,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php
index a2fd53fdad..953d82f786 100644
--- a/lang/korean-utf-8.inc.php
+++ b/lang/korean-utf-8.inc.php
@@ -762,4 +762,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php
index 4764e78d71..3c56b16997 100644
--- a/lang/latvian-utf-8.inc.php
+++ b/lang/latvian-utf-8.inc.php
@@ -7,7 +7,6 @@
$charset = 'utf-8';
$allow_recoding = TRUE;
-$allow_recoding = TRUE;
$text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
$left_font_family = 'verdana, arial, helvetica, geneva, sans-serif';
$right_font_family = 'arial, helvetica, geneva, sans-serif';
@@ -116,7 +115,7 @@ $strCharsetOfFile = 'Tabulas kodējums:';
$strCharsets = 'Rakstzīmju kodējumi';
$strCharsetsAndCollations = 'RakstzÄ«mju kodÄ“jumi un izkÄrtojumi';
$strCheckAll = 'Iezīmēt visu';
-$strCheckOverhead = 'PÄrbaudÄ«t pÄrpildÄ«tos';
+$strCheckOverhead = 'IezÄ«mÄ“t tabulas ar pÄrtÄ“riņu';
$strCheckPrivs = 'PÄrbaudÄ«t privilÄ“Ä£ijas';
$strCheckPrivsLong = 'PÄrbaudÄ«t privilÄ“Ä£ijas uz datubÄzi &quot;%s&quot;.';
$strCheckTable = 'PÄrbaudÄ«t tabulu';
@@ -440,6 +439,7 @@ $strPdfNoTables = 'Nav tabulu';
$strPerHour = 'stundÄ';
$strPerMinute = 'minūtē';
$strPerSecond = 'sekundē';
+$strPersian = 'Persiešu';
$strPhoneBook = 'telefonu grÄmata';
$strPhp = 'Izveidot PHP kodu';
$strPmaDocumentation = 'phpMyAdmin dokumentÄcija';
@@ -487,6 +487,7 @@ $strPrivDescUsage = 'Nav privilēģiju.';
$strPrivileges = 'Privilēģijas';
$strPrivilegesReloaded = 'PrivilÄ“Ä£ijas tika veiksmÄ«gi pÄrlÄdÄ“tas.';
$strProcesslist = 'Procesu saraksts';
+$strProperties = 'Īpašības';
$strPutColNames = 'Likt kolonnu nosaukumus pirmajÄ rindÄ';
$strQBE = 'VaicÄjums pÄ“c parauga';
@@ -722,27 +723,43 @@ $strYes = 'JÄ';
$strZeroRemovesTheLimit = 'PiezÄ«me: Å o opciju uzstÄdÄ«Å¡ana uz 0 (nulli) atceļ ierobežojumus.';
$strZip = 'Arhivēts ar zip';
-$strPersian = 'Persian'; //to translate
+// To translate:
$strAddFields = 'Add %s field(s)'; //to translate
-$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
-$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+
+$strBinLogEventType = 'Event type'; //to translate
+$strBinLogInfo = 'Information'; //to translate
$strBinLogName = 'Log name'; //to translate
+$strBinLogOriginalPosition = 'Original position'; //to translate
$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
+
$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
+$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
+
+$strDBCopy = 'Copy database to'; //to translate
+
+$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
+
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
+$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
+$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
+
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
+
+$strPasswordHashing = 'Password Hashing'; //to translate
+
+$strSelectBinaryLog = 'Select binary log to view'; //to translate
+$strSwitchToDatabase = 'Switch to copied database'; //to translate
+
+$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
+
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/latvian-windows-1257.inc.php b/lang/latvian-windows-1257.inc.php
index 9661b73ba2..0c15d6ef70 100644
--- a/lang/latvian-windows-1257.inc.php
+++ b/lang/latvian-windows-1257.inc.php
@@ -6,7 +6,6 @@
*/
$charset = 'windows-1257';
-$allow_recoding = TRUE;
$text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
$left_font_family = 'verdana, arial, helvetica, geneva, sans-serif';
$right_font_family = 'arial, helvetica, geneva, sans-serif';
@@ -115,7 +114,7 @@ $strCharsetOfFile = 'Tabulas kodçjums:';
$strCharsets = 'Rakstzîmju kodçjumi';
$strCharsetsAndCollations = 'Rakstzîmju kodçjumi un izkârtojumi';
$strCheckAll = 'Iezîmçt visu';
-$strCheckOverhead = 'Pârbaudît pârpildîtos';
+$strCheckOverhead = 'Iezîmçt tabulas ar pârtçriòu';
$strCheckPrivs = 'Pârbaudît privilçìijas';
$strCheckPrivsLong = 'Pârbaudît privilçìijas uz datubâzi &quot;%s&quot;.';
$strCheckTable = 'Pârbaudît tabulu';
@@ -439,6 +438,7 @@ $strPdfNoTables = 'Nav tabulu';
$strPerHour = 'stundâ';
$strPerMinute = 'minûtç';
$strPerSecond = 'sekundç';
+$strPersian = 'Persieðu';
$strPhoneBook = 'telefonu grâmata';
$strPhp = 'Izveidot PHP kodu';
$strPmaDocumentation = 'phpMyAdmin dokumentâcija';
@@ -486,6 +486,7 @@ $strPrivDescUsage = 'Nav privilçìiju.';
$strPrivileges = 'Privilçìijas';
$strPrivilegesReloaded = 'Privilçìijas tika veiksmîgi pârlâdçtas.';
$strProcesslist = 'Procesu saraksts';
+$strProperties = 'Îpaðîbas';
$strPutColNames = 'Likt kolonnu nosaukumus pirmajâ rindâ';
$strQBE = 'Vaicâjums pçc parauga';
@@ -721,27 +722,43 @@ $strYes = 'Jâ';
$strZeroRemovesTheLimit = 'Piezîme: Ðo opciju uzstâdîðana uz 0 (nulli) atceï ierobeþojumus.';
$strZip = 'Arhivçts ar zip';
-$strPersian = 'Persian'; //to translate
+// To translate:
$strAddFields = 'Add %s field(s)'; //to translate
-$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
-$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+
+$strBinLogEventType = 'Event type'; //to translate
+$strBinLogInfo = 'Information'; //to translate
$strBinLogName = 'Log name'; //to translate
+$strBinLogOriginalPosition = 'Original position'; //to translate
$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
+
$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
+$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
+
+$strDBCopy = 'Copy database to'; //to translate
+
+$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
+
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
+$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
+$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
+
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
+
+$strPasswordHashing = 'Password Hashing'; //to translate
+
+$strSelectBinaryLog = 'Select binary log to view'; //to translate
+$strSwitchToDatabase = 'Switch to copied database'; //to translate
+
+$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
+
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php
index 82378bc641..c391219a94 100644
--- a/lang/lithuanian-utf-8.inc.php
+++ b/lang/lithuanian-utf-8.inc.php
@@ -739,4 +739,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/lithuanian-windows-1257.inc.php b/lang/lithuanian-windows-1257.inc.php
index afb46cfc36..69b3e4ebf5 100644
--- a/lang/lithuanian-windows-1257.inc.php
+++ b/lang/lithuanian-windows-1257.inc.php
@@ -738,4 +738,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/malay-iso-8859-1.inc.php b/lang/malay-iso-8859-1.inc.php
index f60b2b9395..c9f92d6029 100644
--- a/lang/malay-iso-8859-1.inc.php
+++ b/lang/malay-iso-8859-1.inc.php
@@ -762,4 +762,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php
index 453048c2da..3b3ef2e947 100644
--- a/lang/malay-utf-8.inc.php
+++ b/lang/malay-utf-8.inc.php
@@ -763,4 +763,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/norwegian-iso-8859-1.inc.php b/lang/norwegian-iso-8859-1.inc.php
index c7d64726a8..048fb82469 100644
--- a/lang/norwegian-iso-8859-1.inc.php
+++ b/lang/norwegian-iso-8859-1.inc.php
@@ -32,7 +32,7 @@ $strAddConstraints = 'Legg til begrensninger';
$strAddDeleteColumn = 'Legg til/Slett kolonne';
$strAddDeleteRow = 'Legg til/Slett kriterierad';
$strAddDropDatabase = 'Legg til DROP DATABASE';
-$strAddFields = 'Legg til %s felt(er)'; //to translate
+$strAddFields = 'Legg til %s felt(er)';
$strAddHeaderComment = 'Legg til egen kommentar i hodet (\\n lager linjeskift)';
$strAddIfNotExists = 'Legg til IF NOT EXISTS';
$strAddIntoComments = 'Legg til i kommentarer';
@@ -73,8 +73,15 @@ $strBack = 'Tilbake';
$strBaltic = 'baltisk';
$strBeginCut = 'START KUTT';
$strBeginRaw = 'START UFORMATERT';
+$strBinLogName = 'Loggnavn';
+$strBinLogPosition = 'Posisjon';
+$strBinLogEventType = 'Hendelsestype';
+$strBinLogServerId = 'Tjener ID';
+$strBinLogOriginalPosition = 'Original posisjon';
+$strBinLogInfo = 'Informasjon';
$strBinary = ' Binær ';
$strBinaryDoNotEdit = ' Binær - må ikke redigeres ';
+$strBinaryLog = 'Binærlogg';
$strBookmarkAllUsers = 'La alle brukere ha adgang til dette bokmerket';
$strBookmarkDeleted = 'Bokmerket har blitt slettet.';
$strBookmarkLabel = 'Navn';
@@ -126,6 +133,7 @@ $strColumnPrivileges = 'Kolonne-spesifikke privilegier';
$strCommand = 'Kommando';
$strComments = 'Kommentarer';
$strCommentsForTable = 'TABELLKOMMENTARER';
+$strCompatibleHashing = 'MySQL&nbsp;4.0 kompatibel';
$strCompleteInserts = 'Komplette innlegg';
$strCompression = 'Kompresjon';
$strConfigFileError = 'phpMyAdmin kunne ikke lese din konfigurasjonsfil!<br />Dette kan skje hvis PHP finner en syntaksfeil eller ikke kan finne filen.<br />Vennligst kall opp konfigurasjonsfilen direkte via linken under og les PHP feilmeldingen(e) som du vil få. I de fleste tilfeller så mangler det et anførselstegn eller et semikolon et sted.<br />Hvis du får en blank side så er alt ok.';
@@ -135,6 +143,7 @@ $strConnections = 'tilkoblinger';
$strConstraintsForDumped = 'Begrensninger for dumpede tabeller';
$strConstraintsForTable = 'Begrensninger for tabell';
$strCookiesRequired = 'Cookies må være slått på forbi dette punkt.';
+$strCopyDatabaseOK = 'Databasen %s har blitt kopiert til %s';
$strCopyTable = 'Kopier tabell til (database<b>.</b>tabell):';
$strCopyTableOK = 'Tabellen %s er kopiert til %s.';
$strCopyTableSameNames = 'Kan ikke kopiere tabellen til samme navn!';
@@ -154,6 +163,7 @@ $strCzech = 'tjekkisk';
$strCzechSlovak = 'Tjekkoslovakisk';
$strDBComment = 'Database kommentar: ';
+$strDBCopy = 'Kopier databasen til';
$strDBGContext = 'Sammenheng';
$strDBGContextID = 'Sammenhengs-ID';
$strDBGHits = 'Treff';
@@ -226,6 +236,7 @@ $strEndRaw = 'STOPP UFORMATERT';
$strEnglish = 'engelsk';
$strEnglishPrivileges = 'OBS: MySQL privilegiumnavn er på engelsk';
$strError = 'Feil';
+$strEscapeWildcards = 'Jokertegnene _ og % må beskyttes med en \ for å bruke dem direkte'; //to translate
$strEstonian = 'estisk';
$strExcelEdition = 'Excel-versjon';
$strExcelOptions = 'Excel-innstillinger';
@@ -241,7 +252,7 @@ $strFieldHasBeenDropped = 'Feltet %s har blitt slettet';
$strFields = 'Felter';
$strFieldsEmpty = ' Antall felter er tommt! ';
$strFieldsEnclosedBy = 'Felter omsluttet av';
-$strFieldsEscapedBy = 'Felter "escaped" med';
+$strFieldsEscapedBy = 'Felter beskyttet med';
$strFieldsTerminatedBy = 'Felter avsluttet med';
$strFileAlreadyExists = 'Fila %s eksisterer alt på serveren, endre navnet eller merk av for overskriving av fil.';
$strFileCouldNotBeRead = 'Fila kunne ikke leses';
@@ -433,6 +444,7 @@ $strPartialText = 'Delvis tekst';
$strPassword = 'Passord';
$strPasswordChanged = 'Passordet til %s er endret.';
$strPasswordEmpty = 'Passordet er blankt!';
+$strPasswordHashing = 'Passordnøkling';
$strPasswordNotSame = 'Passordene er ikke like!';
$strPdfDbSchema = 'Skjema for "%s"-databasen - Side %s';
$strPdfInvalidTblName = 'Tabellen "%s" eksisterer ikke!';
@@ -569,6 +581,7 @@ $strSearchType = 'Finn:';
$strSecretRequired = 'Konfigurasjonsfila trenger nå et hemmelig passordfrase (blowfish_secret).';
$strSelectADb = 'Vennligst velg en database';
$strSelectAll = 'Velg alle';
+$strSelectBinaryLog = 'Velg binærlogg for visning';
$strSelectFields = 'Velg felt (minst ett):';
$strSelectNumRows = 'i spørring';
$strSelectTables = 'Velg tabeller';
@@ -624,6 +637,7 @@ $strSubmit = 'Send';
$strSuccess = 'Kommandoen/spørringen er utført';
$strSum = 'Sum';
$strSwedish = 'svensk';
+$strSwitchToDatabase = 'Bytt til kopiert database';
$strSwitchToTable = 'Bytt til kopiert tabell';
$strTable = 'Tabell';
@@ -685,6 +699,7 @@ $strUpgrade = 'Du burde oppgradere til %s %s eller nyere.';
$strUsage = 'Bruk';
$strUseBackquotes = 'Bruk venstre anførselstegn med tabell og feltnavn';
$strUseHostTable = 'Vis vert tabell';
+$strUseTabKey = 'Bruk TAB tasten for å flytte fra verdi til verdi, eller CTRL+piltastene for å bevege deg hvor som helst';
$strUseTables = 'Bruk tabeller';
$strUseTextField = 'Bruk tekstfelt';
$strUseThisValue = 'Bruk denne verdien';
@@ -723,23 +738,14 @@ $strYes = 'Ja';
$strZeroRemovesTheLimit = 'Merk: Ved å sette disse til 0 (null) fjernes begrensningen.';
$strZip = 'Komprimert (zip)';
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php
index fe44e6d9f4..c43c970be4 100644
--- a/lang/norwegian-utf-8.inc.php
+++ b/lang/norwegian-utf-8.inc.php
@@ -33,7 +33,7 @@ $strAddConstraints = 'Legg til begrensninger';
$strAddDeleteColumn = 'Legg til/Slett kolonne';
$strAddDeleteRow = 'Legg til/Slett kriterierad';
$strAddDropDatabase = 'Legg til DROP DATABASE';
-$strAddFields = 'Legg til %s felt(er)'; //to translate
+$strAddFields = 'Legg til %s felt(er)';
$strAddHeaderComment = 'Legg til egen kommentar i hodet (\\n lager linjeskift)';
$strAddIfNotExists = 'Legg til IF NOT EXISTS';
$strAddIntoComments = 'Legg til i kommentarer';
@@ -74,8 +74,15 @@ $strBack = 'Tilbake';
$strBaltic = 'baltisk';
$strBeginCut = 'START KUTT';
$strBeginRaw = 'START UFORMATERT';
+$strBinLogName = 'Loggnavn';
+$strBinLogPosition = 'Posisjon';
+$strBinLogEventType = 'Hendelsestype';
+$strBinLogServerId = 'Tjener ID';
+$strBinLogOriginalPosition = 'Original posisjon';
+$strBinLogInfo = 'Informasjon';
$strBinary = ' Binær ';
$strBinaryDoNotEdit = ' Binær - må ikke redigeres ';
+$strBinaryLog = 'Binærlogg';
$strBookmarkAllUsers = 'La alle brukere ha adgang til dette bokmerket';
$strBookmarkDeleted = 'Bokmerket har blitt slettet.';
$strBookmarkLabel = 'Navn';
@@ -127,6 +134,7 @@ $strColumnPrivileges = 'Kolonne-spesifikke privilegier';
$strCommand = 'Kommando';
$strComments = 'Kommentarer';
$strCommentsForTable = 'TABELLKOMMENTARER';
+$strCompatibleHashing = 'MySQL&nbsp;4.0 kompatibel';
$strCompleteInserts = 'Komplette innlegg';
$strCompression = 'Kompresjon';
$strConfigFileError = 'phpMyAdmin kunne ikke lese din konfigurasjonsfil!<br />Dette kan skje hvis PHP finner en syntaksfeil eller ikke kan finne filen.<br />Vennligst kall opp konfigurasjonsfilen direkte via linken under og les PHP feilmeldingen(e) som du vil få. I de fleste tilfeller så mangler det et anførselstegn eller et semikolon et sted.<br />Hvis du får en blank side så er alt ok.';
@@ -136,6 +144,7 @@ $strConnections = 'tilkoblinger';
$strConstraintsForDumped = 'Begrensninger for dumpede tabeller';
$strConstraintsForTable = 'Begrensninger for tabell';
$strCookiesRequired = 'Cookies må være slått på forbi dette punkt.';
+$strCopyDatabaseOK = 'Databasen %s har blitt kopiert til %s';
$strCopyTable = 'Kopier tabell til (database<b>.</b>tabell):';
$strCopyTableOK = 'Tabellen %s er kopiert til %s.';
$strCopyTableSameNames = 'Kan ikke kopiere tabellen til samme navn!';
@@ -155,6 +164,7 @@ $strCzech = 'tjekkisk';
$strCzechSlovak = 'Tjekkoslovakisk';
$strDBComment = 'Database kommentar: ';
+$strDBCopy = 'Kopier databasen til';
$strDBGContext = 'Sammenheng';
$strDBGContextID = 'Sammenhengs-ID';
$strDBGHits = 'Treff';
@@ -227,6 +237,7 @@ $strEndRaw = 'STOPP UFORMATERT';
$strEnglish = 'engelsk';
$strEnglishPrivileges = 'OBS: MySQL privilegiumnavn er på engelsk';
$strError = 'Feil';
+$strEscapeWildcards = 'Jokertegnene _ og % må beskyttes med en \ for å bruke dem direkte'; //to translate
$strEstonian = 'estisk';
$strExcelEdition = 'Excel-versjon';
$strExcelOptions = 'Excel-innstillinger';
@@ -242,7 +253,7 @@ $strFieldHasBeenDropped = 'Feltet %s har blitt slettet';
$strFields = 'Felter';
$strFieldsEmpty = ' Antall felter er tommt! ';
$strFieldsEnclosedBy = 'Felter omsluttet av';
-$strFieldsEscapedBy = 'Felter "escaped" med';
+$strFieldsEscapedBy = 'Felter beskyttet med';
$strFieldsTerminatedBy = 'Felter avsluttet med';
$strFileAlreadyExists = 'Fila %s eksisterer alt på serveren, endre navnet eller merk av for overskriving av fil.';
$strFileCouldNotBeRead = 'Fila kunne ikke leses';
@@ -434,6 +445,7 @@ $strPartialText = 'Delvis tekst';
$strPassword = 'Passord';
$strPasswordChanged = 'Passordet til %s er endret.';
$strPasswordEmpty = 'Passordet er blankt!';
+$strPasswordHashing = 'Passordnøkling';
$strPasswordNotSame = 'Passordene er ikke like!';
$strPdfDbSchema = 'Skjema for "%s"-databasen - Side %s';
$strPdfInvalidTblName = 'Tabellen "%s" eksisterer ikke!';
@@ -570,6 +582,7 @@ $strSearchType = 'Finn:';
$strSecretRequired = 'Konfigurasjonsfila trenger nå et hemmelig passordfrase (blowfish_secret).';
$strSelectADb = 'Vennligst velg en database';
$strSelectAll = 'Velg alle';
+$strSelectBinaryLog = 'Velg binærlogg for visning';
$strSelectFields = 'Velg felt (minst ett):';
$strSelectNumRows = 'i spørring';
$strSelectTables = 'Velg tabeller';
@@ -625,6 +638,7 @@ $strSubmit = 'Send';
$strSuccess = 'Kommandoen/spørringen er utført';
$strSum = 'Sum';
$strSwedish = 'svensk';
+$strSwitchToDatabase = 'Bytt til kopiert database';
$strSwitchToTable = 'Bytt til kopiert tabell';
$strTable = 'Tabell';
@@ -686,6 +700,7 @@ $strUpgrade = 'Du burde oppgradere til %s %s eller nyere.';
$strUsage = 'Bruk';
$strUseBackquotes = 'Bruk venstre anførselstegn med tabell og feltnavn';
$strUseHostTable = 'Vis vert tabell';
+$strUseTabKey = 'Bruk TAB tasten for å flytte fra verdi til verdi, eller CTRL+piltastene for å bevege deg hvor som helst';
$strUseTables = 'Bruk tabeller';
$strUseTextField = 'Bruk tekstfelt';
$strUseThisValue = 'Bruk denne verdien';
@@ -724,23 +739,14 @@ $strYes = 'Ja';
$strZeroRemovesTheLimit = 'Merk: Ved å sette disse til 0 (null) fjernes begrensningen.';
$strZip = 'Komprimert (zip)';
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php
index fc0349d0cf..1d6b082efe 100644
--- a/lang/persian-utf-8.inc.php
+++ b/lang/persian-utf-8.inc.php
@@ -768,4 +768,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/persian-windows-1256.inc.php b/lang/persian-windows-1256.inc.php
index 2f3877a7fa..653c6b518a 100644
--- a/lang/persian-windows-1256.inc.php
+++ b/lang/persian-windows-1256.inc.php
@@ -767,4 +767,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/polish-iso-8859-2.inc.php b/lang/polish-iso-8859-2.inc.php
index 9f2c961aca..9bb524ec62 100644
--- a/lang/polish-iso-8859-2.inc.php
+++ b/lang/polish-iso-8859-2.inc.php
@@ -28,6 +28,7 @@ $strAddConstraints = 'Dodanie ograniczeñ';
$strAddDeleteColumn = 'Dodanie/usuniêcie pól';
$strAddDeleteRow = 'Dodanie/usuniêcie wierszy kryteriów';
$strAddDropDatabase = 'Dodanie DROP DATABASE';
+$strAddFields = 'Dodanie %s pól';
$strAddHeaderComment = 'Dodanie do nag³ówka w³asnego komentarza (\\n oddziela linie)';
$strAddIfNotExists = 'Dodanie IF NOT EXISTS';
$strAddIntoComments = 'Dodanie do komentarzy';
@@ -55,6 +56,7 @@ $strAnd = 'Oraz';
$strAny = 'Dowolny';
$strAnyHost = 'Dowolny host';
$strAnyUser = 'Dowolny u¿ytkownik';
+$strApproximateCount = 'Byæ mo¿e w przybli¿eniu. Zobacz FAQ 3.11';
$strArabic = 'Arabski';
$strArmenian = 'Ormiañski';
$strAscending = 'Rosn±co';
@@ -68,8 +70,15 @@ $strBack = 'Powrót';
$strBaltic = 'Ba³tycki';
$strBeginCut = 'TNIJ ST¡D';
$strBeginRaw = 'SUROWE DANE ST¡D';
+$strBinLogEventType = 'Typ zdarzenia';
+$strBinLogInfo = 'Informacje';
+$strBinLogName = 'Nazwa dziennika';
+$strBinLogOriginalPosition = 'Oryginalna pozycja';
+$strBinLogPosition = 'Pozycja';
+$strBinLogServerId = 'ID serwera';
$strBinary = ' Binarne ';
$strBinaryDoNotEdit = ' Binarne - nie do edycji ';
+$strBinaryLog = 'Dziennik binarny';
$strBookmarkAllUsers = 'Pozwolenie na dostêp do zapytania przez ka¿dego u¿ytkownika';
$strBookmarkDeleted = 'Zapamiêtane zapytanie SQL zosta³o usuniête.';
$strBookmarkLabel = 'Nazwa';
@@ -121,6 +130,7 @@ $strColumnPrivileges = 'Uprawnienia specyficzne dla kolumn';
$strCommand = 'Polecenie';
$strComments = 'Komentarze';
$strCommentsForTable = 'KOMENTARZE TABELI';
+$strCompatibleHashing = 'Kompatybilny z MySQL-em&nbsp;4.0';
$strCompleteInserts = 'Pe³ne dodania';
$strCompression = 'Kompresja';
$strConfigFileError = 'phpMyAdmin nie zdo³a³ odczytaæ Twojego pliku konfiguracji!<br />Mo¿e siê to zdarzyæ, je¶li php znajdzie w nim b³±d sk³adniowy lub nie mo¿e znale¼æ tego pliku.<br />Proszê wywo³aæ bezpo¶rednio plik konfiguracyjny u¿ywaj±c poni¿szego linku i odczytaæ otrzymane komunikat(y) o b³êdach. W wiêkszo¶ci przypadków brakuje gdzie¶ cudzys³owu lub ¶rednika.<br />Je¿eli otrzymasz pust± stronê, wszystko jest w porz±dku.';
@@ -130,6 +140,7 @@ $strConnections = 'Po³±czenia';
$strConstraintsForDumped = 'Ograniczenia dla zrzutów tabel';
$strConstraintsForTable = 'Ograniczenia dla tabeli';
$strCookiesRequired = 'Odt±d musi byæ w³±czona obs³uga "cookies".';
+$strCopyDatabaseOK = 'Baza danych %s zosta³a skopiowana do %s';
$strCopyTable = 'Skopiuj tabelê do (bazadanych<b>.</b>tabela):';
$strCopyTableOK = 'Tabela %s zosta³a skopiowana do %s.';
$strCopyTableSameNames = 'Nie mo¿na skopiowaæ tabeli do niej samej!';
@@ -149,6 +160,7 @@ $strCzech = 'Czeski';
$strCzechSlovak = 'Czesko-s³owacki';
$strDBComment = 'Komentarz bazy danych: ';
+$strDBCopy = 'Kopiowanie bazy danych do';
$strDBGContext = 'Kontekst';
$strDBGContextID = 'ID kontekstu';
$strDBGHits = 'Trafienia';
@@ -212,7 +224,7 @@ $strEditPDFPages = 'Edycja stron PDF';
$strEditPrivileges = 'Edycja uprawnieñ';
$strEffective = 'Efektywne';
$strEmpty = 'Wyczyszczenie';
-$strEmptyResultSet = 'MySQL zwróci³ pusty wynik (np. zero rekordów).';
+$strEmptyResultSet = 'MySQL zwróci³ pusty wynik (zero rekordów).';
$strEnabled = 'w³±czone';
$strEncloseInTransaction = 'Objêcie eksportu transakcj±';
$strEnd = 'Koniec';
@@ -221,6 +233,7 @@ $strEndRaw = 'SUROWE DANE DOT¡D';
$strEnglish = 'Angielski';
$strEnglishPrivileges = ' Uwaga: Uprawnienia MySQL s± oznaczone w jêz. angielskim ';
$strError = 'B³±d';
+$strEscapeWildcards = 'Symbole wieloznaczne _ i % powinny zostaæ poprzedzone znakiem, aby u¿yæ ich w znaczeniu dos³ownym';
$strEstonian = 'Estoñski';
$strExcelEdition = 'Wydanie Excela';
$strExcelOptions = 'Opcje Excela';
@@ -290,11 +303,16 @@ $strIndex = 'Indeks';
$strIndexHasBeenDropped = 'Klucz %s zosta³ usuniêty';
$strIndexName = 'Nazwa indeksu :';
$strIndexType = 'Rodzaj indeksu :';
+$strIndexWarningMultiple = 'Dla kolumny `%s` zosta³o utworzonych wiele indeksów';
+$strIndexWarningPrimary = 'Klucze PRIMARY i INDEX nie powinny dotyczyæ tej samej kolumny `%s`';
+$strIndexWarningTable = 'Problemy z indeksami tabeli `%s`';
+$strIndexWarningUnique = 'Klucze UNIQUE i INDEX nie powinny dotyczyæ tej samej kolumny `%s`';
$strIndexes = 'Indeksy';
$strInnodbStat = 'Status InnoDB';
$strInsecureMySQL = 'Twój plik konfiguracyjny zawiera ustawienia (konto roota bez has³a), które odpowiadaj± domy¶lnemu uprzywilejowanemu kontu MySQL. Twój serwer MySQL dzia³a z takim domy¶lnym ustawieniem, jest otwarty dla w³amywaczy i naprawdê ta luka w bezpieczeñstwie powinna zostaæ naprawiona.';
$strInsert = 'Dodanie';
$strInsertAsNewRow = 'Dodanie jako nowego rekordu';
+$strInsertBookmarkTitle = 'Proszê wprowadziæ tytu³ zapamiêtanego zapytania';
$strInsertNewRow = 'Dodanie nowego rekordu';
$strInsertTextfiles = 'Dodanie pliku tekstowego do tabeli';
$strInsertedRowId = 'Id wstawionego wiersza:';
@@ -376,6 +394,7 @@ $strName = 'Nazwa';
$strNeedPrimaryKey = 'Nale¿y zdefiniowaæ klucz podstawowy dla tej tabeli.';
$strNext = 'Nastêpne';
$strNo = 'Nie';
+$strNoActivity = 'Brak aktywno¶ci przez co najmniej %s sekund, proszê zalogowaæ siê jeszcze raz';
$strNoDatabases = 'Brak baz danych';
$strNoDatabasesSelected = '¯adna baza danych nie zosta³ wybrana.';
$strNoDescription = 'brak opisu';
@@ -395,6 +414,7 @@ $strNoRights = 'Brak wystarczaj±cych uprawnieñ!';
$strNoRowsSelected = '¯aden wiersz nie zosta³ zaznaczony';
$strNoSpace = 'Brak miejsca na zapis pliku %s.';
$strNoTablesFound = 'Nie znaleziono tabeli w bazie danych.';
+$strNoThemeSupport = 'Brak obs³ugi motywów graficznych, proszê sprawdziæ konfiguracjê i/lub motywy graficzne w katalogu %s.';
$strNoUsersFound = 'Nie znaleziono u¿ytkownika(ów).';
$strNoValidateSQL = 'Pomiñ sprawdzanie poprawno¶ci SQL';
$strNone = 'Brak';
@@ -426,6 +446,7 @@ $strPartialText = 'Skrócony tekst';
$strPassword = 'Has³o';
$strPasswordChanged = 'Has³o dla %s zosta³o pomy¶lnie zmienione.';
$strPasswordEmpty = 'Puste has³o!';
+$strPasswordHashing = 'Sposób kodowania hase³';
$strPasswordNotSame = 'Has³a nie s± identyczne!';
$strPdfDbSchema = 'Schemat bazy danych "%s" - strona %s';
$strPdfInvalidTblName = 'Tabela "%s" nie istnieje!';
@@ -562,6 +583,7 @@ $strSearchType = 'Znajd¼:';
$strSecretRequired = 'Plik konfiguracyjny wymaga teraz tajnej frazy koduj±cej (blowfish_secret).';
$strSelectADb = 'Proszê wybraæ bazê danych';
$strSelectAll = 'Zaznaczenie wszystkich';
+$strSelectBinaryLog = 'Wybierz dziennik binary do podgl±du';
$strSelectFields = 'Wybór pól (co najmniej jedno):';
$strSelectNumRows = 'w zapytaniu';
$strSelectTables = 'Wybierz tabele';
@@ -617,6 +639,7 @@ $strSubmit = 'Wys³anie';
$strSuccess = 'Zapytanie SQL zosta³o pomy¶lnie wykonane';
$strSum = 'Suma';
$strSwedish = 'Szwedzki';
+$strSwitchToDatabase = 'Prze³±cz do skopiowanej bazy danych';
$strSwitchToTable = 'Prze³±czenie na skopiowan± tabelê';
$strTable = 'Tabela';
@@ -678,6 +701,7 @@ $strUpgrade = 'Poleca siê aktualizacjê do %s w wersji %s lub pó¼niejszej.';
$strUsage = 'Wykorzystanie';
$strUseBackquotes = 'U¿ycie cudzys³owów z nazwami tabel i pól';
$strUseHostTable = 'U¿ycie tabeli hostów';
+$strUseTabKey = 'Klawisz TAB przemieszcza pomiêdzy warto¶cami, CTRL+strza³ka przenosi w dowolne miejsce';
$strUseTables = 'U¿ycie tabel';
$strUseTextField = 'U¿ycie pola tekstowego';
$strUseThisValue = 'U¿ycie tej warto¶ci';
@@ -716,26 +740,8 @@ $strYes = 'Tak';
$strZeroRemovesTheLimit = 'Uwaga: Ustawienie tych opcji na 0 (zero) usuwa ograniczenie.';
$strZip = '".zip"';
-$strAddFields = 'Add %s field(s)'; //to translate
-$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
-$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php
index 9c0b348ef8..388e39c394 100644
--- a/lang/polish-utf-8.inc.php
+++ b/lang/polish-utf-8.inc.php
@@ -29,6 +29,7 @@ $strAddConstraints = 'Dodanie ograniczeń';
$strAddDeleteColumn = 'Dodanie/usunięcie pól';
$strAddDeleteRow = 'Dodanie/usunięcie wierszy kryteriów';
$strAddDropDatabase = 'Dodanie DROP DATABASE';
+$strAddFields = 'Dodanie %s pól';
$strAddHeaderComment = 'Dodanie do nagłówka własnego komentarza (\\n oddziela linie)';
$strAddIfNotExists = 'Dodanie IF NOT EXISTS';
$strAddIntoComments = 'Dodanie do komentarzy';
@@ -56,6 +57,7 @@ $strAnd = 'Oraz';
$strAny = 'Dowolny';
$strAnyHost = 'Dowolny host';
$strAnyUser = 'Dowolny użytkownik';
+$strApproximateCount = 'Być może w przybliżeniu. Zobacz FAQ 3.11';
$strArabic = 'Arabski';
$strArmenian = 'Ormiański';
$strAscending = 'RosnÄ…co';
@@ -69,8 +71,15 @@ $strBack = 'Powrót';
$strBaltic = 'Bałtycki';
$strBeginCut = 'TNIJ STÄ„D';
$strBeginRaw = 'SUROWE DANE STÄ„D';
+$strBinLogEventType = 'Typ zdarzenia';
+$strBinLogInfo = 'Informacje';
+$strBinLogName = 'Nazwa dziennika';
+$strBinLogOriginalPosition = 'Oryginalna pozycja';
+$strBinLogPosition = 'Pozycja';
+$strBinLogServerId = 'ID serwera';
$strBinary = ' Binarne ';
$strBinaryDoNotEdit = ' Binarne - nie do edycji ';
+$strBinaryLog = 'Dziennik binarny';
$strBookmarkAllUsers = 'Pozwolenie na dostęp do zapytania przez każdego użytkownika';
$strBookmarkDeleted = 'Zapamiętane zapytanie SQL zostało usunięte.';
$strBookmarkLabel = 'Nazwa';
@@ -122,6 +131,7 @@ $strColumnPrivileges = 'Uprawnienia specyficzne dla kolumn';
$strCommand = 'Polecenie';
$strComments = 'Komentarze';
$strCommentsForTable = 'KOMENTARZE TABELI';
+$strCompatibleHashing = 'Kompatybilny z MySQL-em&nbsp;4.0';
$strCompleteInserts = 'Pełne dodania';
$strCompression = 'Kompresja';
$strConfigFileError = 'phpMyAdmin nie zdołał odczytać Twojego pliku konfiguracji!<br />Może się to zdarzyć, jeśli php znajdzie w nim błąd składniowy lub nie może znaleźć tego pliku.<br />Proszę wywołać bezpośrednio plik konfiguracyjny używając poniższego linku i odczytać otrzymane komunikat(y) o błędach. W większości przypadków brakuje gdzieś cudzysłowu lub średnika.<br />Jeżeli otrzymasz pustą stronę, wszystko jest w porządku.';
@@ -131,6 +141,7 @@ $strConnections = 'Połączenia';
$strConstraintsForDumped = 'Ograniczenia dla zrzutów tabel';
$strConstraintsForTable = 'Ograniczenia dla tabeli';
$strCookiesRequired = 'Odtąd musi być włączona obsługa "cookies".';
+$strCopyDatabaseOK = 'Baza danych %s została skopiowana do %s';
$strCopyTable = 'Skopiuj tabelÄ™ do (bazadanych<b>.</b>tabela):';
$strCopyTableOK = 'Tabela %s została skopiowana do %s.';
$strCopyTableSameNames = 'Nie można skopiować tabeli do niej samej!';
@@ -150,6 +161,7 @@ $strCzech = 'Czeski';
$strCzechSlovak = 'Czesko-słowacki';
$strDBComment = 'Komentarz bazy danych: ';
+$strDBCopy = 'Kopiowanie bazy danych do';
$strDBGContext = 'Kontekst';
$strDBGContextID = 'ID kontekstu';
$strDBGHits = 'Trafienia';
@@ -213,7 +225,7 @@ $strEditPDFPages = 'Edycja stron PDF';
$strEditPrivileges = 'Edycja uprawnień';
$strEffective = 'Efektywne';
$strEmpty = 'Wyczyszczenie';
-$strEmptyResultSet = 'MySQL zwrócił pusty wynik (np. zero rekordów).';
+$strEmptyResultSet = 'MySQL zwrócił pusty wynik (zero rekordów).';
$strEnabled = 'włączone';
$strEncloseInTransaction = 'Objęcie eksportu transakcją';
$strEnd = 'Koniec';
@@ -222,6 +234,7 @@ $strEndRaw = 'SUROWE DANE DOTÄ„D';
$strEnglish = 'Angielski';
$strEnglishPrivileges = ' Uwaga: Uprawnienia MySQL są oznaczone w jęz. angielskim ';
$strError = 'BÅ‚Ä…d';
+$strEscapeWildcards = 'Symbole wieloznaczne _ i % powinny zostać poprzedzone znakiem, aby użyć ich w znaczeniu dosłownym';
$strEstonian = 'Estoński';
$strExcelEdition = 'Wydanie Excela';
$strExcelOptions = 'Opcje Excela';
@@ -291,11 +304,16 @@ $strIndex = 'Indeks';
$strIndexHasBeenDropped = 'Klucz %s został usunięty';
$strIndexName = 'Nazwa indeksu :';
$strIndexType = 'Rodzaj indeksu :';
+$strIndexWarningMultiple = 'Dla kolumny `%s` zostało utworzonych wiele indeksów';
+$strIndexWarningPrimary = 'Klucze PRIMARY i INDEX nie powinny dotyczyć tej samej kolumny `%s`';
+$strIndexWarningTable = 'Problemy z indeksami tabeli `%s`';
+$strIndexWarningUnique = 'Klucze UNIQUE i INDEX nie powinny dotyczyć tej samej kolumny `%s`';
$strIndexes = 'Indeksy';
$strInnodbStat = 'Status InnoDB';
$strInsecureMySQL = 'Twój plik konfiguracyjny zawiera ustawienia (konto roota bez hasła), które odpowiadają domyślnemu uprzywilejowanemu kontu MySQL. Twój serwer MySQL działa z takim domyślnym ustawieniem, jest otwarty dla włamywaczy i naprawdę ta luka w bezpieczeństwie powinna zostać naprawiona.';
$strInsert = 'Dodanie';
$strInsertAsNewRow = 'Dodanie jako nowego rekordu';
+$strInsertBookmarkTitle = 'Proszę wprowadzić tytuł zapamiętanego zapytania';
$strInsertNewRow = 'Dodanie nowego rekordu';
$strInsertTextfiles = 'Dodanie pliku tekstowego do tabeli';
$strInsertedRowId = 'Id wstawionego wiersza:';
@@ -377,6 +395,7 @@ $strName = 'Nazwa';
$strNeedPrimaryKey = 'Należy zdefiniować klucz podstawowy dla tej tabeli.';
$strNext = 'Następne';
$strNo = 'Nie';
+$strNoActivity = 'Brak aktywności przez co najmniej %s sekund, proszę zalogować się jeszcze raz';
$strNoDatabases = 'Brak baz danych';
$strNoDatabasesSelected = 'Żadna baza danych nie został wybrana.';
$strNoDescription = 'brak opisu';
@@ -396,6 +415,7 @@ $strNoRights = 'Brak wystarczających uprawnień!';
$strNoRowsSelected = 'Żaden wiersz nie został zaznaczony';
$strNoSpace = 'Brak miejsca na zapis pliku %s.';
$strNoTablesFound = 'Nie znaleziono tabeli w bazie danych.';
+$strNoThemeSupport = 'Brak obsługi motywów graficznych, proszę sprawdzić konfigurację i/lub motywy graficzne w katalogu %s.';
$strNoUsersFound = 'Nie znaleziono użytkownika(ów).';
$strNoValidateSQL = 'Pomiń sprawdzanie poprawności SQL';
$strNone = 'Brak';
@@ -427,6 +447,7 @@ $strPartialText = 'Skrócony tekst';
$strPassword = 'Hasło';
$strPasswordChanged = 'Hasło dla %s zostało pomyślnie zmienione.';
$strPasswordEmpty = 'Puste hasło!';
+$strPasswordHashing = 'Sposób kodowania haseł';
$strPasswordNotSame = 'Hasła nie są identyczne!';
$strPdfDbSchema = 'Schemat bazy danych "%s" - strona %s';
$strPdfInvalidTblName = 'Tabela "%s" nie istnieje!';
@@ -563,6 +584,7 @@ $strSearchType = 'Znajdź:';
$strSecretRequired = 'Plik konfiguracyjny wymaga teraz tajnej frazy kodujÄ…cej (blowfish_secret).';
$strSelectADb = 'Proszę wybrać bazę danych';
$strSelectAll = 'Zaznaczenie wszystkich';
+$strSelectBinaryLog = 'Wybierz dziennik binary do podglÄ…du';
$strSelectFields = 'Wybór pól (co najmniej jedno):';
$strSelectNumRows = 'w zapytaniu';
$strSelectTables = 'Wybierz tabele';
@@ -618,6 +640,7 @@ $strSubmit = 'Wysłanie';
$strSuccess = 'Zapytanie SQL zostało pomyślnie wykonane';
$strSum = 'Suma';
$strSwedish = 'Szwedzki';
+$strSwitchToDatabase = 'Przełącz do skopiowanej bazy danych';
$strSwitchToTable = 'Przełączenie na skopiowaną tabelę';
$strTable = 'Tabela';
@@ -679,6 +702,7 @@ $strUpgrade = 'Poleca się aktualizację do %s w wersji %s lub późniejszej.';
$strUsage = 'Wykorzystanie';
$strUseBackquotes = 'Użycie cudzysłowów z nazwami tabel i pól';
$strUseHostTable = 'Użycie tabeli hostów';
+$strUseTabKey = 'Klawisz TAB przemieszcza pomiędzy wartoścami, CTRL+strzałka przenosi w dowolne miejsce';
$strUseTables = 'Użycie tabel';
$strUseTextField = 'Użycie pola tekstowego';
$strUseThisValue = 'Użycie tej wartości';
@@ -717,26 +741,8 @@ $strYes = 'Tak';
$strZeroRemovesTheLimit = 'Uwaga: Ustawienie tych opcji na 0 (zero) usuwa ograniczenie.';
$strZip = '".zip"';
-$strAddFields = 'Add %s field(s)'; //to translate
-$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
-$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/portuguese-iso-8859-1.inc.php b/lang/portuguese-iso-8859-1.inc.php
index 118ea70f34..d507adb96e 100644
--- a/lang/portuguese-iso-8859-1.inc.php
+++ b/lang/portuguese-iso-8859-1.inc.php
@@ -758,4 +758,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php
index 568f06e62a..44c8834a67 100644
--- a/lang/portuguese-utf-8.inc.php
+++ b/lang/portuguese-utf-8.inc.php
@@ -759,4 +759,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/romanian-iso-8859-1.inc.php b/lang/romanian-iso-8859-1.inc.php
index 0c137632f7..41379a5ad4 100644
--- a/lang/romanian-iso-8859-1.inc.php
+++ b/lang/romanian-iso-8859-1.inc.php
@@ -739,4 +739,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php
index ceedc9e88a..c06d26ff67 100644
--- a/lang/romanian-utf-8.inc.php
+++ b/lang/romanian-utf-8.inc.php
@@ -740,4 +740,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/russian-cp-866.inc.php b/lang/russian-cp-866.inc.php
index 348cb32c79..bc0bf263b0 100644
--- a/lang/russian-cp-866.inc.php
+++ b/lang/russian-cp-866.inc.php
@@ -746,4 +746,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/russian-koi8-r.inc.php b/lang/russian-koi8-r.inc.php
index 39272df2f0..912e79a8ff 100644
--- a/lang/russian-koi8-r.inc.php
+++ b/lang/russian-koi8-r.inc.php
@@ -746,4 +746,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php
index 9632afb972..5b2fecf186 100644
--- a/lang/russian-utf-8.inc.php
+++ b/lang/russian-utf-8.inc.php
@@ -747,4 +747,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/russian-windows-1251.inc.php b/lang/russian-windows-1251.inc.php
index 7df994f4c9..c4f869778d 100644
--- a/lang/russian-windows-1251.inc.php
+++ b/lang/russian-windows-1251.inc.php
@@ -746,4 +746,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php
index f51bab2782..580be6f529 100644
--- a/lang/serbian_cyrillic-utf-8.inc.php
+++ b/lang/serbian_cyrillic-utf-8.inc.php
@@ -35,6 +35,7 @@ $strAddConstraints = 'Додај ограничења';
$strAddDeleteColumn = 'Додај/обриши колону';
$strAddDeleteRow = 'Додај/обриши поље за критеријум';
$strAddDropDatabase = 'Додај DROP DATABASE';
+$strAddFields = 'Додај %s поља';
$strAddHeaderComment = 'Додај коментар у заглавље (\\n раздваја линије)';
$strAddIfNotExists = 'Додај \'IF NOT EXISTS\'';
$strAddIntoComments = 'Додај у коментаре';
@@ -62,6 +63,7 @@ $strAnd = 'и';
$strAny = 'Било који';
$strAnyHost = 'Било који домаћин';
$strAnyUser = 'Било који кориÑник';
+$strApproximateCount = 'Може бити приближно. Видите FAQ 3.11';
$strArabic = 'ÐрапÑки';
$strArmenian = 'ЈерменÑки';
$strAscending = 'РаÑтући';
@@ -75,8 +77,15 @@ $strBack = 'Ðазад';
$strBaltic = 'Балтички';
$strBeginCut = 'ПОЧЕТÐК РЕЗ';
$strBeginRaw = 'ПОЧЕТÐК СИРОВО';
+$strBinLogEventType = 'Ð’Ñ€Ñта догађаја';
+$strBinLogInfo = 'Информације';
+$strBinLogName = 'Ðазив дневника';
+$strBinLogOriginalPosition = 'Оригинална позиција';
+$strBinLogPosition = 'Позиција';
+$strBinLogServerId = 'ИД Ñервера';
$strBinary = 'Бинарни';
$strBinaryDoNotEdit = 'Бинарни - не мењај';
+$strBinaryLog = 'Бинарни дневник';
$strBookmarkAllUsers = 'Дозволи Ñваком кориÑнику да приÑтупа овом упамћеном упиту';
$strBookmarkDeleted = 'Обележивач је управо обриÑан.';
$strBookmarkLabel = 'Ðазив';
@@ -128,6 +137,7 @@ $strColumnPrivileges = 'Привилегије везане за колоне';
$strCommand = 'Ðаредба';
$strComments = 'Коментари';
$strCommentsForTable = 'КОМЕÐТÐРИ ТÐБЕЛЕ';
+$strCompatibleHashing = 'MySQL&nbsp;4.0 компатибилно';
$strCompleteInserts = 'Комплетан INSERT (Ñа именима поља)';
$strCompression = 'КомпреÑија';
$strConfigFileError = 'phpMyAdmin није могао да прочита вашу конфигурациону датотеку!<br />Ово Ñе може деÑити ако PHP нађе грешку у процеÑирању или не може да пронађе датотеку.<br />Позовите конфигурациону датотеку директно кориÑтећи доњи линк и прочитајте поруке о грешци које добијате. У већини Ñлучајеве негде недоÑтаје наводник или тачка-зарез.<br />Ðко добијете празну Ñтрану, Ñве је у реду.';
@@ -137,6 +147,7 @@ $strConnections = 'Конекције';
$strConstraintsForDumped = 'Ограничења за извезене табеле';
$strConstraintsForTable = 'Ограничења за табеле';
$strCookiesRequired = 'Колачићи (Cookies) морају у овом Ñлучају бити активни.';
+$strCopyDatabaseOK = 'База %s је прекопирана у %s';
$strCopyTable = 'Копирај табелу у (база<b>.</b>табела):';
$strCopyTableOK = 'Табела %s је копирана у %s.';
$strCopyTableSameNames = 'Ðе могу да копирам табелу у Ñаму Ñебе!';
@@ -156,6 +167,7 @@ $strCzech = 'Чешки';
$strCzechSlovak = 'Чешко-Ñловачки';
$strDBComment = 'Коментар базе:';
+$strDBCopy = 'Копирај базу у';
$strDBGContext = 'КонтекÑÑ‚';
$strDBGContextID = 'КонтекÑÑ‚ ИД';
$strDBGHits = 'Погодака';
@@ -228,6 +240,7 @@ $strEndRaw = 'КРÐЈ СИРОВО';
$strEnglish = 'ЕнглеÑки';
$strEnglishPrivileges = ' Ðапомена: MySQL имена привилегија морају да буду на енглеÑком ';
$strError = 'Грешка';
+$strEscapeWildcards = 'Пре џокера _ и % треба Ñтавити знак \ ако их кориÑтите ÑамоÑтално';
$strEstonian = 'ЕÑтонÑки';
$strExcelEdition = 'Excel издање';
$strExcelOptions = 'Excel опције';
@@ -297,11 +310,16 @@ $strIndex = 'Кључ';
$strIndexHasBeenDropped = 'Кључ %s је обриÑан';
$strIndexName = 'Име кључа :';
$strIndexType = 'Тип кључа :';
+$strIndexWarningMultiple = 'Више од једног %s кључа је направљено за колону `%s`';
+$strIndexWarningPrimary = 'PRIMARY и INDEX кључеви не би требали да буду иÑтовремено поÑтављени за колону `%s`';
+$strIndexWarningTable = 'Проблем при индекÑирању табеле `%s`';
+$strIndexWarningUnique = 'UNIQUE и INDEX кључеви не би требали да буду иÑтовремено поÑтављени за колону `%s`';
$strIndexes = 'Кључеви';
$strInnodbStat = 'InnoDB ÑтатуÑ';
$strInsecureMySQL = 'Ваша конфигурациона датотека Ñадржи подешавања (root без лозинке) која одговарају Ñтандардном MySQL привилегованом налогу. Ваш MySQL Ñервер ради Ñа овим подешавањима, отворен је за упаде, и заиÑта треба да иÑправите овај ÑигурноÑни ризик.';
$strInsert = 'Ðови запиÑ';
$strInsertAsNewRow = 'УнеÑи као нови ред';
+$strInsertBookmarkTitle = 'Молимо унеÑите назив маркера';
$strInsertNewRow = 'УнеÑи нови ред';
$strInsertTextfiles = 'Увези податке из текÑтуалне датотеке';
$strInsertedRowId = 'ID уметнутих редова:';
@@ -383,6 +401,7 @@ $strName = 'Име';
$strNeedPrimaryKey = 'Требало би да дефинишете примарни кључ за ову табелу.';
$strNext = 'Следећи';
$strNo = 'Ðе';
+$strNoActivity = 'Ðије било активноÑти %s или више Ñекунди, молимо пријавите Ñе поново';
$strNoDatabases = 'База не поÑтоји';
$strNoDatabasesSelected = 'Ðије изабрана ни једна база.';
$strNoDescription = 'нема опиÑа';
@@ -402,6 +421,7 @@ $strNoRights = 'Ðије Вам дозвољено да будете овде!';
$strNoRowsSelected = 'Ðема одабраних редова';
$strNoSpace = 'Ðедовољно проÑтора за Ñнимање датотеке %s.';
$strNoTablesFound = 'Табеле ниÑу пронађене у бази.';
+$strNoThemeSupport = 'Ðема подршке за теме, молимо проверите конфигурацију и/или теме у директоријуму %s.';
$strNoUsersFound = 'КориÑник није нађен.';
$strNoValidateSQL = 'ПреÑкочи проверу SQL-a';
$strNone = 'нема';
@@ -433,6 +453,7 @@ $strPartialText = 'Део текÑта';
$strPassword = 'Лозинка';
$strPasswordChanged = 'Лозинка за %s је уÑпешно промењена.';
$strPasswordEmpty = 'Лозинка је празна!';
+$strPasswordHashing = 'Хеширање лозинке';
$strPasswordNotSame = 'Лозинке ниÑу идентичне!';
$strPdfDbSchema = 'Схема базе "%s" - Страна %s';
$strPdfInvalidTblName = 'Табела "%s" не поÑтоји!';
@@ -569,6 +590,7 @@ $strSearchType = 'Тражи:';
$strSecretRequired = 'Конфигурациона датотека захтева тајну лозинку (blowfish_secret).';
$strSelectADb = 'Изаберите базу';
$strSelectAll = 'Изабери Ñве';
+$strSelectBinaryLog = 'Изаберите бинарни дневник за преглед';
$strSelectFields = 'Изабери поља (најмање једно)';
$strSelectNumRows = 'у упиту';
$strSelectTables = 'Изабери табеле';
@@ -624,6 +646,7 @@ $strSubmit = 'Пошаљи';
$strSuccess = 'Ваш SQL упит је уÑпешно извршен';
$strSum = 'Укупно';
$strSwedish = 'ШведÑки';
+$strSwitchToDatabase = 'Пребаци Ñе на копирану базу';
$strSwitchToTable = 'Пређи на копирану табелу';
$strTable = 'Табела';
@@ -685,6 +708,7 @@ $strUpgrade = 'Требало би да унапредите ваш %s ÑервÐ
$strUsage = 'Заузеће';
$strUseBackquotes = 'КориÑти \' за ограничавање имена поља';
$strUseHostTable = 'КориÑти табелу домаћина';
+$strUseTabKey = 'КориÑтите TAB таÑтер за померање од поља до поља, или CTRL+Ñтрелице за Ñлободно померање';
$strUseTables = 'КориÑти табеле';
$strUseTextField = 'КориÑти текÑÑ‚ поље';
$strUseThisValue = 'КориÑти ову вредноÑÑ‚';
@@ -723,26 +747,8 @@ $strYes = 'Да';
$strZeroRemovesTheLimit = 'Ðапомена: ПоÑтављање ових опција на 0 (нулу) уклања ограничења.';
$strZip = '"зиповано"';
-$strAddFields = 'Add %s field(s)'; //to translate
-$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
-$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/serbian_cyrillic-windows-1251.inc.php b/lang/serbian_cyrillic-windows-1251.inc.php
index 96b51e1475..76b48ca851 100644
--- a/lang/serbian_cyrillic-windows-1251.inc.php
+++ b/lang/serbian_cyrillic-windows-1251.inc.php
@@ -34,6 +34,7 @@ $strAddConstraints = 'Äîä༠îãðàíè÷åœà';
$strAddDeleteColumn = 'Äîäà¼/îáðèøè êîëîíó';
$strAddDeleteRow = 'Äîäà¼/îáðèøè ïîšå çà êðèòåðè¼óì';
$strAddDropDatabase = 'Äîä༠DROP DATABASE';
+$strAddFields = 'Äîä༠%s ïîšà';
$strAddHeaderComment = 'Äîä༠êîìåíòàð ó çàãëàâšå (\\n ðàçäâà¼à ëèíè¼å)';
$strAddIfNotExists = 'Äîä༠\'IF NOT EXISTS\'';
$strAddIntoComments = 'Äîä༠ó êîìåíòàðå';
@@ -61,6 +62,7 @@ $strAnd = 'è';
$strAny = 'Áèëî êî¼è';
$strAnyHost = 'Áèëî êî¼è äîìàžèí';
$strAnyUser = 'Áèëî êî¼è êîðèñíèê';
+$strApproximateCount = 'Ìîæå áèòè ïðèáëèæíî. Âèäèòå FAQ 3.11';
$strArabic = 'Àðàïñêè';
$strArmenian = '£åðìåíñêè';
$strAscending = 'Ðàñòóžè';
@@ -74,8 +76,15 @@ $strBack = 'Íàçàä';
$strBaltic = 'Áàëòè÷êè';
$strBeginCut = 'ÏÎ×ÅÒÀÊ ÐÅÇ';
$strBeginRaw = 'ÏÎ×ÅÒÀÊ ÑÈÐÎÂÎ';
+$strBinLogEventType = 'Âðñòà äîãàà¼à';
+$strBinLogInfo = 'Èíôîðìàöè¼å';
+$strBinLogName = 'Íàçèâ äíåâíèêà';
+$strBinLogOriginalPosition = 'Îðèãèíàëíà ïîçèöè¼à';
+$strBinLogPosition = 'Ïîçèöè¼à';
+$strBinLogServerId = 'ÈÄ ñåðâåðà';
$strBinary = 'Áèíàðíè';
$strBinaryDoNotEdit = 'Áèíàðíè - íå ìåœà¼';
+$strBinaryLog = 'Áèíàðíè äíåâíèê';
$strBookmarkAllUsers = 'Äîçâîëè ñâàêîì êîðèñíèêó äà ïðèñòóïà îâîì óïàìžåíîì óïèòó';
$strBookmarkDeleted = 'Îáåëåæèâà÷ ¼å óïðàâî îáðèñàí.';
$strBookmarkLabel = 'Íàçèâ';
@@ -127,6 +136,7 @@ $strColumnPrivileges = 'Ïðèâèëåãè¼å âåçàíå çà êîëîíå';
$strCommand = 'Íàðåäáà';
$strComments = 'Êîìåíòàðè';
$strCommentsForTable = 'ÊÎÌÅÍÒÀÐÈ ÒÀÁÅËÅ';
+$strCompatibleHashing = 'MySQL&nbsp;4.0 êîìïàòèáèëíî';
$strCompleteInserts = 'Êîìïëåòàí INSERT (ñà èìåíèìà ïîšà)';
$strCompression = 'Êîìïðåñè¼à';
$strConfigFileError = 'phpMyAdmin íè¼å ìîãàî äà ïðî÷èòà âàøó êîíôèãóðàöèîíó äàòîòåêó!<br />Îâî ñå ìîæå äåñèòè àêî PHP íàå ãðåøêó ó ïðîöåñèðàœó èëè íå ìîæå äà ïðîíàå äàòîòåêó.<br />Ïîçîâèòå êîíôèãóðàöèîíó äàòîòåêó äèðåêòíî êîðèñòåžè äîœè ëèíê è ïðî÷èòà¼òå ïîðóêå î ãðåøöè êî¼å äîáè¼àòå. Ó âåžèíè ñëó÷à¼åâå íåãäå íåäîñòà¼å íàâîäíèê èëè òà÷êà-çàðåç.<br />Àêî äîáè¼åòå ïðàçíó ñòðàíó, ñâå ¼å ó ðåäó.';
@@ -136,6 +146,7 @@ $strConnections = 'Êîíåêöè¼å';
$strConstraintsForDumped = 'Îãðàíè÷åœà çà èçâåçåíå òàáåëå';
$strConstraintsForTable = 'Îãðàíè÷åœà çà òàáåëå';
$strCookiesRequired = 'Êîëà÷èžè (Cookies) ìîðà¼ó ó îâîì ñëó÷à¼ó áèòè àêòèâíè.';
+$strCopyDatabaseOK = 'Áàçà %s ¼å ïðåêîïèðàíà ó %s';
$strCopyTable = 'Êîïèð༠òàáåëó ó (áàçà<b>.</b>òàáåëà):';
$strCopyTableOK = 'Òàáåëà %s ¼å êîïèðàíà ó %s.';
$strCopyTableSameNames = 'Íå ìîãó äà êîïèðàì òàáåëó ó ñàìó ñåáå!';
@@ -155,6 +166,7 @@ $strCzech = '×åøêè';
$strCzechSlovak = '×åøêî-ñëîâà÷êè';
$strDBComment = 'Êîìåíòàð áàçå:';
+$strDBCopy = 'Êîïèð༠áàçó ó';
$strDBGContext = 'Êîíòåêñò';
$strDBGContextID = 'Êîíòåêñò ÈÄ';
$strDBGHits = 'Ïîãîäàêà';
@@ -227,6 +239,7 @@ $strEndRaw = 'ÊÐÀ£ ÑÈÐÎÂÎ';
$strEnglish = 'Åíãëåñêè';
$strEnglishPrivileges = ' Íàïîìåíà: MySQL èìåíà ïðèâèëåãè¼à ìîðà¼ó äà áóäó íà åíãëåñêîì ';
$strError = 'Ãðåøêà';
+$strEscapeWildcards = 'Ïðå Ÿîêåðà _ è % òðåáà ñòàâèòè çíàê \ àêî èõ êîðèñòèòå ñàìîñòàëíî';
$strEstonian = 'Åñòîíñêè';
$strExcelEdition = 'Excel èçäàœå';
$strExcelOptions = 'Excel îïöè¼å';
@@ -296,11 +309,16 @@ $strIndex = 'Êšó÷';
$strIndexHasBeenDropped = 'Êšó÷ %s ¼å îáðèñàí';
$strIndexName = 'Èìå êšó÷à :';
$strIndexType = 'Òèï êšó÷à :';
+$strIndexWarningMultiple = 'Âèøå îä ¼åäíîã %s êšó÷à ¼å íàïðàâšåíî çà êîëîíó `%s`';
+$strIndexWarningPrimary = 'PRIMARY è INDEX êšó÷åâè íå áè òðåáàëè äà áóäó èñòîâðåìåíî ïîñòàâšåíè çà êîëîíó `%s`';
+$strIndexWarningTable = 'Ïðîáëåì ïðè èíäåêñèðàœó òàáåëå `%s`';
+$strIndexWarningUnique = 'UNIQUE è INDEX êšó÷åâè íå áè òðåáàëè äà áóäó èñòîâðåìåíî ïîñòàâšåíè çà êîëîíó `%s`';
$strIndexes = 'Êšó÷åâè';
$strInnodbStat = 'InnoDB ñòàòóñ';
$strInsecureMySQL = 'Âàøà êîíôèãóðàöèîíà äàòîòåêà ñàäðæè ïîäåøàâàœà (root áåç ëîçèíêå) êî¼à îäãîâàðà¼ó ñòàíäàðäíîì MySQL ïðèâèëåãîâàíîì íàëîãó. Âàø MySQL ñåðâåð ðàäè ñà îâèì ïîäåøàâàœèìà, îòâîðåí ¼å çà óïàäå, è çàèñòà òðåáà äà èñïðàâèòå îâ༠ñèãóðíîñíè ðèçèê.';
$strInsert = 'Íîâè çàïèñ';
$strInsertAsNewRow = 'Óíåñè êàî íîâè ðåä';
+$strInsertBookmarkTitle = 'Ìîëèìî óíåñèòå íàçèâ ìàðêåðà';
$strInsertNewRow = 'Óíåñè íîâè ðåä';
$strInsertTextfiles = 'Óâåçè ïîäàòêå èç òåêñòóàëíå äàòîòåêå';
$strInsertedRowId = 'ID óìåòíóòèõ ðåäîâà:';
@@ -382,6 +400,7 @@ $strName = 'Èìå';
$strNeedPrimaryKey = 'Òðåáàëî áè äà äåôèíèøåòå ïðèìàðíè êšó÷ çà îâó òàáåëó.';
$strNext = 'Ñëåäåžè';
$strNo = 'Íå';
+$strNoActivity = 'Íè¼å áèëî àêòèâíîñòè %s èëè âèøå ñåêóíäè, ìîëèìî ïðè¼àâèòå ñå ïîíîâî';
$strNoDatabases = 'Áàçà íå ïîñòî¼è';
$strNoDatabasesSelected = 'Íè¼å èçàáðàíà íè ¼åäíà áàçà.';
$strNoDescription = 'íåìà îïèñà';
@@ -401,6 +420,7 @@ $strNoRights = 'Íè¼å Âàì äîçâîšåíî äà áóäåòå îâäå!';
$strNoRowsSelected = 'Íåìà îäàáðàíèõ ðåäîâà';
$strNoSpace = 'Íåäîâîšíî ïðîñòîðà çà ñíèìàœå äàòîòåêå %s.';
$strNoTablesFound = 'Òàáåëå íèñó ïðîíàåíå ó áàçè.';
+$strNoThemeSupport = 'Íåìà ïîäðøêå çà òåìå, ìîëèìî ïðîâåðèòå êîíôèãóðàöè¼ó è/èëè òåìå ó äèðåêòîðè¼óìó %s.';
$strNoUsersFound = 'Êîðèñíèê íè¼å íàåí.';
$strNoValidateSQL = 'Ïðåñêî÷è ïðîâåðó SQL-a';
$strNone = 'íåìà';
@@ -432,6 +452,7 @@ $strPartialText = 'Äåî òåêñòà';
$strPassword = 'Ëîçèíêà';
$strPasswordChanged = 'Ëîçèíêà çà %s ¼å óñïåøíî ïðîìåœåíà.';
$strPasswordEmpty = 'Ëîçèíêà ¼å ïðàçíà!';
+$strPasswordHashing = 'Õåøèðàœå ëîçèíêå';
$strPasswordNotSame = 'Ëîçèíêå íèñó èäåíòè÷íå!';
$strPdfDbSchema = 'Ñõåìà áàçå "%s" - Ñòðàíà %s';
$strPdfInvalidTblName = 'Òàáåëà "%s" íå ïîñòî¼è!';
@@ -568,6 +589,7 @@ $strSearchType = 'Òðàæè:';
$strSecretRequired = 'Êîíôèãóðàöèîíà äàòîòåêà çàõòåâà òà¼íó ëîçèíêó (blowfish_secret).';
$strSelectADb = 'Èçàáåðèòå áàçó';
$strSelectAll = 'Èçàáåðè ñâå';
+$strSelectBinaryLog = 'Èçàáåðèòå áèíàðíè äíåâíèê çà ïðåãëåä';
$strSelectFields = 'Èçàáåðè ïîšà (íà¼ìàœå ¼åäíî)';
$strSelectNumRows = 'ó óïèòó';
$strSelectTables = 'Èçàáåðè òàáåëå';
@@ -623,6 +645,7 @@ $strSubmit = 'Ïîøàšè';
$strSuccess = 'Âàø SQL óïèò ¼å óñïåøíî èçâðøåí';
$strSum = 'Óêóïíî';
$strSwedish = 'Øâåäñêè';
+$strSwitchToDatabase = 'Ïðåáàöè ñå íà êîïèðàíó áàçó';
$strSwitchToTable = 'Ïðåè íà êîïèðàíó òàáåëó';
$strTable = 'Òàáåëà';
@@ -684,6 +707,7 @@ $strUpgrade = 'Òðåáàëî áè äà óíàïðåäèòå âàø %s ñåðâåð íà âåðçè¼ó %s èëè íîâè¼ó.'
$strUsage = 'Çàóçåžå';
$strUseBackquotes = 'Êîðèñòè \' çà îãðàíè÷àâàœå èìåíà ïîšà';
$strUseHostTable = 'Êîðèñòè òàáåëó äîìàžèíà';
+$strUseTabKey = 'Êîðèñòèòå TAB òàñòåð çà ïîìåðàœå îä ïîšà äî ïîšà, èëè CTRL+ñòðåëèöå çà ñëîáîäíî ïîìåðàœå';
$strUseTables = 'Êîðèñòè òàáåëå';
$strUseTextField = 'Êîðèñòè òåêñò ïîšå';
$strUseThisValue = 'Êîðèñòè îâó âðåäíîñò';
@@ -722,26 +746,8 @@ $strYes = 'Äà';
$strZeroRemovesTheLimit = 'Íàïîìåíà: Ïîñòàâšàœå îâèõ îïöè¼à íà 0 (íóëó) óêëàœà îãðàíè÷åœà.';
$strZip = '"çèïîâàíî"';
-$strAddFields = 'Add %s field(s)'; //to translate
-$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
-$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php
index 58802637d7..b3be57edc4 100644
--- a/lang/serbian_latin-utf-8.inc.php
+++ b/lang/serbian_latin-utf-8.inc.php
@@ -35,6 +35,7 @@ $strAddConstraints = 'Dodaj ograniÄenja';
$strAddDeleteColumn = 'Dodaj/obriši kolonu';
$strAddDeleteRow = 'Dodaj/obriši polje za kriterijum';
$strAddDropDatabase = 'Dodaj DROP DATABASE';
+$strAddFields = 'Dodaj %s polja';
$strAddHeaderComment = 'Dodaj komentar u zaglavlje (\\n razdvaja linije)';
$strAddIfNotExists = 'Dodaj \'IF NOT EXISTS\'';
$strAddIntoComments = 'Dodaj u komentare';
@@ -62,6 +63,7 @@ $strAnd = 'i';
$strAny = 'Bilo koji';
$strAnyHost = 'Bilo koji domaćin';
$strAnyUser = 'Bilo koji korisnik';
+$strApproximateCount = 'Može biti približno. Vidite FAQ 3.11';
$strArabic = 'Arapski';
$strArmenian = 'Jermenski';
$strAscending = 'Rastući';
@@ -75,8 +77,15 @@ $strBack = 'Nazad';
$strBaltic = 'BaltiÄki';
$strBeginCut = 'POÄŒETAK REZ';
$strBeginRaw = 'POÄŒETAK SIROVO';
+$strBinLogEventType = 'Vrsta događaja';
+$strBinLogInfo = 'Informacije';
+$strBinLogName = 'Naziv dnevnika';
+$strBinLogOriginalPosition = 'Originalna pozicija';
+$strBinLogPosition = 'Pozicija';
+$strBinLogServerId = 'ID servera';
$strBinary = 'Binarni';
$strBinaryDoNotEdit = 'Binarni - ne menjaj';
+$strBinaryLog = 'Binarni dnevnik';
$strBookmarkAllUsers = 'Dozvoli svakom korisniku da pristupa ovom markeru';
$strBookmarkDeleted = 'ObeleživaÄ je upravo obrisan.';
$strBookmarkLabel = 'Naziv';
@@ -128,6 +137,7 @@ $strColumnPrivileges = 'Privilegije vezane za kolone';
$strCommand = 'Naredba';
$strComments = 'Komentari';
$strCommentsForTable = 'KOMENTARI TABELE';
+$strCompatibleHashing = 'MySQL&nbsp;4.0 kompatibilno';
$strCompleteInserts = 'Kompletan INSERT (sa imenima polja)';
$strCompression = 'Kompresija';
$strConfigFileError = 'phpMyAdmin nije mogao da proÄita vaÅ¡u konfiguracionu datoteku!<br />Ovo se može desiti ako PHP naÄ‘e greÅ¡ku u procesiranju ili ne može da pronaÄ‘e datoteku.<br />Pozovite konfiguracionu datoteku direktno koristeći donji link i proÄitajte poruke o greÅ¡ci koje dobijate. U većini sluÄajeve negde nedostaje navodnik ili taÄka-zarez.<br />Ako dobijete praznu stranu, sve je u redu.';
@@ -137,6 +147,7 @@ $strConnections = 'Konekcije';
$strConstraintsForDumped = 'OgraniÄenja za izvezene tabele';
$strConstraintsForTable = 'OgraniÄenja za tabele';
$strCookiesRequired = 'KolaÄići (Cookies) moraju u ovom sluÄaju biti aktivni.';
+$strCopyDatabaseOK = 'Baza %s je prekopirana u %s';
$strCopyTable = 'Kopiraj tabelu u (baza<b>.</b>tabela):';
$strCopyTableOK = 'Tabela %s je kopirana u %s.';
$strCopyTableSameNames = 'Ne mogu da kopiram tabelu u samu sebe!';
@@ -156,6 +167,7 @@ $strCzech = 'Češki';
$strCzechSlovak = 'ÄŒeÅ¡ko-slovaÄki';
$strDBComment = 'Komentar baze:';
+$strDBCopy = 'Kopiraj bazu u';
$strDBGContext = 'Kontekst';
$strDBGContextID = 'Kontekst ID';
$strDBGHits = 'Pogodaka';
@@ -228,6 +240,7 @@ $strEndRaw = 'KRAJ SIROVO';
$strEnglish = 'Engleski';
$strEnglishPrivileges = ' Napomena: MySQL imena privilegija moraju da budu na engleskom ';
$strError = 'Greška';
+$strEscapeWildcards = 'Pre džokera _ i % treba staviti znak \ ako ih koristite samostalno';
$strEstonian = 'Estonski';
$strExcelEdition = 'Excel izdanje';
$strExcelOptions = 'Excel opcije';
@@ -297,11 +310,16 @@ $strIndex = 'KljuÄ';
$strIndexHasBeenDropped = 'KljuÄ %s je obrisan';
$strIndexName = 'Ime kljuÄa :';
$strIndexType = 'Tip kljuÄa :';
+$strIndexWarningMultiple = 'ViÅ¡e od jednog %s kljuÄa je napravljeno za kolonu `%s`';
+$strIndexWarningPrimary = 'PRIMARY i INDEX kljuÄevi ne bi trebali da budu istovremeno postavljeni za kolonu `%s`';
+$strIndexWarningTable = 'Problem pri indeksiranju tabele `%s`';
+$strIndexWarningUnique = 'UNIQUE i INDEX kljuÄevi ne bi trebali da budu istovremeno postavljeni za kolonu `%s`';
$strIndexes = 'KljuÄevi';
$strInnodbStat = 'InnoDB status';
$strInsecureMySQL = 'Vaša konfiguraciona datoteka sadrži podešavanja (root bez lozinke) koja odgovaraju standardnom MySQL privilegovanom nalogu. Vaš MySQL server radi sa ovim podešavanjima, otvoren je za upade, i zaista treba da ispravite ovaj sigurnosni rizik.';
$strInsert = 'Novi zapis';
$strInsertAsNewRow = 'Unesi kao novi red';
+$strInsertBookmarkTitle = 'Molimo unesite naziv markera';
$strInsertNewRow = 'Unesi novi red';
$strInsertTextfiles = 'Uvezi podatke iz tekstualne datoteke';
$strInsertedRowId = 'ID umetnutih redova:';
@@ -383,6 +401,7 @@ $strName = 'Ime';
$strNeedPrimaryKey = 'Trebalo bi da definiÅ¡ete primarni kljuÄ za ovu tabelu.';
$strNext = 'Sledeći';
$strNo = 'Ne';
+$strNoActivity = 'Nije bilo aktivnosti %s ili više sekundi, molimo prijavite se ponovo';
$strNoDatabases = 'Baza ne postoji';
$strNoDatabasesSelected = 'Nije izabrana ni jedna baza.';
$strNoDescription = 'nema opisa';
@@ -402,6 +421,7 @@ $strNoRights = 'Nije Vam dozvoljeno da budete ovde!';
$strNoRowsSelected = 'Nema odabranih redova';
$strNoSpace = 'Nedovoljno prostora za snimanje datoteke %s.';
$strNoTablesFound = 'Tabele nisu pronađene u bazi.';
+$strNoThemeSupport = 'Nema podrške za teme, molimo proverite konfiguraciju i/ili teme u direktorijumu %s.';
$strNoUsersFound = 'Korisnik nije nađen.';
$strNoValidateSQL = 'PreskoÄi proveru SQL-a';
$strNone = 'nema';
@@ -433,6 +453,7 @@ $strPartialText = 'Deo teksta';
$strPassword = 'Lozinka';
$strPasswordChanged = 'Lozinka za %s je uspešno promenjena.';
$strPasswordEmpty = 'Lozinka je prazna!';
+$strPasswordHashing = 'Heširanje lozinke';
$strPasswordNotSame = 'Lozinke nisu identiÄne!';
$strPdfDbSchema = 'Shema baze "%s" - Strana %s';
$strPdfInvalidTblName = 'Tabela "%s" ne postoji!';
@@ -569,6 +590,7 @@ $strSearchType = 'Traži:';
$strSecretRequired = 'Konfiguraciona datoteka zahteva tajnu lozinku (blowfish_secret).';
$strSelectADb = 'Izaberite bazu';
$strSelectAll = 'Izaberi sve';
+$strSelectBinaryLog = 'Izaberite binarni dnevnik za pregled';
$strSelectFields = 'Izaberi polja (najmanje jedno)';
$strSelectNumRows = 'u upitu';
$strSelectTables = 'Izaberi tabele';
@@ -624,6 +646,7 @@ $strSubmit = 'Pošalji';
$strSuccess = 'Vaš SQL upit je uspešno izvršen';
$strSum = 'Ukupno';
$strSwedish = 'Å vedski';
+$strSwitchToDatabase = 'Prebaci se na kopiranu bazu';
$strSwitchToTable = 'Pređi na kopiranu tabelu';
$strTable = 'Tabela';
@@ -685,6 +708,7 @@ $strUpgrade = 'Trebalo bi da unapredite vaš %s server na verziju %s ili noviju.
$strUsage = 'Zauzeće';
$strUseBackquotes = 'Koristi \' za ograniÄavanje imena polja';
$strUseHostTable = 'Koristi tabelu domaćina';
+$strUseTabKey = 'Koristite TAB taster za pomeranje od polja do polja, ili CTRL+strelice za slobodno pomeranje';
$strUseTables = 'Koristi tabele';
$strUseTextField = 'Koristi tekst polje';
$strUseThisValue = 'Koristi ovu vrednost';
@@ -723,26 +747,8 @@ $strYes = 'Da';
$strZeroRemovesTheLimit = 'Napomena: Postavljanje ovih opcija na 0 (nulu) uklanja limite.';
$strZip = '"zipovano"';
-$strAddFields = 'Add %s field(s)'; //to translate
-$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
-$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/serbian_latin-windows-1250.inc.php b/lang/serbian_latin-windows-1250.inc.php
index 4c8fe6571d..17decd1de8 100644
--- a/lang/serbian_latin-windows-1250.inc.php
+++ b/lang/serbian_latin-windows-1250.inc.php
@@ -34,6 +34,7 @@ $strAddConstraints = 'Dodaj ogranièenja';
$strAddDeleteColumn = 'Dodaj/obriši kolonu';
$strAddDeleteRow = 'Dodaj/obriši polje za kriterijum';
$strAddDropDatabase = 'Dodaj DROP DATABASE';
+$strAddFields = 'Dodaj %s polja';
$strAddHeaderComment = 'Dodaj komentar u zaglavlje (\\n razdvaja linije)';
$strAddIfNotExists = 'Dodaj \'IF NOT EXISTS\'';
$strAddIntoComments = 'Dodaj u komentare';
@@ -61,6 +62,7 @@ $strAnd = 'i';
$strAny = 'Bilo koji';
$strAnyHost = 'Bilo koji domaæin';
$strAnyUser = 'Bilo koji korisnik';
+$strApproximateCount = 'Može biti približno. Vidite FAQ 3.11';
$strArabic = 'Arapski';
$strArmenian = 'Jermenski';
$strAscending = 'Rastuæi';
@@ -74,8 +76,15 @@ $strBack = 'Nazad';
$strBaltic = 'Baltièki';
$strBeginCut = 'POÈETAK REZ';
$strBeginRaw = 'POÈETAK SIROVO';
+$strBinLogEventType = 'Vrsta dogaðaja';
+$strBinLogInfo = 'Informacije';
+$strBinLogName = 'Naziv dnevnika';
+$strBinLogOriginalPosition = 'Originalna pozicija';
+$strBinLogPosition = 'Pozicija';
+$strBinLogServerId = 'ID servera';
$strBinary = 'Binarni';
$strBinaryDoNotEdit = 'Binarni - ne menjaj';
+$strBinaryLog = 'Binarni dnevnik';
$strBookmarkAllUsers = 'Dozvoli svakom korisniku da pristupa ovom markeru';
$strBookmarkDeleted = 'Obeleživaè je upravo obrisan.';
$strBookmarkLabel = 'Naziv';
@@ -127,6 +136,7 @@ $strColumnPrivileges = 'Privilegije vezane za kolone';
$strCommand = 'Naredba';
$strComments = 'Komentari';
$strCommentsForTable = 'KOMENTARI TABELE';
+$strCompatibleHashing = 'MySQL&nbsp;4.0 kompatibilno';
$strCompleteInserts = 'Kompletan INSERT (sa imenima polja)';
$strCompression = 'Kompresija';
$strConfigFileError = 'phpMyAdmin nije mogao da proèita vašu konfiguracionu datoteku!<br />Ovo se može desiti ako PHP naðe grešku u procesiranju ili ne može da pronaðe datoteku.<br />Pozovite konfiguracionu datoteku direktno koristeæi donji link i proèitajte poruke o grešci koje dobijate. U veæini sluèajeve negde nedostaje navodnik ili taèka-zarez.<br />Ako dobijete praznu stranu, sve je u redu.';
@@ -136,6 +146,7 @@ $strConnections = 'Konekcije';
$strConstraintsForDumped = 'Ogranièenja za izvezene tabele';
$strConstraintsForTable = 'Ogranièenja za tabele';
$strCookiesRequired = 'Kolaèiæi (Cookies) moraju u ovom sluèaju biti aktivni.';
+$strCopyDatabaseOK = 'Baza %s je prekopirana u %s';
$strCopyTable = 'Kopiraj tabelu u (baza<b>.</b>tabela):';
$strCopyTableOK = 'Tabela %s je kopirana u %s.';
$strCopyTableSameNames = 'Ne mogu da kopiram tabelu u samu sebe!';
@@ -155,6 +166,7 @@ $strCzech = 'Èeški';
$strCzechSlovak = 'Èeško-slovaèki';
$strDBComment = 'Komentar baze:';
+$strDBCopy = 'Kopiraj bazu u';
$strDBGContext = 'Kontekst';
$strDBGContextID = 'Kontekst ID';
$strDBGHits = 'Pogodaka';
@@ -227,6 +239,7 @@ $strEndRaw = 'KRAJ SIROVO';
$strEnglish = 'Engleski';
$strEnglishPrivileges = ' Napomena: MySQL imena privilegija moraju da budu na engleskom ';
$strError = 'Greška';
+$strEscapeWildcards = 'Pre džokera _ i % treba staviti znak \ ako ih koristite samostalno';
$strEstonian = 'Estonski';
$strExcelEdition = 'Excel izdanje';
$strExcelOptions = 'Excel opcije';
@@ -296,11 +309,16 @@ $strIndex = 'Kljuè';
$strIndexHasBeenDropped = 'Kljuè %s je obrisan';
$strIndexName = 'Ime kljuèa :';
$strIndexType = 'Tip kljuèa :';
+$strIndexWarningMultiple = 'Više od jednog %s kljuèa je napravljeno za kolonu `%s`';
+$strIndexWarningPrimary = 'PRIMARY i INDEX kljuèevi ne bi trebali da budu istovremeno postavljeni za kolonu `%s`';
+$strIndexWarningTable = 'Problem pri indeksiranju tabele `%s`';
+$strIndexWarningUnique = 'UNIQUE i INDEX kljuèevi ne bi trebali da budu istovremeno postavljeni za kolonu `%s`';
$strIndexes = 'Kljuèevi';
$strInnodbStat = 'InnoDB status';
$strInsecureMySQL = 'Vaša konfiguraciona datoteka sadrži podešavanja (root bez lozinke) koja odgovaraju standardnom MySQL privilegovanom nalogu. Vaš MySQL server radi sa ovim podešavanjima, otvoren je za upade, i zaista treba da ispravite ovaj sigurnosni rizik.';
$strInsert = 'Novi zapis';
$strInsertAsNewRow = 'Unesi kao novi red';
+$strInsertBookmarkTitle = 'Molimo unesite naziv markera';
$strInsertNewRow = 'Unesi novi red';
$strInsertTextfiles = 'Uvezi podatke iz tekstualne datoteke';
$strInsertedRowId = 'ID umetnutih redova:';
@@ -382,6 +400,7 @@ $strName = 'Ime';
$strNeedPrimaryKey = 'Trebalo bi da definišete primarni kljuè za ovu tabelu.';
$strNext = 'Sledeæi';
$strNo = 'Ne';
+$strNoActivity = 'Nije bilo aktivnosti %s ili više sekundi, molimo prijavite se ponovo';
$strNoDatabases = 'Baza ne postoji';
$strNoDatabasesSelected = 'Nije izabrana ni jedna baza.';
$strNoDescription = 'nema opisa';
@@ -401,6 +420,7 @@ $strNoRights = 'Nije Vam dozvoljeno da budete ovde!';
$strNoRowsSelected = 'Nema odabranih redova';
$strNoSpace = 'Nedovoljno prostora za snimanje datoteke %s.';
$strNoTablesFound = 'Tabele nisu pronaðene u bazi.';
+$strNoThemeSupport = 'Nema podrške za teme, molimo proverite konfiguraciju i/ili teme u direktorijumu %s.';
$strNoUsersFound = 'Korisnik nije naðen.';
$strNoValidateSQL = 'Preskoèi proveru SQL-a';
$strNone = 'nema';
@@ -432,6 +452,7 @@ $strPartialText = 'Deo teksta';
$strPassword = 'Lozinka';
$strPasswordChanged = 'Lozinka za %s je uspešno promenjena.';
$strPasswordEmpty = 'Lozinka je prazna!';
+$strPasswordHashing = 'Heširanje lozinke';
$strPasswordNotSame = 'Lozinke nisu identiène!';
$strPdfDbSchema = 'Shema baze "%s" - Strana %s';
$strPdfInvalidTblName = 'Tabela "%s" ne postoji!';
@@ -568,6 +589,7 @@ $strSearchType = 'Traži:';
$strSecretRequired = 'Konfiguraciona datoteka zahteva tajnu lozinku (blowfish_secret).';
$strSelectADb = 'Izaberite bazu';
$strSelectAll = 'Izaberi sve';
+$strSelectBinaryLog = 'Izaberite binarni dnevnik za pregled';
$strSelectFields = 'Izaberi polja (najmanje jedno)';
$strSelectNumRows = 'u upitu';
$strSelectTables = 'Izaberi tabele';
@@ -623,6 +645,7 @@ $strSubmit = 'Pošalji';
$strSuccess = 'Vaš SQL upit je uspešno izvršen';
$strSum = 'Ukupno';
$strSwedish = 'Švedski';
+$strSwitchToDatabase = 'Prebaci se na kopiranu bazu';
$strSwitchToTable = 'Preði na kopiranu tabelu';
$strTable = 'Tabela';
@@ -684,6 +707,7 @@ $strUpgrade = 'Trebalo bi da unapredite vaš %s server na verziju %s ili noviju.'
$strUsage = 'Zauzeæe';
$strUseBackquotes = 'Koristi \' za ogranièavanje imena polja';
$strUseHostTable = 'Koristi tabelu domaæina';
+$strUseTabKey = 'Koristite TAB taster za pomeranje od polja do polja, ili CTRL+strelice za slobodno pomeranje';
$strUseTables = 'Koristi tabele';
$strUseTextField = 'Koristi tekst polje';
$strUseThisValue = 'Koristi ovu vrednost';
@@ -722,26 +746,8 @@ $strYes = 'Da';
$strZeroRemovesTheLimit = 'Napomena: Postavljanje ovih opcija na 0 (nulu) uklanja limite.';
$strZip = '"zipovano"';
-$strAddFields = 'Add %s field(s)'; //to translate
-$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
-$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/slovak-iso-8859-2.inc.php b/lang/slovak-iso-8859-2.inc.php
index 481a34bc5b..15a88b2370 100644
--- a/lang/slovak-iso-8859-2.inc.php
+++ b/lang/slovak-iso-8859-2.inc.php
@@ -740,4 +740,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php
index a50ba61443..266a9bdd75 100644
--- a/lang/slovak-utf-8.inc.php
+++ b/lang/slovak-utf-8.inc.php
@@ -741,4 +741,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/slovak-windows-1250.inc.php b/lang/slovak-windows-1250.inc.php
index 7b473bdacb..97dff729db 100644
--- a/lang/slovak-windows-1250.inc.php
+++ b/lang/slovak-windows-1250.inc.php
@@ -740,4 +740,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/slovenian-iso-8859-2.inc.php b/lang/slovenian-iso-8859-2.inc.php
index bf71743683..79243f8e6e 100644
--- a/lang/slovenian-iso-8859-2.inc.php
+++ b/lang/slovenian-iso-8859-2.inc.php
@@ -740,4 +740,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php
index b91cde1d2a..0eeb002c24 100644
--- a/lang/slovenian-utf-8.inc.php
+++ b/lang/slovenian-utf-8.inc.php
@@ -741,4 +741,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/slovenian-windows-1250.inc.php b/lang/slovenian-windows-1250.inc.php
index c3424b2f6f..d97dd04008 100644
--- a/lang/slovenian-windows-1250.inc.php
+++ b/lang/slovenian-windows-1250.inc.php
@@ -740,4 +740,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/spanish-iso-8859-1.inc.php b/lang/spanish-iso-8859-1.inc.php
index ff18106af9..76127694bf 100644
--- a/lang/spanish-iso-8859-1.inc.php
+++ b/lang/spanish-iso-8859-1.inc.php
@@ -28,6 +28,7 @@ $strAddConstraints = 'Añada constreñimientos';
$strAddDeleteColumn = 'Añadir/borrar columna de criterio';
$strAddDeleteRow = 'Añadir/borrar fila de criterio';
$strAddDropDatabase = 'Añada DROP DATABASE';
+$strAddFields = 'Añada %s campo(s)';
$strAddHeaderComment = 'Añada su propio comentario en el encabezado (\\n segmenta las oraciones)';
$strAddIfNotExists = 'Añada en CASO DE NO EXISTIR';
$strAddIntoComments = 'Añada en los comentarios';
@@ -55,6 +56,7 @@ $strAnd = 'y luego';
$strAny = 'cualquiera';
$strAnyHost = 'Cualquier servidor';
$strAnyUser = 'Cualquier usuario';
+$strApproximateCount = 'Podría ser aproximado. Léase la FAQ 3.11';
$strArabic = 'Árabe';
$strArmenian = 'Armenio';
$strAscending = 'Ascendente';
@@ -68,8 +70,15 @@ $strBack = 'Volver';
$strBaltic = 'Báltico';
$strBeginCut = 'INICIO DEL CORTE';
$strBeginRaw = 'INICIO DEL VOLCADO';
+$strBinLogEventType = 'Tipo de evento';
+$strBinLogInfo = 'Información';
+$strBinLogName = 'Nombre con el cual se registró';
+$strBinLogOriginalPosition = 'Posición original';
+$strBinLogPosition = 'Posición';
+$strBinLogServerId = 'ID del servidor';
$strBinary = ' Binario ';
$strBinaryDoNotEdit = ' Binario - ¡no editar! ';
+$strBinaryLog = 'Log binario';
$strBookmarkAllUsers = 'Permitir que todo usuario pueda acceder a este bookmark';
$strBookmarkDeleted = 'El "bookmark" ha sido borrado.';
$strBookmarkLabel = 'Etiqueta';
@@ -121,6 +130,7 @@ $strColumnPrivileges = 'Privilegios específicos para la columna';
$strCommand = 'Comando';
$strComments = 'Comentarios';
$strCommentsForTable = 'COMENTARIOS PARA LA TABLA';
+$strCompatibleHashing = 'Compatible con MySQL&nbsp;4.0';
$strCompleteInserts = 'Completar los "Inserts"';
$strCompression = 'Compresión';
$strConfigFileError = '¡phpMyAdmin no puede leer el fichero de configuración!<br />Esto puede suceder si php encuentra un error sintáctico en él o bien php no puede encontrar el fichero.<br />Intente acceder al fichero de configuración directamente mediante el siguiente enlace y compruebe el(los) mensaje(s) de error que reciba. En muchas ocasiones falta una coma o punto y coma en algún sitio.<br />Si recibe una página en blanco, todo está correcto.';
@@ -130,6 +140,7 @@ $strConnections = 'Conexiones';
$strConstraintsForDumped = 'Filtros para las tablas descargadas (dump)';
$strConstraintsForTable = 'Filtros para la tabla';
$strCookiesRequired = 'Las "cookies" deben estar habilitadas pasado este punto.';
+$strCopyDatabaseOK = 'La base de datos %s ha sido copiada a %s';
$strCopyTable = 'Copiar la tabla a (base de datos<b>.</b>tabla):';
$strCopyTableOK = 'La tabla %s se copió a %s.';
$strCopyTableSameNames = '¡No es posible copiar la tabla a la misma!';
@@ -149,6 +160,7 @@ $strCzech = 'Checo';
$strCzechSlovak = 'Checo-Eslovaco';
$strDBComment = 'Comentario de la base de datos: ';
+$strDBCopy = 'Copie la base de datos a';
$strDBGContext = 'Contexto';
$strDBGContextID = 'ID del contexto';
$strDBGHits = 'Hits';
@@ -221,6 +233,7 @@ $strEndRaw = 'FIN DEL VOLCADO';
$strEnglish = 'Inglés';
$strEnglishPrivileges = ' Nota: Los nombres de los privilegios de MySQL están expresados en inglés ';
$strError = 'Error';
+$strEscapeWildcards = 'Los comodines _ y % deben acompañarse de \ para usarlos de manera literal';
$strEstonian = 'Estonio';
$strExcelEdition = 'Edición Excel';
$strExcelOptions = 'Opciones de Excel';
@@ -290,11 +303,16 @@ $strIndex = 'Índice';
$strIndexHasBeenDropped = 'El índice %s ha sido eliminado';
$strIndexName = 'Nombre del índice&nbsp;:';
$strIndexType = 'Tipo de índice&nbsp;:';
+$strIndexWarningMultiple = 'Se creó más de una clave %s para la columna `%s`';
+$strIndexWarningPrimary = 'Las claves PRIMARIA e INDICE no deben seleccionarse juntas para la columna `%s`';
+$strIndexWarningTable = 'Problemas con los índices de la tabla `%s`';
+$strIndexWarningUnique = 'Las claves UNICA e INDICE no deben seleccionarse juntas para la columna `%s`';
$strIndexes = 'Índices';
$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, que constituyen una vulnerabilidad. Se le recomienda corregir esta brecha de seguridad.';
$strInsert = 'Insertar';
$strInsertAsNewRow = 'Insertar como una nueva fila';
+$strInsertBookmarkTitle = 'Por favor, inserte un título para el bookmark';
$strInsertNewRow = 'Insertar nueva fila';
$strInsertTextfiles = 'Insertar archivo de texto en la tabla';
$strInsertedRowId = 'Se insertó la id de la fila:';
@@ -376,6 +394,7 @@ $strName = 'Nombre';
$strNeedPrimaryKey = 'Usted debe definir una llave primaria para esta tabla.';
$strNext = 'Próxima';
$strNo = 'No';
+$strNoActivity = 'No ha habido actividad desde hace %s o más segundos, por favor reingrese al sitio';
$strNoDatabases = 'No hay bases de datos';
$strNoDatabasesSelected = 'No se seleccionaron bases de datos.';
$strNoDescription = 'Sin descripción';
@@ -395,6 +414,7 @@ $strNoRights = '¡Usted no tiene suficientes privilegios para estar aquí ahora!';
$strNoRowsSelected = 'No se seleccionaron filas';
$strNoSpace = 'No hay suficiente espacio para guardar el archivo %s.';
$strNoTablesFound = 'No se han encontrado tablas en la base de datos.';
+$strNoThemeSupport = 'No existe soporte para Temas, por favor, revise su configuración y/o sus temas en el directorio %s.';
$strNoUsersFound = 'Usuario(s) no encontrado(s).';
$strNoValidateSQL = 'Saltarse la validación del SQL';
$strNone = 'Ninguna';
@@ -426,6 +446,7 @@ $strPartialText = 'Textos parciales';
$strPassword = 'Contraseña';
$strPasswordChanged = 'La contraseña para %s fue cambiada exitosamente.';
$strPasswordEmpty = '¡La contraseña está vacía!';
+$strPasswordHashing = 'Hashing de la contraseña';
$strPasswordNotSame = '¡Las contraseñas no coinciden!';
$strPdfDbSchema = 'Esquema de la base de datos "%s" - Página %s';
$strPdfInvalidTblName = '¡La tabla "%s" no existe!';
@@ -562,6 +583,7 @@ $strSearchType = 'Encontrado:';
$strSecretRequired = 'El archivo de configuración ahora necesita salvoconducto (una frase secreta) (blowfish_secret).';
$strSelectADb = 'Seleccione una base de datos';
$strSelectAll = 'Seleccione todo';
+$strSelectBinaryLog = 'Seleccione el log binario para ver';
$strSelectFields = 'Seleccionar campos (al menos uno):';
$strSelectNumRows = 'en la consulta';
$strSelectTables = 'Seleccionar tablas';
@@ -617,6 +639,7 @@ $strSubmit = 'Enviar';
$strSuccess = 'Su consulta ha sido ejecutada con éxito';
$strSum = 'Número de filas';
$strSwedish = 'Sueco';
+$strSwitchToDatabase = 'Seleccione la base de datos copiada';
$strSwitchToTable = 'Cambie (switch) a la tabla copiada';
$strTable = 'Tabla';
@@ -678,6 +701,7 @@ $strUpgrade = 'Usted debería actualizar su %s a la versión %s o más reciente.';
$strUsage = 'Uso';
$strUseBackquotes = 'Usar "backquotes" con tablas y nombres de campo';
$strUseHostTable = 'Use la tabla Anfitrión (Host)';
+$strUseTabKey = 'Use la tecla TAB para saltar de un valor a otro, o CTRL+flechas para moverse a cualquier parte';
$strUseTables = 'Usar tablas';
$strUseTextField = 'Use el campo de texto';
$strUseThisValue = 'Use este valor';
@@ -716,26 +740,8 @@ $strYes = 'Sí';
$strZeroRemovesTheLimit = 'Nota: si cambia los parámetros de estas opciones a 0 (cero), remueve el límite.';
$strZip = '"comprimido con zip"';
-$strAddFields = 'Add %s field(s)'; //to translate
-$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
-$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php
index 7b947ccf8b..cb9e858e4b 100644
--- a/lang/spanish-utf-8.inc.php
+++ b/lang/spanish-utf-8.inc.php
@@ -29,6 +29,7 @@ $strAddConstraints = 'Añada constreñimientos';
$strAddDeleteColumn = 'Añadir/borrar columna de criterio';
$strAddDeleteRow = 'Añadir/borrar fila de criterio';
$strAddDropDatabase = 'Añada DROP DATABASE';
+$strAddFields = 'Añada %s campo(s)';
$strAddHeaderComment = 'Añada su propio comentario en el encabezado (\\n segmenta las oraciones)';
$strAddIfNotExists = 'Añada en CASO DE NO EXISTIR';
$strAddIntoComments = 'Añada en los comentarios';
@@ -56,6 +57,7 @@ $strAnd = 'y luego';
$strAny = 'cualquiera';
$strAnyHost = 'Cualquier servidor';
$strAnyUser = 'Cualquier usuario';
+$strApproximateCount = 'Podría ser aproximado. Léase la FAQ 3.11';
$strArabic = 'Ãrabe';
$strArmenian = 'Armenio';
$strAscending = 'Ascendente';
@@ -69,8 +71,15 @@ $strBack = 'Volver';
$strBaltic = 'Báltico';
$strBeginCut = 'INICIO DEL CORTE';
$strBeginRaw = 'INICIO DEL VOLCADO';
+$strBinLogEventType = 'Tipo de evento';
+$strBinLogInfo = 'Información';
+$strBinLogName = 'Nombre con el cual se registró';
+$strBinLogOriginalPosition = 'Posición original';
+$strBinLogPosition = 'Posición';
+$strBinLogServerId = 'ID del servidor';
$strBinary = ' Binario ';
$strBinaryDoNotEdit = ' Binario - ¡no editar! ';
+$strBinaryLog = 'Log binario';
$strBookmarkAllUsers = 'Permitir que todo usuario pueda acceder a este bookmark';
$strBookmarkDeleted = 'El "bookmark" ha sido borrado.';
$strBookmarkLabel = 'Etiqueta';
@@ -122,6 +131,7 @@ $strColumnPrivileges = 'Privilegios específicos para la columna';
$strCommand = 'Comando';
$strComments = 'Comentarios';
$strCommentsForTable = 'COMENTARIOS PARA LA TABLA';
+$strCompatibleHashing = 'Compatible con MySQL&nbsp;4.0';
$strCompleteInserts = 'Completar los "Inserts"';
$strCompression = 'Compresión';
$strConfigFileError = '¡phpMyAdmin no puede leer el fichero de configuración!<br />Esto puede suceder si php encuentra un error sintáctico en él o bien php no puede encontrar el fichero.<br />Intente acceder al fichero de configuración directamente mediante el siguiente enlace y compruebe el(los) mensaje(s) de error que reciba. En muchas ocasiones falta una coma o punto y coma en algún sitio.<br />Si recibe una página en blanco, todo está correcto.';
@@ -131,6 +141,7 @@ $strConnections = 'Conexiones';
$strConstraintsForDumped = 'Filtros para las tablas descargadas (dump)';
$strConstraintsForTable = 'Filtros para la tabla';
$strCookiesRequired = 'Las "cookies" deben estar habilitadas pasado este punto.';
+$strCopyDatabaseOK = 'La base de datos %s ha sido copiada a %s';
$strCopyTable = 'Copiar la tabla a (base de datos<b>.</b>tabla):';
$strCopyTableOK = 'La tabla %s se copió a %s.';
$strCopyTableSameNames = '¡No es posible copiar la tabla a la misma!';
@@ -150,6 +161,7 @@ $strCzech = 'Checo';
$strCzechSlovak = 'Checo-Eslovaco';
$strDBComment = 'Comentario de la base de datos: ';
+$strDBCopy = 'Copie la base de datos a';
$strDBGContext = 'Contexto';
$strDBGContextID = 'ID del contexto';
$strDBGHits = 'Hits';
@@ -222,6 +234,7 @@ $strEndRaw = 'FIN DEL VOLCADO';
$strEnglish = 'Inglés';
$strEnglishPrivileges = ' Nota: Los nombres de los privilegios de MySQL están expresados en inglés ';
$strError = 'Error';
+$strEscapeWildcards = 'Los comodines _ y % deben acompañarse de \ para usarlos de manera literal';
$strEstonian = 'Estonio';
$strExcelEdition = 'Edición Excel';
$strExcelOptions = 'Opciones de Excel';
@@ -291,11 +304,16 @@ $strIndex = 'Ãndice';
$strIndexHasBeenDropped = 'El índice %s ha sido eliminado';
$strIndexName = 'Nombre del índice&nbsp;:';
$strIndexType = 'Tipo de índice&nbsp;:';
+$strIndexWarningMultiple = 'Se creó más de una clave %s para la columna `%s`';
+$strIndexWarningPrimary = 'Las claves PRIMARIA e INDICE no deben seleccionarse juntas para la columna `%s`';
+$strIndexWarningTable = 'Problemas con los índices de la tabla `%s`';
+$strIndexWarningUnique = 'Las claves UNICA e INDICE no deben seleccionarse juntas para la columna `%s`';
$strIndexes = 'Ãndices';
$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, que constituyen una vulnerabilidad. Se le recomienda corregir esta brecha de seguridad.';
$strInsert = 'Insertar';
$strInsertAsNewRow = 'Insertar como una nueva fila';
+$strInsertBookmarkTitle = 'Por favor, inserte un título para el bookmark';
$strInsertNewRow = 'Insertar nueva fila';
$strInsertTextfiles = 'Insertar archivo de texto en la tabla';
$strInsertedRowId = 'Se insertó la id de la fila:';
@@ -377,6 +395,7 @@ $strName = 'Nombre';
$strNeedPrimaryKey = 'Usted debe definir una llave primaria para esta tabla.';
$strNext = 'Próxima';
$strNo = 'No';
+$strNoActivity = 'No ha habido actividad desde hace %s o más segundos, por favor reingrese al sitio';
$strNoDatabases = 'No hay bases de datos';
$strNoDatabasesSelected = 'No se seleccionaron bases de datos.';
$strNoDescription = 'Sin descripción';
@@ -396,6 +415,7 @@ $strNoRights = '¡Usted no tiene suficientes privilegios para estar aquí ahora!
$strNoRowsSelected = 'No se seleccionaron filas';
$strNoSpace = 'No hay suficiente espacio para guardar el archivo %s.';
$strNoTablesFound = 'No se han encontrado tablas en la base de datos.';
+$strNoThemeSupport = 'No existe soporte para Temas, por favor, revise su configuración y/o sus temas en el directorio %s.';
$strNoUsersFound = 'Usuario(s) no encontrado(s).';
$strNoValidateSQL = 'Saltarse la validación del SQL';
$strNone = 'Ninguna';
@@ -427,6 +447,7 @@ $strPartialText = 'Textos parciales';
$strPassword = 'Contraseña';
$strPasswordChanged = 'La contraseña para %s fue cambiada exitosamente.';
$strPasswordEmpty = '¡La contraseña está vacía!';
+$strPasswordHashing = 'Hashing de la contraseña';
$strPasswordNotSame = '¡Las contraseñas no coinciden!';
$strPdfDbSchema = 'Esquema de la base de datos "%s" - Página %s';
$strPdfInvalidTblName = '¡La tabla "%s" no existe!';
@@ -563,6 +584,7 @@ $strSearchType = 'Encontrado:';
$strSecretRequired = 'El archivo de configuración ahora necesita salvoconducto (una frase secreta) (blowfish_secret).';
$strSelectADb = 'Seleccione una base de datos';
$strSelectAll = 'Seleccione todo';
+$strSelectBinaryLog = 'Seleccione el log binario para ver';
$strSelectFields = 'Seleccionar campos (al menos uno):';
$strSelectNumRows = 'en la consulta';
$strSelectTables = 'Seleccionar tablas';
@@ -618,6 +640,7 @@ $strSubmit = 'Enviar';
$strSuccess = 'Su consulta ha sido ejecutada con éxito';
$strSum = 'Número de filas';
$strSwedish = 'Sueco';
+$strSwitchToDatabase = 'Seleccione la base de datos copiada';
$strSwitchToTable = 'Cambie (switch) a la tabla copiada';
$strTable = 'Tabla';
@@ -679,6 +702,7 @@ $strUpgrade = 'Usted debería actualizar su %s a la versión %s o más reciente.
$strUsage = 'Uso';
$strUseBackquotes = 'Usar "backquotes" con tablas y nombres de campo';
$strUseHostTable = 'Use la tabla Anfitrión (Host)';
+$strUseTabKey = 'Use la tecla TAB para saltar de un valor a otro, o CTRL+flechas para moverse a cualquier parte';
$strUseTables = 'Usar tablas';
$strUseTextField = 'Use el campo de texto';
$strUseThisValue = 'Use este valor';
@@ -717,26 +741,8 @@ $strYes = 'Sí';
$strZeroRemovesTheLimit = 'Nota: si cambia los parámetros de estas opciones a 0 (cero), remueve el límite.';
$strZip = '"comprimido con zip"';
-$strAddFields = 'Add %s field(s)'; //to translate
-$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
-$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/swedish-iso-8859-1.inc.php b/lang/swedish-iso-8859-1.inc.php
index 1b217808ad..b964e5bfee 100644
--- a/lang/swedish-iso-8859-1.inc.php
+++ b/lang/swedish-iso-8859-1.inc.php
@@ -738,4 +738,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php
index a186f4c057..b1d523c3e2 100644
--- a/lang/swedish-utf-8.inc.php
+++ b/lang/swedish-utf-8.inc.php
@@ -739,4 +739,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/thai-tis-620.inc.php b/lang/thai-tis-620.inc.php
index 181c5ea492..76e9146279 100644
--- a/lang/thai-tis-620.inc.php
+++ b/lang/thai-tis-620.inc.php
@@ -763,4 +763,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php
index e3ff9b8c1c..448320fdde 100644
--- a/lang/thai-utf-8.inc.php
+++ b/lang/thai-utf-8.inc.php
@@ -764,4 +764,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/turkish-iso-8859-9.inc.php b/lang/turkish-iso-8859-9.inc.php
index 8318299757..f0814ee975 100644
--- a/lang/turkish-iso-8859-9.inc.php
+++ b/lang/turkish-iso-8859-9.inc.php
@@ -1,17 +1,17 @@
<?php
/* $Id$ */
-//son güncelleme:07.08.2004 (in trapezunta)
+//son güncelleme:12.12.04(in trapezunta)
// Türkçe Çeviri ® Bora Alioðlu
-// mail: boralioglu@yahoo.co.uk
+// mail: boralioglu[at]gmail.{com}
// icq uin: 20940178
// #######################################################
// çeviri hakkýndaki her türlü düzeltme ve önerileriniz
// için benimle temasa geçebilirsiniz...
// #######################################################
-// son güncelleme:22.09.04 (on the way to the constantinople)
+// son güncelleme:12.12.04 (in nova roma)
//
-// "ego lente festino"
+// "tempus semper fugit"
$charset = 'iso-8859-9';
$text_dir = 'ltr';
@@ -70,21 +70,29 @@ $strAnd = 'Ve';
$strAny = 'Herhangi';
$strAnyHost = 'Herhangi sunucu';
$strAnyUser = 'Herhangi kullanýcý';
+$strApproximateCount = 'Tahmini olmalý. Ayrýntýlý bilgi için 3.11 FAQ\' süne bakýnýz ';
$strArabic = 'Arapça';
$strArmenian = 'Ermenice';
$strAscending = 'Artan';
$strAtBeginningOfTable = 'Tablo baþýnda';
$strAtEndOfTable = 'Tablo sonunda';
$strAttr = 'Özellikler';
-$strAutodetect = 'Otomatik tanýma';
+$strAutodetect = 'Otomatik';
$strAutomaticLayout = 'Otomatik düzen';
$strBack = 'Geri';
$strBaltic = 'Baltýk';
$strBeginCut = 'BEGIN CUT';
$strBeginRaw = 'BEGIN RAW';
+$strBinLogEventType = 'Kayýt olay tipi';
+$strBinLogInfo = 'Bilgi';
+$strBinLogName = 'Kayýt ismi';
+$strBinLogOriginalPosition = 'Orjinal kayýt yeri';
+$strBinLogPosition = 'Kayýt yeri';
+$strBinLogServerId = 'Sunucu ID\`si';
$strBinary = 'Binari';
$strBinaryDoNotEdit = 'Binari - düzenlemeyiniz';
+$strBinaryLog = 'Binary kayýt';
$strBookmarkAllUsers = 'Bütün kullanýcýlarýn bu bookmark\'a eriþimlerine izin ver';
$strBookmarkDeleted = 'Bookmark silindi.';
$strBookmarkLabel = 'Etiket';
@@ -96,7 +104,7 @@ $strBrowse = 'Tara';
$strBrowseForeignValues = 'Foreign(yabancý) deðerleri tara';
$strBulgarian = 'Bulgarca';
$strBzError = 'phpMyAdmin dump dosyasýný bu php versiyonundaki bozuk bir Bz2 uzantýsý nedeniyle sýkýþtýrýmadý. phpMyAdmin dizinindeki configurasyon dosyasý içindeki <code>$cfg[\'BZipDump\']</code> yönergesini <code>FALSE</code> \'a deðiþtirmeniz gerekmektedir. Bz2 sýkýþtýrma özelliklerini kullanmak istiyorsanýz ,bir sonraki php sürümüne güncelleme yapmanýz gerekmektedir.php hata raporu %s\' e bakýnýz ';
-$strBzip = '"bzipped"';
+$strBzip = '"bzip"';
$strCSVOptions = 'CSV seçenekleri';
$strCalendar = 'Takvim';
@@ -122,7 +130,7 @@ $strChangePassword = 'Þifre Deðiþtir';
$strCharset = 'Karakter seti';
$strCharsetOfFile = 'Dosyanýn karakter seti:';
$strCharsets = 'Karakter setleri';
-$strCharsetsAndCollations = 'Karakter setleri ve karþýlaþtýrmalar(collation)';
+$strCharsetsAndCollations = 'Karakter setleri ve karþýlaþtýrmalar';
$strCheckAll = 'Tümünü seç';
$strCheckOverhead = 'Baþtan aþaðýya kontrol et';
$strCheckPrivs = 'Ýmtiyazlarý kontrol et';
@@ -130,12 +138,13 @@ $strCheckPrivsLong = '&quot;%s&quot; veritabaný için yetkileri kontrol et.';
$strCheckTable = 'Tabloyu kontrol et';
$strChoosePage = 'Lütfen düzenlemek istediðiniz sayfayý seçin';
$strColComFeat = 'Sütun yorumlarý gösteriliyor';
-$strCollation = 'Karþýlaþtýrma(Collation)';
+$strCollation = 'Karþýlaþtýrma';
$strColumnNames = 'Sütun adlarý';
$strColumnPrivileges = 'Sütuna özgü yetkiler';
$strCommand = 'Komut';
$strComments = 'Sütun yorum,iliþki ve MIME tiplerini içer.';
$strCommentsForTable = 'TABLO YORUMLARI';
+$strCompatibleHashing = 'MySQL&nbsp;4.0 uyumlu';
$strCompleteInserts = 'Her INSERT komutunda sütun adlarýný ekle';
$strCompression = 'Sýkýþtýrma';
$strConfigFileError ='phpMyAdmin konfigurasyon dosyanýzý okuyamadý....<br /> Bu php yorumlama hatasý bulduðu zaman veya dosyayý bulamadýðý zaman meydana gelebilir..<br /> Lütfen aþaðýdaki linki kullanarak dosyayý direkt olarak çaðýrýn ve aldýðýnýz php hata mesajlarýný okuyunuz.Çoðu durumda herhangi bir yerde týrnak veya noktalý virgül eksiktir<br /> Boþ bir sayfayla karþýlaþýrsanýz ,herþey yolunda demektir.';
@@ -145,6 +154,7 @@ $strConnections = 'Baðlantýlar';
$strConstraintsForDumped = 'Dökümü yapýlmýþ tablolar için kýsýtlamalar';
$strConstraintsForTable = 'Tablo için kýsýtlamalar';
$strCookiesRequired = 'Cookieler açýk olmalýdýr.';
+$strCopyDatabaseOK = '%s veritabaný %s\` e kopyalandý.';
$strCopyTable = 'Tabloyu (veritabaný<b>.</b>tablo) kopyala :';
$strCopyTableOK = '%s tablosu %s üzerine kopyalandý.';
$strCopyTableSameNames = 'Tabloyu aynýsýna kopyalayamýyor!';
@@ -164,6 +174,7 @@ $strCzech = 'Çekçe';
$strCzechSlovak = 'Çekçe-Slovakça';
$strDBComment = 'Veritabaný yorumu:';
+$strDBCopy = 'Veritabanýný þuraya kopyala:';
$strDBGContext = 'Ýçerik';
$strDBGContextID = 'Ýçerik ID';
$strDBGHits = 'Giriþler(hit)';
@@ -236,6 +247,7 @@ $strEndRaw = 'END RAW';
$strEnglish = 'Ýngilizce';
$strEnglishPrivileges = ' Not: MySQL yetki adlarý Ýngilizce olarak belirtilmiþtir ';
$strError = 'Hata';
+$strEscapeWildcards = '_ ve % jokerleri harfi harfine kullanýlmak isteniyorsa \ ile beraber kullanýlmalýdýr.';
$strEstonian = 'Estonyaca';
$strExcelEdition = 'Excel tipi';
$strExcelOptions = 'Excel ayarlarý';
@@ -248,7 +260,7 @@ $strExtra = 'Ekstra';
$strFailedAttempts = 'Baþarýsýz denemeler';
$strField = 'Alan';
$strFieldHasBeenDropped = '%s alaný kaldýrýlmýþtýr';
-$strFields = 'Alan Sayýsý';
+$strFields = 'Alanlar';
$strFieldsEmpty = ' Alan sayýsý boþ! ';
$strFieldsEnclosedBy = 'Kapatma karakteri';
$strFieldsEscapedBy = 'Kaçýþ karakteri';
@@ -277,7 +289,7 @@ $strGlobalValue = 'Global deðer';
$strGo = 'Git';
$strGrantOption = 'Hak';
$strGreek = 'Yunanca';
-$strGzip = '"gziplenmiþ"';
+$strGzip = '"gzip"';
$strHasBeenAltered = 'düzenlendi.';
$strHasBeenCreated = 'yaratýldý.';
@@ -305,6 +317,10 @@ $strIndex = 'Ýndeks';
$strIndexHasBeenDropped = '%s indeks\'i silindi.';
$strIndexName = 'Ýndeks ismi :';
$strIndexType = 'Ýndeks tipi :';
+$strIndexWarningMultiple = '`%s` sütunu için birden fazla %s anahtarý yaratýldý. ';
+$strIndexWarningPrimary = 'PRIMARY ve INDEX anahtarlarýnýn ikisine birden `%s` sütunu için deðer verilemez.';
+$strIndexWarningTable = '`%s` tablosunun indexleri ile ilgili sorunlar';
+$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';
$strIndexes = 'Ýndeksler';
$strInnodbStat = 'InnoDB durumu';
$strInsecureMySQL = 'Konfigurasyon dosyanýz (þifresiz root) varsayýlan MySQL yetki dosyasýyla aynen uyuþan ayarlar içeriyor.MySQL sunucunuz bu varsayýlan ayarlarla çalýþýyor,dýþardan giriþe açýk,ve bu güvenlik açýðýný hemen düzeltmeniz gerekmektedir.';
@@ -380,7 +396,7 @@ $strMoveTableSameNames = 'Tabloyu aynýsýna taþýyamýyor!';
$strMultilingual = 'çoklu dil';
$strMustSelectFile = 'Eklemek istediðiniz dosyayý seçmeniz gerekir.';
$strMySQLCharset = 'MySQL karakter seti';
-$strMySQLConnectionCollation = 'MySQL baðlantý karþýlaþtýrmasý(collation)';
+$strMySQLConnectionCollation = 'MySQL baðlantý karþýlaþtýrmasý';
$strMySQLReloaded = 'MySQL yeniden yüklendi.';
$strMySQLSaid = 'MySQL çýktýsý: ';
$strMySQLServerProcess = ' MySQL %pma_s1% %pma_s2% üzerinde %pma_s3% olarak çalýþýyor';
@@ -392,6 +408,7 @@ $strName = 'Ýsim';
$strNeedPrimaryKey = 'Bu tablo için birincil anahtar tanýmlamanýz gerekir.';
$strNext = 'Sonraki';
$strNo = 'Hayýr';
+$strNoActivity = '%s veya daha fazla saniye boyunca hiçbir iþlem yapýlmadý, lütfen yeniden giriþ yapýnýz';
$strNoDatabases = 'Veritabaný yok';
$strNoDatabasesSelected = 'Veritabaný seçilmedi.';
$strNoDescription = 'Tanýmlama yok';
@@ -443,6 +460,7 @@ $strPartialText = 'Kýsmi Metinler';
$strPassword = 'Þifre';
$strPasswordChanged = '%s için þifre baþarýyla deðiþtirildi.';
$strPasswordEmpty = 'Þifre alaný doldurulmadý!';
+$strPasswordHashing = 'Þifre Hash yöntemi';
$strPasswordNotSame = 'Girilen þifreler ayný deðil!';
$strPdfDbSchema = ' "%s" veritabanýnýn þemasý - Sayfa %s';
$strPdfInvalidTblName = ' "%s" tablosu bulunamýyor !';
@@ -579,6 +597,7 @@ $strSearchType = '<b>BUL </b> :';
$strSecretRequired = 'Ayar dosyasý için gizli bir þifre gerekiyor (blowfish_secret).';
$strSelectADb = ' Lütfen bir veritabaný seçiniz';
$strSelectAll = 'Tümünü seç';
+$strSelectBinaryLog = 'Görüntülemek istediðiniz binari kaydýný seçiniz';
$strSelectFields = 'Alan seç (en az bir)';
$strSelectNumRows = 'sorgu içerisinde';
$strSelectTables = 'Tablolarý seç';
@@ -634,6 +653,7 @@ $strSubmit = 'Onayla';
$strSuccess = 'SQL sorgunuz baþarýyla çalýþtýrýlmýþtýr';
$strSum = 'toplam';
$strSwedish = 'Ýsveçce';
+$strSwitchToDatabase = 'Kopyalanmýþ veritabanýný kullan.';
$strSwitchToTable = 'Kopyalanmýþ tabloya geç';
$strTable = 'Tablo:';
@@ -695,6 +715,7 @@ $strUpgrade = '%s %s veya daha sonraki bir sürüme yükseltme yapmanýz gereklidir.
$strUsage = 'Kullaným';
$strUseBackquotes = 'Tablo ve alan isimleri için ters týrnak " ` " iþaretini kullan';
$strUseHostTable = 'Host tablosunu kullan';
+$strUseTabKey = 'Deðerden deðere geçmek için TAB tuþunu istediðiniz herhangi bir yere gitmek için CTRL+OK TUÞLARI\`ný kullanýn.';
$strUseTables = 'Tablolarý kullan';
$strUseTextField = 'Metin alanýný kullan';
$strUseThisValue = 'Bu deðeri kullan';
@@ -733,23 +754,8 @@ $strYes = 'Evet';
$strZeroRemovesTheLimit = 'Not: Bu seçeneklerin 0\'a ayarlanmasý sýnýrý kaldýrýr..';
$strZip = '"ziplenmiþ"';
-$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
-$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
-$strBinLogName = 'Log name'; //to translate
-$strBinLogPosition = 'Position'; //to translate
-$strBinLogEventType = 'Event type'; //to translate
-$strBinLogServerId = 'Server ID'; //to translate
-$strBinLogOriginalPosition = 'Original position'; //to translate
-$strBinLogInfo = 'Information'; //to translate
-$strBinaryLog = 'Binary log'; //to translate
-$strSelectBinaryLog = 'Select binary log to view'; //to translate
-$strDBCopy = 'Copy database to'; //to translate
-$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
-$strSwitchToDatabase = 'Switch to copied database'; //to translate
-$strPasswordHashing = 'Password Hashing'; //to translate
-$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
-$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
-$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
-$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php
index 72ae8a9254..3c29b7b385 100644
--- a/lang/turkish-utf-8.inc.php
+++ b/lang/turkish-utf-8.inc.php
@@ -753,4 +753,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php
index c31e64c1d3..5501bb98c1 100644
--- a/lang/ukrainian-utf-8.inc.php
+++ b/lang/ukrainian-utf-8.inc.php
@@ -744,4 +744,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/lang/ukrainian-windows-1251.inc.php b/lang/ukrainian-windows-1251.inc.php
index 528827f220..b3f10b4d20 100644
--- a/lang/ukrainian-windows-1251.inc.php
+++ b/lang/ukrainian-windows-1251.inc.php
@@ -743,4 +743,10 @@ $strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for col
$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
+$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
+$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
+$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
+$strMbOverloadWarning = 'You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause breaking of some data!'; //to translate
+$strMbExtensionMissing = 'The mbstring PHP extension was not found and you seem to be using multibyte charset. Without mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'; //to translate
+$strAfterInsertNext = 'Edit next row'; //to translate
?>
diff --git a/left.php b/left.php
index 05f38fe183..2472c42523 100644
--- a/left.php
+++ b/left.php
@@ -61,34 +61,15 @@ global $list_item, $table_item;
}
}
-function PMA_reduceNest($_table) {
-
+/* This will take a 1-dimensional array, and shift as many elemnts off
+ * the end, until the allowed maximum level is reached */
+function PMA_reduceNest(&$_table) {
if ($GLOBALS['cfg']['LeftFrameTableLevel'] > 0) {
- $max = $GLOBALS['cfg']['LeftFrameTableLevel'];
- $temp_table = $_table;
- $new_table = array();
- $last_index = 0;
- for ($ti = 0; $ti <= $max; $ti++) {
- if (isset($temp_table[$ti])) {
- $new_table[$ti] = $temp_table[$ti];
- unset($temp_table[$ti]);
- $last_index = $ti;
- }
+ $elements = count($_table);
+ for ($ti = $elements; $ti > $GLOBALS['cfg']['LeftFrameTableLevel']; $ti--) {
+ unset($_table[$ti]);
}
-
- $_table = $new_table;
- }
-
- return $_table;
-}
-
-function PMA_indent($spaces) {
- $string = '';
- for ($i = 0; $i <= $spaces; $i++) {
- $string .= ' ';
}
-
- return $string;
}
function PMA_nestedSetHeaderParent($baseid, $key, $keyhistory, $indent, $indent_level, $val, $childout = true) {
@@ -112,15 +93,15 @@ function PMA_nestedSetHeaderParent($baseid, $key, $keyhistory, $indent, $indent_
}
echo "\n";
- echo PMA_indent($indent * 5) . '<div id="el' . $id . 'Parent" class="parent"' . $on_mouse . '>' . "\n";
- echo PMA_indent($indent * 6) . '<div class="nowrap"><img src="' . $GLOBALS['pmaThemeImage'] . 'spacer.png' . '" border="0" width="' . (($indent - 1) * $indent_level) . '" height="9" alt="" /><a class="item" href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . $GLOBALS['common_url_query'] . '&amp;tbl_group=' . htmlspecialchars($groupkey) . '" onclick="if (capable) {expandBase(\'el' . $id . '\', true); return false} else {return true}">';
+ echo str_repeat(' ', $indent * 5) . '<div id="el' . $id . 'Parent" class="parent"' . $on_mouse . '>' . "\n";
+ echo str_repeat(' ', $indent * 6) . '<div class="nowrap"><img src="' . $GLOBALS['pmaThemeImage'] . 'spacer.png' . '" border="0" width="' . (($indent - 1) * $indent_level) . '" height="9" alt="" /><a class="item" href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . $GLOBALS['common_url_query'] . '&amp;tbl_group=' . htmlspecialchars($groupkey) . '" onclick="if (capable) {expandBase(\'el' . $id . '\', true); return false} else {return true}">';
echo '<img name="imEx" id="el' . $id . 'Img" src="' . $GLOBALS['pmaThemeImage'] . 'b_plus.png" border="0" width="9" height="9" alt="+" /></a>' . "\n";
- echo PMA_indent($indent * 6) . '<a class="item" href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . $GLOBALS['common_url_query'] . '&amp;tbl_group=' . htmlspecialchars($groupkey) . '" title="' . htmlspecialchars($name) . '" onclick="if (capable) {expandBase(\'el' . $id . '\', false)}"><span class="heada">' . htmlspecialchars($name) . '<bdo dir="' . $GLOBALS['text_dir'] . '">&nbsp;&nbsp;</bdo></span><span class="headaCnt">(' . $counter . ')</span></a></div>' . "\n";
- echo PMA_indent($indent * 5) . '</div><!-- class="PMA_nestedSetHeaderParent" -->' . "\n";
+ echo str_repeat(' ', $indent * 6) . '<a class="item" href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . $GLOBALS['common_url_query'] . '&amp;tbl_group=' . htmlspecialchars($groupkey) . '" title="' . htmlspecialchars($name) . '" onclick="if (capable) {expandBase(\'el' . $id . '\', false)}"><span class="heada">' . htmlspecialchars($name) . '<bdo dir="' . $GLOBALS['text_dir'] . '">&nbsp;&nbsp;</bdo></span><span class="headaCnt">(' . $counter . ')</span></a></div>' . "\n";
+ echo str_repeat(' ', $indent * 5) . '</div><!-- class="PMA_nestedSetHeaderParent" -->' . "\n";
echo "\n";
if ($childout) {
- echo PMA_indent($indent * 5) . '<div id="el' . $id . 'Child" class="child nowrap" ' . $on_mouse . '>' . "\n";
+ echo str_repeat(' ', $indent * 5) . '<div id="el' . $id . 'Child" class="child nowrap" ' . $on_mouse . '>' . "\n";
}
}
@@ -143,15 +124,15 @@ function PMA_nestedSetHeader($baseid, $tablestack, $keyhistory, $indent, $indent
}
if ($headerOut) {
- echo PMA_indent($indent * 5) . '</div><!-- class="PMA_nestedSetHeader" -->' . "\n";
+ echo str_repeat(' ', $indent * 5) . '</div><!-- class="PMA_nestedSetHeader" -->' . "\n";
}
}
}
if ($firstGroup && $firstGroupClose) {
- echo PMA_indent($indent * 4) . '</div><!-- class="PMA_nestedSetHeader2" -->' . "\n";
+ echo str_repeat(' ', $indent * 4) . '</div><!-- class="PMA_nestedSetHeader2" -->' . "\n";
} elseif ($firstGroup) {
- echo PMA_indent($indent * 4) . '<!-- spacer="div omitted" class="PMA_nestedSetHeader2" -->' . "\n";
+ echo str_repeat(' ', $indent * 4) . '<!-- spacer="div omitted" class="PMA_nestedSetHeader2" -->' . "\n";
}
}
@@ -182,11 +163,11 @@ function PMA_nestedSet($baseid, $tablestack, $key = '__protected__', $keyhistory
$loops = 0;
foreach ($tablestack['pma_name'] AS $tkey => $tval) {
- echo PMA_indent($indent * 5) . '<img src="' . $GLOBALS['pmaThemeImage'] . 'spacer.png' .'" border="0" width="' . (($indent+$extra_indent) * $indent_level) . '" height="9" alt="" />';
+ echo str_repeat(' ', $indent * 5) . '<img src="' . $GLOBALS['pmaThemeImage'] . 'spacer.png' .'" border="0" width="' . (($indent+$extra_indent) * $indent_level) . '" height="9" alt="" />';
$items = explode("\n", $tablestack['pma_list_item'][$tkey]);
foreach ($items AS $ikey => $ival) {
echo "\n";
- echo PMA_indent(($indent * 5)) . $ival;
+ echo str_repeat(' ', ($indent * 5)) . $ival;
}
echo "\n";
@@ -194,7 +175,7 @@ function PMA_nestedSet($baseid, $tablestack, $key = '__protected__', $keyhistory
}
if ($divClose) {
- echo PMA_indent($indent * 5) . '</div><!-- space="putting omitted div" class="PMA_nestedSet2" -->';
+ echo str_repeat(' ', $indent * 5) . '</div><!-- space="putting omitted div" class="PMA_nestedSet2" -->';
}
} elseif (is_array($tablestack)) {
@@ -376,8 +357,8 @@ if (!$cfg['QueryFrame']) {
.' onmouseover="this.style.backgroundColor=\'#ffffff\';" onmouseout="this.style.backgroundColor=\'\';" align="middle" />'
: '<b>' . $strHome . '</b>')
. '</a>';
- // Logout for advanced authentication
- if ($cfg['Server']['auth_type'] != 'config') {
+ // if we have chosen server show logout for advanced authentication
+ if ($server != 0 && $cfg['Server']['auth_type'] != 'config') {
echo $str_spacer_links;
echo '<a class="item" href="index.php?' . PMA_generate_common_url() . '&amp;old_usr=' . urlencode($PHP_AUTH_USER) . '" target="_parent">'
. ($cfg['MainPageIconic']
@@ -547,6 +528,7 @@ if ($num_dbs > 1) {
natsort($table_array);
}
+ $book_sql_cache = PMA_queryDBBookmarks($db, $cfg['Bookmark'], $table_array);
foreach ($table_array as $table => $table_sortkey) {
$alias = (!empty($tooltip_name) && isset($tooltip_name[$table]))
? htmlspecialchars($tooltip_name[$table])
@@ -561,7 +543,7 @@ if ($num_dbs > 1) {
? $alias
: htmlspecialchars($table));
- $book_sql_query = PMA_queryBookmarks($db, $cfg['Bookmark'], '\'' . PMA_sqlAddslashes($table) . '\'', 'label');
+ $book_sql_query = (isset($book_sql_cache[$table]) ? $book_sql_cache[$table] : FALSE);
$list_item = '<a target="phpmain' . $hash . '" href="sql.php?' . $common_url_query . '&amp;table=' . urlencode($table) . '&amp;sql_query=' . (isset($book_sql_query) && $book_sql_query != FALSE ? urlencode($book_sql_query) : urlencode('SELECT * FROM ' . PMA_backquote($table))) . '&amp;pos=0&amp;goto=' . $cfg['DefaultTabTable'] . '" title="' . $strBrowse . ': ' . $url_title . '">';
$list_item .= '<img src="' . $pmaThemeImage . 'b_sbrowse.png" width="10" height="10" border="0" alt="' . $strBrowse . ': ' . $url_title . '" /></a>';
@@ -578,7 +560,7 @@ if ($num_dbs > 1) {
$_table[$key] = '__protected__';
}
}
- $_table = PMA_reduceNest($_table);
+ PMA_reduceNest($_table);
if (count($_table) == 1) {
array_unshift($_table, '');
@@ -611,6 +593,7 @@ if ($num_dbs > 1) {
$table_title = array();
$table_array = array();
// Gets the list of tables from the current database
+ $book_sql_cache = PMA_queryDBBookmarks($db, $cfg['Bookmark'], $table_array);
while (list($table) = PMA_DBI_fetch_row($tables)) {
$table_array[$table] = '';
$url_title = (!empty($tooltip) && isset($tooltip[$table]))
@@ -620,7 +603,7 @@ if ($num_dbs > 1) {
? htmlspecialchars($tooltip_name[$table])
: '';
- $book_sql_query = PMA_queryBookmarks($db, $cfg['Bookmark'], '\'' . PMA_sqlAddslashes($table) . '\'', 'label');
+ $book_sql_query = (isset($book_sql_cache[$table]) ? $book_sql_cache[$table] : FALSE);
// natural order or not, use an array for the table list
@@ -804,6 +787,7 @@ else if ($num_dbs == 1) {
natcasesort($table_array);
}
+ $book_sql_cache = PMA_queryDBBookmarks($db, $cfg['Bookmark'], $table_array);
foreach ($table_array as $table => $table_sortkey) {
$alias = (!empty($tooltip_name) && isset($tooltip_name[$table]))
? htmlspecialchars($tooltip_name[$table])
@@ -818,7 +802,7 @@ else if ($num_dbs == 1) {
? $alias
: htmlspecialchars($table));
- $book_sql_query = PMA_queryBookmarks($db, $cfg['Bookmark'], '\'' . PMA_sqlAddslashes($table) . '\'', 'label');
+ $book_sql_query = (isset($book_sql_cache[$table]) ? $book_sql_cache[$table] : FALSE);
if ($cfg['LeftFrameLight']) {
echo "\n";
@@ -844,7 +828,7 @@ else if ($num_dbs == 1) {
$_table[$key] = '__protected__';
}
}
- $_table = PMA_reduceNest($_table);
+ PMA_reduceNest($_table);
if (count($_table) == 1) {
array_unshift($_table, '');
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 1f15303089..8aac9fd7c2 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -2,11 +2,10 @@
/* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4:
-
// +--------------------------------------------------------------------------+
// | Set of functions used to run cookie based authentication. |
// | Thanks to Piotr Roszatycki <d3xter at users.sourceforge.net> and |
-// | Dan Wilson who builds this patch for the Debian package. |
+// | Dan Wilson who built this patch for the Debian package. |
// +--------------------------------------------------------------------------+
@@ -14,8 +13,6 @@ if (!isset($coming_from_common)) {
exit;
}
-require_once('./libraries/blowfish.php');
-
// Gets the default font sizes
PMA_setFontSizes();
// Defines the cookie path and whether the server is using https or not
@@ -24,82 +21,13 @@ $cookie_path = substr($pma_uri_parts['path'], 0, strrpos($pma_uri_parts['path'
$is_https = (isset($pma_uri_parts['scheme']) && $pma_uri_parts['scheme'] == 'https') ? 1 : 0;
$current_time = time();
-/**
- * String padding
- *
- * @param string input string
- * @param integer length of the result
- * @param string the filling string
- * @param integer padding mode
- *
- * @return string the padded string
- *
- * @access public
- */
-function full_str_pad($input, $pad_length, $pad_string = '', $pad_type = 0) {
- $str = '';
- $length = $pad_length - strlen($input);
- if ($length > 0) { // str_repeat doesn't like negatives
- if ($pad_type == STR_PAD_RIGHT) { // STR_PAD_RIGHT == 1
- $str = $input.str_repeat($pad_string, $length);
- } elseif ($pad_type == STR_PAD_BOTH) { // STR_PAD_BOTH == 2
- $str = str_repeat($pad_string, floor($length/2));
- $str .= $input;
- $str .= str_repeat($pad_string, ceil($length/2));
- } else { // defaults to STR_PAD_LEFT == 0
- $str = str_repeat($pad_string, $length).$input;
- }
- } else { // if $length is negative or zero we don't need to do anything
- $str = $input;
- }
- return $str;
-}
-
-/**
- * Encryption using blowfish algorithm
- *
- * @param string original data
- * @param string the secret
- *
- * @return string the encrypted result
- *
- * @access public
- *
- * @author lem9
- */
-function PMA_blowfish_encrypt($data, $secret) {
- $pma_cipher = new Horde_Cipher_blowfish;
- $encrypt = '';
- for ($i=0; $i<strlen($data); $i+=8) {
- $block = substr($data, $i, 8);
- if (strlen($block) < 8) {
- $block = full_str_pad($block,8,"\0", 1);
- }
- $encrypt .= $pma_cipher->encryptBlock($block, $secret);
- }
- return base64_encode($encrypt);
-}
-
-/**
- * Decryption using blowfish algorithm
- *
- * @param string encrypted data
- * @param string the secret
- *
- * @return string original data
- *
- * @access public
- *
- * @author lem9
- */
-function PMA_blowfish_decrypt($encdata, $secret) {
- $pma_cipher = new Horde_Cipher_blowfish;
- $decrypt = '';
- $data = base64_decode($encdata);
- for ($i=0; $i<strlen($data); $i+=8) {
- $decrypt .= $pma_cipher->decryptBlock(substr($data, $i, 8), $secret);
- }
- return trim($decrypt);
+// Uses faster mcrypt library if available
+// (Note: mcrypt.lib.php needs $cookie_path and $is_https)
+// TODO: try to load mcrypt?
+if (function_exists('mcrypt_encrypt')) {
+ require_once('./libraries/mcrypt.lib.php');
+} else {
+ require_once('./libraries/blowfish.php');
}
/**
@@ -150,15 +78,12 @@ function PMA_auth()
// username
// do not try to use pma_cookie_username as it was encoded differently
// in previous versions and would produce an undefined offset in blowfish
-
if (!empty($_COOKIE) && isset($_COOKIE['pma_cookie_username-' . $server])) {
$default_user = $_COOKIE['pma_cookie_username-' . $server];
}
-
$decrypted_user = isset($default_user) ? PMA_blowfish_decrypt($default_user, $GLOBALS['cfg']['blowfish_secret']) : '';
$pos = strrpos($decrypted_user, ':');
$default_user = substr($decrypted_user, 0, $pos);
-
// server name
if (!empty($GLOBALS['pma_cookie_servername'])) {
$default_server = $GLOBALS['pma_cookie_servername'];
@@ -526,12 +451,18 @@ function PMA_auth_check()
$decrypted_user = PMA_blowfish_decrypt($PHP_AUTH_USER, $GLOBALS['cfg']['blowfish_secret']);
$pos = strrpos($decrypted_user, ':');
$PHP_AUTH_USER = substr($decrypted_user, 0, $pos);
-
$decrypted_time = (int)substr($decrypted_user, $pos + 1);
- /* User inactive too long */
- /* FIXME: maybe we could say it to user... */
- if ($decrypted_time < $GLOBALS['current_time'] - $GLOBALS['cfg']['LoginCookieValidity']) {
+ // User inactive too long
+ if ($decrypted_time > 0 && $decrypted_time < $GLOBALS['current_time'] - $GLOBALS['cfg']['LoginCookieValidity']) {
+ // Display an error message only if the inactivity has lasted
+ // less than 4 times the timeout value. This is to avoid
+ // alerting users with a error after "much" time has passed,
+ // for example next morning.
+ if ($decrypted_time > $GLOBALS['current_time'] - ($GLOBALS['cfg']['LoginCookieValidity'] * 4)) {
+ $GLOBALS['no_activity'] = TRUE;
+ PMA_auth_fails();
+ }
return FALSE;
}
@@ -681,6 +612,8 @@ global $conn_error, $server;
if (isset($GLOBALS['allowDeny_forbidden']) && $GLOBALS['allowDeny_forbidden']) {
$conn_error = $GLOBALS['strAccessDenied'];
+ } else if (isset($GLOBALS['no_activity']) && $GLOBALS['no_activity']) {
+ $conn_error = sprintf($GLOBALS['strNoActivity'],$GLOBALS['cfg']['LoginCookieValidity']);
} else if (PMA_DBI_getError()) {
$conn_error = PMA_DBI_getError();
} else if (isset($php_errormsg)) {
diff --git a/libraries/blowfish.php b/libraries/blowfish.php
index 611ad5ffbb..4e7cfff08d 100644
--- a/libraries/blowfish.php
+++ b/libraries/blowfish.php
@@ -1,5 +1,8 @@
<?php
+/* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
+
/**
* The Cipher_blowfish:: class implements the Cipher interface enryption data
* using the Blowfish algorithm.
@@ -433,7 +436,18 @@ class Horde_Cipher_blowfish {
$this->setKey($key);
}
- list($L, $R) = array_values(unpack('N*', $block));
+// change for phpMyAdmin
+ $L = null;
+ $R = null;
+
+ $retarray = array_values(unpack('N*', $block));
+ if(isset($retarray[0])) {
+ $L = $retarray[0];
+ }
+ if(isset($retarray[1])) {
+ $R = $retarray[1];
+ }
+// end change for phpMyAdmin
$L ^= $this->p[17];
$R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[16];
@@ -468,4 +482,85 @@ class Horde_Cipher_blowfish {
}
}
+
+// higher-level functions:
+
+/**
+ * String padding
+ *
+ * @param string input string
+ * @param integer length of the result
+ * @param string the filling string
+ * @param integer padding mode
+ *
+ * @return string the padded string
+ *
+ * @access public
+ */
+function full_str_pad($input, $pad_length, $pad_string = '', $pad_type = 0) {
+ $str = '';
+ $length = $pad_length - strlen($input);
+ if ($length > 0) { // str_repeat doesn't like negatives
+ if ($pad_type == STR_PAD_RIGHT) { // STR_PAD_RIGHT == 1
+ $str = $input.str_repeat($pad_string, $length);
+ } elseif ($pad_type == STR_PAD_BOTH) { // STR_PAD_BOTH == 2
+ $str = str_repeat($pad_string, floor($length/2));
+ $str .= $input;
+ $str .= str_repeat($pad_string, ceil($length/2));
+ } else { // defaults to STR_PAD_LEFT == 0
+ $str = str_repeat($pad_string, $length).$input;
+ }
+ } else { // if $length is negative or zero we don't need to do anything
+ $str = $input;
+ }
+ return $str;
+}
+
+/**
+ * Encryption using blowfish algorithm
+ *
+ * @param string original data
+ * @param string the secret
+ *
+ * @return string the encrypted result
+ *
+ * @access public
+ *
+ * @author lem9
+ */
+function PMA_blowfish_encrypt($data, $secret) {
+ $pma_cipher = new Horde_Cipher_blowfish;
+ $encrypt = '';
+ for ($i=0; $i<strlen($data); $i+=8) {
+ $block = substr($data, $i, 8);
+ if (strlen($block) < 8) {
+ $block = full_str_pad($block,8,"\0", 1);
+ }
+ $encrypt .= $pma_cipher->encryptBlock($block, $secret);
+ }
+ return base64_encode($encrypt);
+}
+
+/**
+ * Decryption using blowfish algorithm
+ *
+ * @param string encrypted data
+ * @param string the secret
+ *
+ * @return string original data
+ *
+ * @access public
+ *
+ * @author lem9
+ */
+function PMA_blowfish_decrypt($encdata, $secret) {
+ $pma_cipher = new Horde_Cipher_blowfish;
+ $decrypt = '';
+ $data = base64_decode($encdata);
+ for ($i=0; $i<strlen($data); $i+=8) {
+ $decrypt .= $pma_cipher->decryptBlock(substr($data, $i, 8), $secret);
+ }
+ return trim($decrypt);
+}
+
?>
diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php
index 4dbf83c427..c3d4e67a5e 100644
--- a/libraries/bookmark.lib.php
+++ b/libraries/bookmark.lib.php
@@ -110,6 +110,46 @@ function PMA_queryBookmarks($db, $cfgBookmark, $id, $id_field = 'id', $action_bo
/**
+ * Gets bookmarked DefaultQuery for a Table
+ *
+ * @global resource the controluser db connection handle
+ *
+ * @param string the current database name
+ * @param array the bookmark parameters for the current user
+ * @param array the list of all labels to look for
+ *
+ * @return array bookmark SQL statements
+ *
+ * @access public
+ */
+function &PMA_queryDBBookmarks($db, $cfgBookmark, &$table_array)
+{
+ global $dbh;
+
+ $boommarks = array();
+
+ if (empty($cfgBookmark['db']) || empty($cfgBookmark['table'])) {
+ return $bookmarks;
+ }
+
+ $search_for = array();
+ foreach($table_array AS $table => $table_sortkey) {
+ $search_for[] = "'" . PMA_sqlAddslashes($table) . "'";
+ }
+
+ $query = 'SELECT label, query FROM ' . PMA_backquote($cfgBookmark['db']) . '.' . PMA_backquote($cfgBookmark['table'])
+ . ' WHERE dbase = \'' . PMA_sqlAddslashes($db) . '\''
+ . (count($search_for) > 0 ? ' AND label IN (' . implode(', ', $search_for) . ')' : '');
+ $result = PMA_DBI_try_query($query, $dbh);
+ if (!$result || PMA_DBI_num_rows($result) < 1) return $bookmarks;
+ while ($row = PMA_DBI_fetch_assoc($result)) {
+ $bookmarks[$row['label']] = $row['query'];
+ }
+
+ return $bookmarks;
+} // end of the 'PMA_queryBookmarks()' function
+
+/**
* Adds a bookmark
*
* @global resource the controluser db connection handle
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 6ef9954f5c..120a8da5d9 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -142,7 +142,7 @@ if (isset($cfg['FileRevision'])) {
} else {
$cfg['FileRevision'] = array(1, 1);
}
-if ($cfg['FileRevision'][0] < 2 || ($cfg['FileRevision'][0] == 2 && $cfg['FileRevision'][1] < 44)) {
+if ($cfg['FileRevision'][0] < 2 || ($cfg['FileRevision'][0] == 2 && $cfg['FileRevision'][1] < 48)) {
require_once('./libraries/config_import.lib.php');
}
@@ -299,7 +299,7 @@ if (strtolower($cfg['OBGzip']) == 'auto') {
* If not, it will use default images
*/
// Theme Manager
-if (!isset($_COOKIE['pma_theme']) || empty($_COOKIE['pma_theme'])){
+if (!$cfg['ThemeManager'] || !isset($_COOKIE['pma_theme']) || empty($_COOKIE['pma_theme'])){
$GLOBALS['theme'] = $cfg['ThemeDefault'];
$ThemeDefaultOk = FALSE;
if ($cfg['ThemePath']!='' && $cfg['ThemePath'] != FALSE) {
@@ -982,63 +982,106 @@ if ($is_minimum_common == FALSE) {
*/
$display_pmaAbsoluteUri_warning = 0;
- // Olivier: Setup a default value to let the people and lazy syadmins
- // work anyway, but display a big warning on the main.php
- // page.
+ // Setup a default value to let the people and lazy syadmins work anyway,
+ // but display a big warning on the main.php page.
if (empty($cfg['PmaAbsoluteUri'])) {
- if (!empty($_SERVER)) {
- $SERVER_ARRAY = '_SERVER';
- } else {
- $SERVER_ARRAY = 'GLOBALS';
- } // end if
- if (isset(${$SERVER_ARRAY}['HTTP_HOST'])) {
- $HTTP_HOST = ${$SERVER_ARRAY}['HTTP_HOST'];
- }
- if (isset(${$SERVER_ARRAY}['HTTPS'])) {
- $HTTPS = ${$SERVER_ARRAY}['HTTPS'];
- }
- if (isset(${$SERVER_ARRAY}['SERVER_PORT'])) {
- $SERVER_PORT = ${$SERVER_ARRAY}['SERVER_PORT'];
- }
- if (isset(${$SERVER_ARRAY}['REQUEST_URI'])) {
- $REQUEST_URI = ${$SERVER_ARRAY}['REQUEST_URI'];
- }
- if (isset(${$SERVER_ARRAY}['PATH_INFO'])) {
- $PATH_INFO = ${$SERVER_ARRAY}['PATH_INFO'];
- }
- if (isset(${$SERVER_ARRAY}['HTTP_SCHEME'])) {
- $HTTP_SCHEME = ${$SERVER_ARRAY}['HTTP_SCHEME'];
+
+ $url = array();
+
+ // At first we try to parse REQUEST_URI, it might contain full URI
+ if (!empty($_SERVER['REQUEST_URI'])) {
+ $url = parse_url($_SERVER['REQUEST_URI']);
}
- // in some cases $REQUEST_URI contains full URI including protocol and host, so just use it:
- if (isset($REQUEST_URI) && preg_match('@https?://@', $REQUEST_URI)) {
- $cfg['PmaAbsoluteUri'] = substr($REQUEST_URI, 0, strrpos($REQUEST_URI, '/') + 1);
- } else {
- if (!empty($HTTP_SCHEME)) {
- $cfg['PmaAbsoluteUri'] = $HTTP_SCHEME . '://';
+ // If we don't have scheme, we didn't have full URL so we need to dig deeper
+ if (empty($url['scheme'])) {
+ // Scheme
+ if (!empty($_SERVER['HTTP_SCHEME'])) {
+ $url['scheme'] = $_SERVER['HTTP_SCHEME'];
+ } else {
+ $url['scheme'] = (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off') ? 'https' : 'http';
+ }
+
+ // Host and port
+ if (!empty($_SERVER['HTTP_HOST'])) {
+ if (strpos($_SERVER['HTTP_HOST'], ':') > 0) {
+ list($url['host'], $url['port']) = explode(':', $_SERVER['HTTP_HOST']);
+ } else {
+ $url['host'] = $_SERVER['HTTP_HOST'];
+ }
+ } else if (!empty($_SERVER['SERVER_NAME'])) {
+ $url['host'] = $_SERVER['SERVER_NAME'];
} else {
- $cfg['PmaAbsoluteUri'] = ((!empty($HTTPS) && strtolower($HTTPS) != 'off') ? 'https' : 'http') . '://';
+ header('Content-Type: text/html; charset=' . $charset);
+ // Displays the error message
+ ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $available_languages[$lang][2]; ?>" lang="<?php echo $available_languages[$lang][2]; ?>" dir="<?php echo $text_dir; ?>">
+
+<head>
+<title>phpMyAdmin</title>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
+
+<style type="text/css">
+<!--
+body {font-family: sans-serif; font-size: small; color: #000000; background-color: #F5F5F5}
+h1 {font-family: sans-serif; font-size: large; font-weight: bold}
+//-->
+</style>
+</head>
+
+
+<body bgcolor="#ffffff">
+<h1>phpMyAdmin - <?php echo $strError; ?></h1>
+<p>
+<?php echo $strPmaUriError; ?><br /><br />
+</p>
+</body>
+
+</html>
+ <?php
+ exit();
}
- $port_in_HTTP_HOST = (strpos($HTTP_HOST, ':') > 0);
- $cfg['PmaAbsoluteUri'] .= $HTTP_HOST;
- // if $cfg['PmaAbsoluteUri'] is empty and port == 80 or port == 443, do not add ":80" or ":443"
- // to the generated URL -> prevents a double password query in case of http authentication.
+ // If we didn't set port yet...
+ if (empty($url['port']) && !empty($_SERVER['SERVER_PORT'])) {
+ $url['port'] = $_SERVER['SERVER_PORT'];
+ }
- if (!(!$port_in_HTTP_HOST && !empty($SERVER_PORT) && ($SERVER_PORT == 80 || $SERVER_PORT == 443))) {
- $cfg['PmaAbsoluteUri'] .= ((!empty($SERVER_PORT) && !$port_in_HTTP_HOST) ? ':' . $SERVER_PORT : '');
+ // And finally the path could be already set from REQUEST_URI
+ if (empty($url['path'])) {
+ if (!empty($_SERVER['PATH_INFO'])) {
+ $path = parse_url($_SERVER['PATH_INFO']);
+ } else {
+ // PHP_SELF in CGI often points to cgi executable, so use it as last choice
+ $path = parse_url($_SERVER['PHP_SELF']);
+ }
+ $url['path'] = $path['path'];
+ unset($path);
}
+ }
- // rabus: if php is in CGI mode, $PHP_SELF often contains the path to the CGI executable.
- // This is why we try to get the path from $REQUEST_URI or $PATH_INFO first.
- if (isset($REQUEST_URI)) {
- $cfg['PmaAbsoluteUri'] .= substr($REQUEST_URI, 0, strrpos($REQUEST_URI, '/') + 1);
- } else if (isset($PATH_INFO)) {
- $cfg['PmaAbsoluteUri'] .= substr($PATH_INFO, 0, strrpos($PATH_INFO, '/') + 1);
- } else {
- $cfg['PmaAbsoluteUri'] .= substr($PHP_SELF, 0, strrpos($PHP_SELF, '/') + 1);
+ // Make url from parts we have
+ $cfg['PmaAbsoluteUri'] = $url['scheme'] . '://';
+ // Was there user information?
+ if (!empty($url['user'])) {
+ $cfg['PmaAbsoluteUri'] .= $url['user'];
+ if (!empty($url['pass'])) {
+ $cfg['PmaAbsoluteUri'] .= ':' . $url['pass'];
}
+ $cfg['PmaAbsoluteUri'] .= '@';
}
+ // Add hostname
+ $cfg['PmaAbsoluteUri'] .= $url['host'];
+ // Add port, if it not the default one
+ if (!empty($url['port']) && (($url['scheme'] == 'http' && $url['port'] != 80) || ($url['scheme'] == 'https' && $url['port'] != 443))) {
+ $cfg['PmaAbsoluteUri'] .= ':' . $url['port'];
+ }
+ // And finally path, without script name
+ $cfg['PmaAbsoluteUri'] .= substr($url['path'], 0, strrpos($url['path'], '/') + 1);
+
+ unset($url);
// We display the warning by default, but not if it is disabled thru
// via the $cfg['PmaAbsoluteUri_DisableWarning'] variable.
@@ -1062,16 +1105,7 @@ if ($is_minimum_common == FALSE) {
// If URI doesn't start with http:// or https://, we will add
// this.
if (substr($cfg['PmaAbsoluteUri'], 0, 7) != 'http://' && substr($cfg['PmaAbsoluteUri'], 0, 8) != 'https://') {
- if (!empty($_SERVER)) {
- $SERVER_ARRAY = '_SERVER';
- } else {
- $SERVER_ARRAY = 'GLOBALS';
- } // end if
- if (isset(${$SERVER_ARRAY}['HTTPS'])) {
- $HTTPS = ${$SERVER_ARRAY}['HTTPS'];
- }
-
- $cfg['PmaAbsoluteUri'] = ((!empty($HTTPS) && strtolower($HTTPS) != 'off') ? 'https' : 'http') . ':'
+ $cfg['PmaAbsoluteUri'] = ((!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off') ? 'https' : 'http') . ':'
. (substr($cfg['PmaAbsoluteUri'], 0, 2) == '//' ? '' : '//')
. $cfg['PmaAbsoluteUri'];
}
@@ -1543,6 +1577,30 @@ if (typeof(window.parent) != 'undefined'
}
/**
+ * Sanitizes $message, taking into account our special codes
+ * for formatting
+ *
+ * @param string the message
+ *
+ * @return string the sanitized message
+ *
+ * @access public
+ */
+ function PMA_sanitize($message)
+ {
+ $replace_pairs = array(
+ '<' => '&lt;',
+ '>' => '&gt;',
+ '[i]' => '<i>',
+ '[/i]' => '</i>',
+ '[b]' => '<b>',
+ '[br]' => '<br />',
+ '[/b]' => '</b>',
+ );
+ return strtr($message, $replace_pairs);
+ }
+
+ /**
* Displays a message at the top of the "main" (right) frame
*
* @param string the message to display
@@ -1555,6 +1613,9 @@ if (typeof(window.parent) != 'undefined'
{
global $cfg;
+ // Sanitizes $message
+ $message = PMA_sanitize($message);
+
// Corrects the tooltip text via JS if required
if (!empty($GLOBALS['table']) && $cfg['ShowTooltip']) {
$result = PMA_DBI_try_query('SHOW TABLE STATUS FROM ' . PMA_backquote($GLOBALS['db']) . ' LIKE \'' . PMA_sqlAddslashes($GLOBALS['table'], TRUE) . '\'');
@@ -2272,7 +2333,9 @@ if (typeof(document.getElementById) != 'undefined'
if (!isset($row[$i]) || is_null($row[$i])) {
$condition .= 'IS NULL AND';
} else {
- if ($meta->type == 'blob'
+ if ($meta->numeric) {
+ $condition .= '= ' . $row[$i] . ' AND';
+ } elseif ($meta->type == 'blob'
// hexify only if this is a true not empty BLOB
&& stristr($field_flags, 'BINARY')
&& !empty($row[$i])) {
diff --git a/libraries/config_import.lib.php b/libraries/config_import.lib.php
index 9a8094e31b..444c217f4c 100644
--- a/libraries/config_import.lib.php
+++ b/libraries/config_import.lib.php
@@ -943,10 +943,10 @@ if ($cfg['ShowFunctionFields']) {
'LCASE',
'UCASE',
'NOW',
- 'OLD_PASSWORD',
+ 'OLD_PASSWORD',
'PASSWORD',
'MD5',
- 'SHA1',
+ 'SHA1',
'ENCRYPT',
'RAND',
'LAST_INSERT_ID',
@@ -1004,7 +1004,7 @@ if ($cfg['ShowFunctionFields']) {
'SOUNDEX',
'LCASE',
'UCASE',
- 'OLD_PASSWORD',
+ 'OLD_PASSWORD',
'PASSWORD',
'MD5',
'SHA1',
@@ -1224,6 +1224,9 @@ if (!isset($cfg['Export']['sql_structure'])) {
if (!isset($cfg['Export']['sql_data'])) {
$cfg['Export']['sql_data'] = TRUE;
}
+if (!isset($cfg['Export']['sql_compat'])) {
+ $cfg['Export']['sql_compat'] = 'NONE';
+}
if (!isset($cfg['Export']['sql_backquotes'])) {
$cfg['Export']['sql_backquotes'] = TRUE;
}
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 1f1d02a72d..97f2342194 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -163,7 +163,7 @@ function PMA_DBI_postConnect($link) {
}
$mysql_charset = $GLOBALS['mysql_charset_map'][$GLOBALS['charset']];
- if (empty($collation_connection) || (strpos('_', $collation_connection) ? substr($collation_connection, 0, strpos('_', $collation_connection)) : $collation_connection) == $mysql_charset) {
+ if (empty($collation_connection) || (strpos($collation_connection, '_') ? substr($collation_connection, 0, strpos($collation_connection, '_')) : $collation_connection) == $mysql_charset) {
PMA_DBI_query('SET NAMES ' . $mysql_charset . ';', $link, PMA_DBI_QUERY_STORE);
} else {
PMA_DBI_query('SET CHARACTER SET ' . $mysql_charset . ';', $link, PMA_DBI_QUERY_STORE);
@@ -172,7 +172,7 @@ function PMA_DBI_postConnect($link) {
PMA_DBI_query('SET collation_connection = \'' . $collation_connection . '\';', $link, PMA_DBI_QUERY_STORE);
}
$collation_connection = PMA_DBI_get_variable('collation_connection', PMA_DBI_GETVAR_SESSION, $link);
- $charset_connection = PMA_DBI_get_variable('character_set_connection', PMA_DBI_GETVAR_SESSION, $link);
+ $charset_connection = PMA_DBI_get_variable('character_set_connection', PMA_DBI_GETVAR_SESSION, $link);
// Add some field types to the list
// (we pass twice here; feel free to code something better :)
diff --git a/libraries/dbg/profiling.php b/libraries/dbg/profiling.php
index d29b1b4855..56f55212f4 100644
--- a/libraries/dbg/profiling.php
+++ b/libraries/dbg/profiling.php
@@ -18,7 +18,7 @@ if (isset($GLOBALS['DBG']) && $GLOBALS['DBG']
* AUTHOR: Dmitri Dmitrienko <dd@cron.ru>
*/
- dbg_get_profiler_results(&$dbg_prof_results);
+ dbg_get_profiler_results($dbg_prof_results);
echo '<br /><table width="1000" cellspacing="0" cellpadding="2" style="font:8pt courier">' . "\n" .
'<thead>' . "\n" .
@@ -36,7 +36,7 @@ if (isset($GLOBALS['DBG']) && $GLOBALS['DBG']
'<tbody style="vertical-align: top">' . "\n";
foreach ($dbg_prof_results['line_no'] AS $idx => $line_no) {
$mod_no = $dbg_prof_results['mod_no'][$idx];
- dbg_get_module_name($mod_no, &$mod_name);
+ dbg_get_module_name($mod_no, $mod_name);
//if (strpos("!".$mod_name, 'dbg.php') > 0) continue;
@@ -52,10 +52,10 @@ if (isset($GLOBALS['DBG']) && $GLOBALS['DBG']
$time_min = sprintf('%.3f', $time_min);
$time_max = sprintf('%.3f', $time_max);
- dbg_get_source_context($mod_no, $line_no, &$ctx_id);
+ dbg_get_source_context($mod_no, $line_no, $ctx_id);
//use a default context name if needed
- if (dbg_get_context_name($ctx_id, &$ctx_name)
+ if (dbg_get_context_name($ctx_id, $ctx_name)
&& strcmp($ctx_name,'') == 0) {
$ctx_name = "::main";
}
diff --git a/libraries/defines.lib.php b/libraries/defines.lib.php
index f01be56998..0c1d0ff7f9 100644
--- a/libraries/defines.lib.php
+++ b/libraries/defines.lib.php
@@ -20,7 +20,7 @@
*/
// phpMyAdmin release
if (!defined('PMA_VERSION')) {
- define('PMA_VERSION', '2.6.1-dev');
+ define('PMA_VERSION', '2.6.1-rc2');
}
if (!defined('PMA_THEME_VERSION')) {
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 3259f78486..13e004d97a 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -237,7 +237,20 @@ if (!$hide_structure) { ?>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="sql_mime" value="yes" id="checkbox_sql_use_mime" <?php PMA_exportCheckboxCheck('sql_mime'); ?> style="vertical-align: middle" /><label for="checkbox_sql_use_mime"><?php echo $strMIME_MIMEtype; ?></label><br />
<?php
} // end MIME
+ if (PMA_MYSQL_INT_VERSION >= 40100) {
?>
+ <label for="select_sql_compat"><?php echo $strSQLExportCompatibility; ?>:&nbsp;</label><select name="sql_compat" id="select_sql_compat" style="vertical-align: middle">
+ <?php
+ /* FIXME: offer only those that have effect on actual version? */
+ $compats = array('NONE', 'ANSI', 'DB2', 'MAXDB', 'MSSQL', 'MYSQL323', 'MYSQL40', 'ORACLE', 'POSTGRESQL', 'TRADITIONAL');
+ foreach ($compats as $x) {
+ echo '<option value="' . $x . '"' . ($cfg['Export']['sql_compat'] == $x ? ' selected="selected"' : '' ) . '>' . $x . '</option>' . "\n";
+ }
+ ?>
+ </select>
+ <?php echo PMA_showMySQLDocu('manual_MySQL_Database_Administration', 'Server_SQL_mode') . "\n";
+ }
+ ?>
</td>
</tr>
<?php
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 8b9081d741..fcf33ba496 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -86,7 +86,11 @@ function PMA_setDisplayMode(&$the_disp_mode, &$the_total)
$do_display['nav_bar'] = (string) '0';
$do_display['ins_row'] = (string) '0';
$do_display['bkm_form'] = (string) '1';
- $do_display['text_btn'] = (string) '0';
+ if ($GLOBALS['is_analyse']) {
+ $do_display['text_btn'] = (string) '1';
+ } else {
+ $do_display['text_btn'] = (string) '0';
+ }
$do_display['pview_lnk'] = (string) '1';
}
// 2.2 Statement is a "SHOW..."
@@ -468,15 +472,8 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// grab indexes data:
PMA_DBI_select_db($db);
-
if (!defined('PMA_IDX_INCLUDED')) {
- $local_query = 'SHOW KEYS FROM ' . PMA_backquote($table);
- $result = PMA_DBI_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url_0);
- $ret_keys = array();
- while ($row = PMA_DBI_fetch_assoc($result)) {
- $ret_keys[] = $row;
- }
- PMA_DBI_free_result($result);
+ $ret_keys = PMA_get_indexes($table);
}
$prev_index = '';
@@ -1859,9 +1856,9 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
if ($cfg['PropertiesIconic']) {
PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_change', $GLOBALS['strChange'], 'b_edit.png');
- PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_change', $delete_text, 'b_drop.png');
+ PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_delete', $delete_text, 'b_drop.png');
if ($analyzed_sql[0]['querytype'] == 'SELECT') {
- PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_change', $GLOBALS['strExport'], 'b_tblexport.png');
+ PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_export', $GLOBALS['strExport'], 'b_tblexport.png');
}
echo "\n";
} else {
diff --git a/libraries/display_tbl_links.lib.php b/libraries/display_tbl_links.lib.php
index d7d9618466..97a27873d9 100644
--- a/libraries/display_tbl_links.lib.php
+++ b/libraries/display_tbl_links.lib.php
@@ -44,7 +44,7 @@ if ( $doWriteModifyAt == 'left' ){
echo ' <td width="16" align="center" valign="top" bgcolor="' . $bgcolor . '">' . "\n"
. ' <input type="checkbox" id="id_rows_to_delete' . $row_no . 'r" name="rows_to_delete[' . $uva_condition . ']"'
. ' onclick="copyCheckboxesRange(\'rowsDeleteForm\', \'id_rows_to_delete' . $row_no . '\',\'r\');"'
- . ' value="' . $del_query . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />' . "\n"
+ . ' value="' . $del_query . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />' . "\n"
. ' </td>' . "\n";
}
}
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index fe169ce9b7..b814b15dea 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -56,6 +56,11 @@ function PMA_exportHeader() {
global $crlf;
global $cfg;
+ if (PMA_MYSQL_INT_VERSION >= 40100 && isset($GLOBALS['sql_compat']) && $GLOBALS['sql_compat'] != 'NONE') {
+ $result = PMA_DBI_query('SET @@SQL_MODE="' . $GLOBALS['sql_compat'] . '"');
+ PMA_DBI_free_result($result);
+ }
+
$head = $GLOBALS['comment_marker'] . 'phpMyAdmin SQL Dump' . $crlf
. $GLOBALS['comment_marker'] . 'version ' . PMA_VERSION . $crlf
. $GLOBALS['comment_marker'] . 'http://www.phpmyadmin.net' . $crlf
@@ -143,8 +148,12 @@ function PMA_exportDBHeader($db) {
* @access public
*/
function PMA_exportDBFooter($db) {
- if (isset($GLOBALS['sql_constraints'])) return PMA_exportOutputHandler($GLOBALS['sql_constraints']);
- return TRUE;
+ $result = TRUE;
+ if (isset($GLOBALS['sql_constraints'])) {
+ $result = PMA_exportOutputHandler($GLOBALS['sql_constraints']);
+ unset($GLOBALS['sql_constraints']);
+ }
+ return $result;
}
/**
@@ -534,8 +543,8 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
// a binary field
// Note: with mysqli, under MySQL 4.1.3, we get the flag
// "binary" for those field types (I don't know why)
- } else if (stristr($field_flags[$j], 'BINARY')
- && isset($GLOBALS['hexforbinary'])
+ } else if (stristr($field_flags[$j], 'BINARY')
+ && isset($GLOBALS['hexforbinary'])
&& $fields_meta[$j]->type != 'datetime'
&& $fields_meta[$j]->type != 'date'
&& $fields_meta[$j]->type != 'time'
diff --git a/libraries/fpdf/font/FreeSans.ctg.z b/libraries/fpdf/font/FreeSans.ctg.z
new file mode 100644
index 0000000000..164785c1fb
--- /dev/null
+++ b/libraries/fpdf/font/FreeSans.ctg.z
Binary files differ
diff --git a/libraries/fpdf/font/FreeSans.php b/libraries/fpdf/font/FreeSans.php
new file mode 100644
index 0000000000..df8a3f6b36
--- /dev/null
+++ b/libraries/fpdf/font/FreeSans.php
@@ -0,0 +1,150 @@
+<?php
+$type='TrueTypeUnicode';
+$name='FreeSans';
+$desc=array('Ascent'=>1148,'Descent'=>-459,'CapHeight'=>1148,'Flags'=>32,'FontBBox'=>'[-797 -459 1632 1148]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
+$up=-151;
+$ut=50;
+$cw=array(
+ 13=>333, 32=>278, 33=>278, 34=>355, 35=>556, 36=>556, 37=>889, 38=>667, 39=>191, 40=>333, 41=>333, 42=>389, 43=>584, 44=>278, 45=>333, 46=>278,
+ 47=>278, 48=>556, 49=>556, 50=>556, 51=>556, 52=>556, 53=>556, 54=>556, 55=>556, 56=>556, 57=>556, 58=>278, 59=>278, 60=>584, 61=>584, 62=>584,
+ 63=>556, 64=>1015, 65=>667, 66=>667, 67=>722, 68=>722, 69=>667, 70=>611, 71=>778, 72=>722, 73=>278, 74=>500, 75=>667, 76=>556, 77=>833, 78=>722,
+ 79=>778, 80=>667, 81=>778, 82=>722, 83=>667, 84=>611, 85=>722, 86=>667, 87=>944, 88=>667, 89=>667, 90=>611, 91=>278, 92=>278, 93=>278, 94=>469,
+ 95=>556, 96=>333, 97=>556, 98=>556, 99=>500, 100=>556, 101=>556, 102=>278, 103=>556, 104=>556, 105=>222, 106=>222, 107=>500, 108=>222, 109=>833, 110=>556,
+ 111=>556, 112=>556, 113=>556, 114=>333, 115=>500, 116=>278, 117=>556, 118=>500, 119=>722, 120=>500, 121=>500, 122=>500, 123=>334, 124=>260, 125=>334, 126=>584,
+ 8364=>556, 1027=>611, 8218=>222, 402=>556, 8222=>333, 8230=>1000, 8224=>556, 8225=>556, 710=>333, 8240=>1000, 352=>667, 8249=>333, 338=>1000, 1036=>667, 381=>611, 1039=>722,
+ 8216=>222, 8217=>221, 8220=>333, 8221=>333, 8226=>350, 8211=>556, 8212=>1000, 732=>333, 8482=>1000, 353=>500, 8250=>333, 339=>944, 1116=>500, 382=>500, 376=>667, 160=>278,
+ 161=>333, 162=>556, 163=>556, 164=>556, 165=>556, 166=>260, 167=>556, 168=>333, 169=>737, 170=>370, 171=>556, 172=>584, 173=>333, 174=>737, 175=>333, 176=>606,
+ 177=>584, 178=>351, 179=>351, 180=>333, 181=>556, 182=>537, 183=>278, 184=>333, 185=>351, 186=>365, 187=>556, 188=>869, 189=>869, 190=>869, 191=>611, 192=>667,
+ 193=>667, 194=>667, 195=>667, 196=>667, 197=>667, 198=>1000, 199=>722, 200=>667, 201=>667, 202=>667, 203=>667, 204=>278, 205=>278, 206=>278, 207=>278, 208=>722,
+ 209=>722, 210=>778, 211=>778, 212=>778, 213=>778, 214=>778, 215=>584, 216=>778, 217=>722, 218=>722, 219=>722, 220=>722, 221=>666, 222=>666, 223=>611, 224=>556,
+ 225=>556, 226=>556, 227=>556, 228=>556, 229=>556, 230=>889, 231=>500, 232=>556, 233=>556, 234=>556, 235=>556, 236=>278, 237=>278, 238=>278, 239=>278, 240=>556,
+ 241=>556, 242=>556, 243=>556, 244=>556, 245=>556, 246=>556, 247=>584, 248=>611, 249=>556, 250=>556, 251=>556, 252=>556, 253=>500, 254=>555, 255=>500, 256=>667,
+ 257=>556, 258=>667, 259=>556, 260=>667, 261=>556, 262=>722, 263=>500, 264=>722, 265=>500, 266=>722, 267=>500, 268=>722, 269=>500, 270=>722, 271=>635, 272=>722,
+ 273=>556, 274=>667, 275=>556, 276=>667, 277=>556, 278=>667, 279=>556, 280=>667, 281=>556, 282=>667, 283=>556, 284=>778, 285=>556, 286=>778, 287=>556, 288=>778,
+ 289=>556, 290=>778, 291=>556, 292=>722, 293=>556, 294=>722, 295=>556, 296=>278, 297=>278, 298=>278, 299=>222, 300=>278, 301=>278, 302=>278, 303=>222, 304=>278,
+ 305=>278, 306=>700, 307=>374, 308=>500, 309=>222, 310=>667, 311=>500, 312=>500, 313=>556, 314=>222, 315=>556, 316=>222, 317=>556, 318=>292, 319=>556, 320=>500,
+ 321=>556, 322=>222, 323=>722, 324=>556, 325=>722, 326=>556, 327=>722, 328=>556, 329=>556, 330=>722, 331=>556, 332=>778, 333=>556, 334=>778, 335=>556, 336=>778,
+ 337=>556, 340=>722, 341=>333, 342=>722, 343=>333, 344=>722, 345=>333, 346=>667, 347=>500, 348=>667, 349=>500, 350=>667, 351=>500, 354=>611, 355=>278, 356=>611,
+ 357=>308, 358=>611, 359=>278, 360=>722, 361=>556, 362=>722, 363=>556, 364=>722, 365=>556, 366=>722, 367=>556, 368=>722, 369=>556, 370=>722, 371=>556, 372=>944,
+ 373=>722, 374=>667, 375=>500, 377=>611, 378=>500, 379=>611, 380=>500, 383=>278, 384=>556, 386=>667, 387=>556, 388=>667, 389=>556, 390=>722, 391=>722, 392=>500,
+ 393=>722, 395=>667, 396=>556, 398=>667, 399=>778, 400=>667, 401=>611, 403=>778, 409=>500, 413=>722, 414=>556, 415=>778, 421=>556, 423=>667, 424=>500, 425=>611,
+ 427=>278, 429=>278, 430=>611, 452=>1311, 453=>1208, 454=>1056, 455=>1056, 456=>778, 457=>444, 458=>1158, 459=>944, 460=>778, 461=>667, 462=>556, 463=>278, 464=>278,
+ 465=>778, 466=>556, 467=>722, 468=>556, 469=>722, 470=>556, 471=>722, 472=>556, 473=>722, 474=>556, 475=>722, 476=>556, 477=>556, 478=>667, 479=>556, 480=>667,
+ 481=>556, 482=>1000, 483=>889, 484=>778, 485=>556, 486=>778, 487=>556, 488=>667, 489=>500, 490=>778, 491=>556, 492=>778, 493=>556, 496=>222, 497=>1333, 498=>1222,
+ 499=>1056, 500=>778, 501=>556, 504=>722, 505=>556, 506=>667, 507=>556, 508=>1000, 509=>889, 510=>778, 511=>611, 512=>667, 513=>556, 514=>667, 515=>556, 516=>667,
+ 517=>556, 518=>667, 519=>556, 520=>278, 521=>278, 522=>278, 523=>278, 524=>778, 525=>556, 526=>778, 527=>556, 528=>722, 529=>333, 530=>722, 531=>333, 532=>722,
+ 533=>556, 534=>722, 535=>556, 536=>667, 537=>500, 538=>611, 539=>278, 542=>722, 543=>556, 550=>667, 551=>556, 552=>667, 553=>556, 554=>778, 555=>556, 556=>778,
+ 557=>556, 558=>778, 559=>556, 560=>778, 561=>556, 562=>667, 563=>500, 592=>556, 593=>556, 594=>556, 595=>556, 596=>500, 598=>556, 599=>556, 600=>556, 601=>556,
+ 603=>500, 604=>500, 608=>556, 609=>556, 613=>556, 614=>556, 615=>556, 616=>222, 617=>222, 618=>278, 621=>222, 623=>833, 624=>833, 625=>833, 626=>556, 627=>556,
+ 629=>556, 633=>333, 634=>333, 635=>333, 636=>333, 637=>333, 638=>278, 639=>278, 642=>500, 643=>278, 644=>278, 645=>278, 647=>278, 648=>278, 649=>556, 652=>500,
+ 653=>722, 654=>500, 656=>500, 668=>500, 670=>500, 672=>556, 711=>333, 714=>333, 715=>333, 728=>333, 729=>333, 730=>333, 731=>333, 733=>333, 768=>0, 769=>0,
+ 770=>0, 771=>0, 772=>0, 774=>0, 775=>0, 776=>0, 778=>0, 779=>0, 780=>0, 783=>0, 785=>0, 786=>0, 787=>0, 788=>0, 806=>0, 807=>0,
+ 808=>0, 884=>199, 885=>199, 890=>332, 894=>278, 900=>414, 901=>747, 902=>730, 903=>278, 904=>664, 905=>681, 906=>230, 908=>792, 910=>710, 911=>758, 912=>286,
+ 913=>684, 914=>628, 915=>582, 916=>684, 917=>650, 918=>628, 919=>683, 920=>750, 921=>236, 922=>684, 923=>684, 924=>800, 925=>654, 926=>630, 927=>750, 928=>721,
+ 929=>638, 931=>628, 932=>628, 933=>684, 934=>717, 935=>723, 936=>745, 937=>720, 938=>236, 939=>684, 940=>608, 941=>528, 942=>547, 943=>307, 944=>515, 945=>596,
+ 946=>516, 947=>531, 948=>560, 949=>510, 950=>462, 951=>526, 952=>526, 953=>286, 954=>516, 955=>560, 956=>574, 957=>504, 958=>470, 959=>550, 960=>661, 961=>566,
+ 962=>535, 963=>616, 964=>532, 965=>515, 966=>741, 967=>572, 968=>662, 969=>740, 970=>286, 971=>515, 972=>553, 973=>518, 974=>740, 1024=>667, 1025=>667, 1026=>766,
+ 1028=>722, 1029=>667, 1030=>278, 1031=>278, 1032=>500, 1033=>1080, 1034=>1014, 1035=>766, 1037=>722, 1038=>650, 1040=>667, 1041=>667, 1042=>667, 1043=>611, 1044=>812, 1045=>667,
+ 1046=>1023, 1047=>667, 1048=>728, 1049=>728, 1050=>667, 1051=>673, 1052=>844, 1053=>719, 1054=>778, 1055=>719, 1056=>667, 1057=>722, 1058=>611, 1059=>650, 1060=>936, 1061=>667,
+ 1062=>741, 1063=>648, 1064=>828, 1065=>850, 1066=>897, 1067=>872, 1068=>667, 1069=>722, 1070=>1032, 1071=>702, 1072=>556, 1073=>556, 1074=>522, 1075=>430, 1076=>602, 1077=>556,
+ 1078=>837, 1079=>500, 1080=>567, 1081=>567, 1082=>510, 1083=>557, 1084=>618, 1085=>558, 1086=>556, 1087=>557, 1088=>576, 1089=>500, 1090=>496, 1091=>500, 1092=>912, 1093=>500,
+ 1094=>578, 1095=>520, 1096=>692, 1097=>712, 1098=>734, 1099=>690, 1100=>552, 1101=>500, 1102=>758, 1103=>543, 1104=>556, 1105=>556, 1106=>568, 1107=>430, 1108=>500, 1109=>500,
+ 1110=>222, 1111=>278, 1112=>222, 1113=>840, 1114=>850, 1115=>568, 1117=>556, 1118=>500, 1119=>556, 1164=>667, 1165=>552, 1166=>667, 1167=>556, 1168=>611, 1169=>430, 1170=>611,
+ 1171=>430, 1172=>611, 1173=>430, 1174=>1023, 1175=>837, 1176=>667, 1177=>500, 1178=>667, 1179=>500, 1180=>667, 1181=>500, 1182=>667, 1183=>500, 1184=>667, 1185=>500, 1186=>722,
+ 1187=>556, 1188=>1060, 1189=>764, 1190=>722, 1191=>556, 1192=>722, 1193=>500, 1194=>722, 1195=>500, 1196=>611, 1197=>496, 1198=>667, 1199=>500, 1200=>667, 1201=>500, 1202=>667,
+ 1203=>500, 1204=>774, 1205=>608, 1206=>642, 1207=>508, 1208=>642, 1209=>508, 1210=>642, 1211=>508, 1212=>778, 1213=>556, 1214=>688, 1215=>556, 1216=>278, 1217=>1023, 1218=>837,
+ 1219=>667, 1220=>500, 1223=>722, 1224=>556, 1227=>642, 1228=>508, 1232=>667, 1233=>556, 1234=>667, 1235=>556, 1236=>1000, 1237=>889, 1238=>667, 1239=>556, 1240=>778, 1241=>556,
+ 1242=>778, 1243=>556, 1244=>1023, 1245=>837, 1246=>667, 1247=>500, 1248=>667, 1249=>500, 1250=>728, 1251=>567, 1252=>728, 1253=>567, 1254=>778, 1255=>556, 1256=>778, 1257=>556,
+ 1258=>778, 1259=>556, 1260=>722, 1261=>500, 1262=>650, 1263=>500, 1264=>650, 1265=>500, 1266=>650, 1267=>500, 1268=>648, 1269=>520, 1272=>872, 1273=>690, 1329=>722, 1330=>705,
+ 1331=>774, 1332=>754, 1333=>722, 1334=>751, 1335=>485, 1336=>722, 1337=>782, 1338=>655, 1339=>699, 1340=>417, 1341=>853, 1342=>791, 1343=>711, 1344=>588, 1345=>663, 1346=>665,
+ 1347=>665, 1348=>756, 1349=>623, 1350=>773, 1351=>603, 1352=>722, 1353=>648, 1354=>722, 1355=>751, 1356=>750, 1357=>722, 1358=>748, 1359=>667, 1360=>699, 1361=>623, 1362=>417,
+ 1363=>785, 1364=>638, 1365=>778, 1366=>716, 1370=>222, 1371=>133, 1372=>325, 1373=>333, 1374=>344, 1377=>833, 1378=>556, 1379=>572, 1380=>581, 1381=>550, 1382=>588, 1383=>448,
+ 1384=>556, 1385=>568, 1386=>582, 1387=>545, 1388=>301, 1389=>799, 1390=>556, 1391=>554, 1392=>533, 1393=>548, 1394=>552, 1395=>552, 1396=>544, 1397=>222, 1398=>544, 1399=>456,
+ 1400=>556, 1401=>390, 1402=>833, 1403=>509, 1404=>547, 1405=>533, 1406=>610, 1407=>887, 1408=>556, 1409=>545, 1410=>352, 1411=>853, 1412=>588, 1413=>579, 1414=>690, 1415=>545,
+ 1417=>278, 1418=>367, 1456=>70, 1457=>335, 1458=>329, 1459=>329, 1460=>70, 1461=>200, 1462=>200, 1463=>188, 1464=>188, 1465=>70, 1467=>329, 1468=>70, 1469=>70, 1470=>488,
+ 1471=>200, 1472=>212, 1473=>0, 1474=>0, 1475=>278, 1476=>70, 1488=>640, 1489=>591, 1490=>466, 1491=>598, 1492=>622, 1493=>212, 1494=>351, 1495=>623, 1496=>608, 1497=>200,
+ 1498=>526, 1499=>550, 1500=>600, 1501=>623, 1502=>621, 1503=>212, 1504=>378, 1505=>607, 1506=>587, 1507=>575, 1508=>568, 1509=>540, 1510=>590, 1511=>606, 1512=>547, 1513=>776,
+ 1514=>687, 1792=>600, 1793=>201, 1794=>201, 1795=>201, 1796=>201, 1797=>500, 1798=>500, 1799=>500, 1800=>370, 1801=>370, 1802=>574, 1803=>574, 1804=>645, 1805=>574, 1808=>452,
+ 1809=>452, 1810=>574, 1811=>645, 1812=>645, 1813=>509, 1814=>509, 1815=>682, 1816=>585, 1817=>404, 1818=>627, 1819=>718, 1820=>718, 1821=>484, 1822=>682, 1823=>600, 1824=>660,
+ 1825=>682, 1826=>538, 1827=>718, 1828=>718, 1829=>718, 1830=>574, 1831=>574, 1832=>638, 1833=>585, 1834=>509, 1835=>682, 1836=>682, 1840=>1, 1841=>1, 1842=>1, 1843=>1,
+ 1844=>1, 1845=>1, 1846=>1, 1847=>1, 1848=>1, 1849=>1, 1850=>1, 1851=>1, 1852=>1, 1853=>1, 1854=>1, 1855=>1, 1856=>1, 1857=>1, 1858=>1, 1859=>1,
+ 1860=>1, 1861=>1, 1862=>1, 1863=>1, 1864=>1, 1865=>1, 1866=>1, 2305=>6, 2306=>6, 2309=>644, 2310=>816, 2311=>392, 2312=>392, 2313=>459, 2314=>661, 2315=>641,
+ 2317=>423, 2320=>423, 2321=>816, 2323=>816, 2324=>816, 2325=>393, 2326=>622, 2327=>424, 2328=>472, 2329=>508, 2330=>517, 2331=>583, 2332=>549, 2333=>503, 2334=>538, 2335=>444,
+ 2336=>480, 2337=>519, 2338=>479, 2339=>504, 2340=>439, 2341=>542, 2342=>427, 2343=>520, 2344=>415, 2345=>415, 2346=>401, 2347=>401, 2348=>442, 2349=>520, 2350=>463, 2351=>451,
+ 2352=>319, 2353=>319, 2354=>549, 2355=>641, 2357=>442, 2358=>589, 2359=>398, 2360=>506, 2361=>430, 2364=>6, 2365=>438, 2366=>172, 2367=>172, 2368=>172, 2369=>6, 2370=>6,
+ 2371=>6, 2373=>6, 2375=>6, 2376=>6, 2377=>172, 2379=>172, 2380=>172, 2381=>6, 2384=>898, 2385=>6, 2406=>584, 2407=>584, 2408=>584, 2409=>584, 2410=>584, 2411=>584,
+ 2412=>584, 2413=>584, 2414=>584, 2415=>584, 2416=>898, 2433=>300, 2434=>400, 2435=>300, 2437=>640, 2438=>780, 2439=>520, 2440=>520, 2441=>530, 2442=>550, 2443=>620, 2444=>420,
+ 2447=>480, 2448=>620, 2451=>620, 2452=>720, 2453=>652, 2454=>500, 2455=>490, 2456=>466, 2457=>540, 2458=>490, 2459=>540, 2460=>630, 2461=>590, 2462=>680, 2463=>510, 2464=>490,
+ 2465=>520, 2466=>520, 2467=>470, 2468=>540, 2469=>490, 2470=>470, 2471=>490, 2472=>452, 2474=>560, 2475=>650, 2476=>480, 2477=>588, 2478=>480, 2479=>470, 2480=>480, 2482=>472,
+ 2486=>512, 2487=>470, 2488=>470, 2489=>520, 2492=>160, 2494=>180, 2495=>180, 2496=>180, 2497=>320, 2498=>329, 2499=>195, 2500=>260, 2503=>340, 2504=>340, 2507=>740, 2508=>740,
+ 2509=>400, 2519=>180, 2524=>540, 2525=>520, 2527=>470, 2528=>612, 2529=>420, 2530=>234, 2531=>360, 2534=>460, 2535=>420, 2536=>520, 2537=>540, 2538=>400, 2539=>400, 2540=>560,
+ 2541=>390, 2542=>480, 2543=>420, 2544=>480, 2545=>470, 2546=>400, 2547=>470, 2548=>400, 2549=>400, 2550=>400, 2551=>120, 2552=>440, 2553=>420, 2554=>420, 2565=>744, 2566=>914,
+ 2567=>690, 2568=>670, 2569=>596, 2570=>596, 2575=>498, 2576=>744, 2579=>596, 2580=>744, 2581=>550, 2582=>534, 2583=>618, 2584=>690, 2585=>546, 2586=>518, 2587=>592, 2588=>492,
+ 2589=>574, 2590=>514, 2591=>526, 2592=>556, 2593=>524, 2594=>528, 2595=>574, 2596=>484, 2597=>534, 2598=>504, 2599=>534, 2600=>538, 2602=>534, 2603=>506, 2604=>562, 2605=>516,
+ 2606=>546, 2607=>670, 2608=>538, 2610=>726, 2611=>726, 2613=>514, 2614=>546, 2616=>546, 2617=>517, 2620=>286, 2622=>172, 2623=>190, 2624=>190, 2625=>1, 2626=>1, 2631=>1,
+ 2632=>1, 2635=>1, 2636=>1, 2637=>1, 2649=>534, 2650=>618, 2651=>492, 2652=>484, 2654=>506, 2662=>616, 2663=>480, 2664=>560, 2665=>480, 2666=>468, 2667=>492, 2668=>514,
+ 2669=>538, 2670=>572, 2671=>560, 2672=>1, 2674=>498, 2675=>596, 2676=>900, 2689=>33, 2690=>33, 2693=>767, 2694=>961, 2695=>500, 2696=>495, 2697=>528, 2698=>702, 2699=>885,
+ 2709=>501, 2710=>612, 2711=>619, 2712=>569, 2713=>532, 2714=>358, 2715=>620, 2716=>606, 2717=>602, 2718=>631, 2719=>495, 2720=>528, 2721=>531, 2722=>511, 2723=>614, 2724=>294,
+ 2725=>344, 2726=>425, 2727=>345, 2728=>611, 2730=>512, 2731=>578, 2732=>428, 2733=>423, 2734=>231, 2735=>582, 2736=>344, 2738=>558, 2739=>670, 2741=>537, 2742=>592, 2743=>568,
+ 2744=>600, 2745=>544, 2749=>531, 2750=>232, 2751=>232, 2752=>232, 2753=>33, 2754=>33, 2755=>33, 2759=>33, 2760=>33, 2763=>232, 2764=>232, 2768=>903, 2790=>479, 2791=>416,
+ 2792=>465, 2793=>469, 2794=>498, 2795=>463, 2796=>451, 2797=>510, 2798=>455, 2799=>488, 2818=>131, 2819=>302, 2821=>560, 2822=>644, 2823=>632, 2825=>630, 2827=>553, 2831=>604,
+ 2835=>520, 2837=>572, 2838=>570, 2839=>580, 2840=>565, 2842=>580, 2844=>564, 2845=>575, 2847=>565, 2848=>565, 2849=>524, 2858=>572, 2859=>700, 2863=>655, 2864=>620, 2866=>652,
+ 2867=>560, 2870=>565, 2871=>565, 2872=>545, 2873=>524, 2878=>128, 2879=>1, 2880=>190, 2881=>1, 2882=>1, 2883=>1, 2887=>396, 2912=>563, 2918=>508, 2919=>424, 2920=>440,
+ 2921=>600, 2922=>600, 2923=>600, 2924=>600, 2925=>600, 2926=>511, 2927=>483, 2946=>479, 2947=>893, 2949=>1018, 2950=>1170, 2951=>916, 2952=>676, 2953=>836, 2954=>1225, 2958=>744,
+ 2959=>744, 2960=>848, 2962=>813, 2963=>813, 2964=>813, 2965=>688, 2969=>744, 2970=>676, 2972=>848, 2974=>984, 2975=>777, 2979=>1338, 2980=>664, 2984=>561, 2985=>1029, 2986=>607,
+ 2990=>697, 2991=>697, 2992=>434, 2993=>617, 2994=>869, 2995=>859, 2996=>697, 2997=>869, 2999=>1145, 3000=>1064, 3001=>1316, 3006=>424, 3007=>125, 3008=>596, 3009=>539, 3014=>596,
+ 3015=>650, 3016=>973, 3018=>1286, 3019=>1286, 3020=>1706, 3021=>333, 3031=>859, 3034=>778, 3035=>881, 3036=>876, 3037=>648, 3041=>744, 3203=>342, 3205=>620, 3206=>591, 3207=>600,
+ 3208=>776, 3209=>1138, 3210=>1464, 3214=>574, 3215=>570, 3216=>580, 3218=>589, 3219=>597, 3220=>625, 3221=>256, 3222=>565, 3223=>326, 3224=>604, 3225=>651, 3226=>408, 3228=>611,
+ 3230=>843, 3231=>610, 3232=>258, 3233=>317, 3234=>328, 3235=>803, 3236=>317, 3237=>328, 3238=>352, 3239=>352, 3240=>317, 3248=>248, 3249=>621, 3250=>620, 3251=>620, 3302=>649,
+ 3303=>550, 3304=>573, 3305=>567, 3306=>562, 3307=>557, 3308=>562, 3309=>567, 3310=>557, 3311=>557, 3458=>468, 3459=>318, 3461=>660, 3465=>778, 3466=>807, 3467=>830, 3473=>838,
+ 3476=>860, 3481=>1000, 3482=>973, 3483=>860, 3484=>997, 3486=>740, 3488=>838, 3489=>886, 3490=>886, 3492=>1295, 3493=>1295, 3495=>838, 3496=>860, 3497=>860, 3498=>860, 3499=>1403,
+ 3501=>973, 3502=>838, 3503=>660, 3504=>860, 3505=>973, 3507=>660, 3508=>886, 3509=>838, 3510=>860, 3511=>973, 3512=>838, 3513=>860, 3514=>886, 3515=>807, 3517=>830, 3520=>838,
+ 3521=>973, 3522=>886, 3523=>886, 3524=>973, 3525=>830, 3526=>973, 3530=>0, 3535=>432, 3536=>380, 3537=>420, 3538=>0, 3539=>0, 3540=>0, 3542=>0, 3544=>501, 3545=>652,
+ 3551=>648, 7680=>667, 7681=>556, 7682=>667, 7683=>556, 7684=>667, 7685=>556, 7686=>667, 7687=>556, 7688=>722, 7689=>500, 7690=>722, 7691=>556, 7692=>722, 7693=>556, 7694=>722,
+ 7695=>556, 7696=>722, 7697=>556, 7698=>722, 7699=>556, 7700=>667, 7701=>556, 7702=>667, 7703=>556, 7704=>667, 7705=>556, 7706=>667, 7707=>556, 7708=>667, 7709=>556, 7710=>611,
+ 7711=>278, 7712=>778, 7713=>556, 7714=>722, 7715=>556, 7716=>722, 7717=>556, 7718=>722, 7719=>556, 7720=>722, 7721=>556, 7722=>722, 7723=>556, 7724=>278, 7725=>222, 7726=>278,
+ 7727=>278, 7728=>667, 7729=>500, 7730=>667, 7731=>500, 7732=>667, 7733=>500, 7734=>556, 7735=>222, 7736=>556, 7737=>222, 7738=>556, 7739=>222, 7740=>556, 7741=>222, 7742=>833,
+ 7743=>833, 7744=>833, 7745=>833, 7746=>833, 7747=>833, 7748=>722, 7749=>556, 7750=>722, 7751=>556, 7752=>722, 7753=>556, 7754=>722, 7755=>556, 7756=>778, 7757=>556, 7758=>778,
+ 7759=>556, 7760=>778, 7761=>556, 7762=>778, 7763=>556, 7764=>667, 7765=>556, 7766=>667, 7767=>556, 7768=>722, 7769=>333, 7770=>722, 7771=>333, 7772=>722, 7773=>333, 7774=>722,
+ 7775=>333, 7776=>667, 7777=>500, 7778=>667, 7779=>500, 7780=>667, 7781=>500, 7782=>667, 7783=>500, 7784=>667, 7785=>500, 7786=>611, 7787=>278, 7788=>611, 7789=>278, 7790=>611,
+ 7791=>278, 7792=>611, 7793=>278, 7794=>722, 7795=>556, 7796=>722, 7797=>556, 7798=>722, 7799=>556, 7800=>722, 7801=>556, 7802=>722, 7803=>556, 7804=>667, 7805=>500, 7806=>667,
+ 7807=>500, 7808=>944, 7809=>722, 7810=>944, 7811=>722, 7812=>944, 7813=>722, 7814=>944, 7815=>722, 7816=>944, 7817=>722, 7818=>667, 7819=>500, 7820=>667, 7821=>500, 7822=>667,
+ 7823=>500, 7824=>611, 7825=>500, 7826=>611, 7827=>500, 7828=>611, 7829=>500, 7830=>556, 7831=>278, 7832=>722, 7833=>500, 7835=>278, 7840=>667, 7841=>556, 7844=>667, 7845=>556,
+ 7846=>667, 7847=>556, 7850=>667, 7851=>556, 7852=>667, 7853=>556, 7854=>667, 7855=>556, 7856=>667, 7857=>556, 7860=>667, 7861=>556, 7862=>667, 7863=>556, 7864=>667, 7865=>556,
+ 7868=>667, 7869=>556, 7870=>667, 7871=>556, 7872=>667, 7873=>556, 7876=>667, 7877=>556, 7878=>667, 7879=>556, 7882=>278, 7883=>222, 7884=>778, 7885=>556, 7888=>778, 7889=>556,
+ 7890=>778, 7891=>556, 7894=>778, 7895=>556, 7896=>778, 7897=>556, 7908=>722, 7909=>556, 7922=>667, 7923=>500, 7924=>667, 7925=>500, 7928=>667, 7929=>500, 7936=>596, 7937=>596,
+ 7938=>596, 7939=>596, 7940=>596, 7941=>596, 7942=>596, 7943=>596, 7944=>684, 7945=>684, 7946=>684, 7947=>684, 7948=>684, 7949=>684, 7950=>684, 7951=>684, 7952=>510, 7953=>510,
+ 7954=>510, 7955=>510, 7956=>510, 7957=>510, 7960=>650, 7961=>650, 7962=>650, 7963=>650, 7964=>650, 7965=>650, 7968=>526, 7969=>526, 7970=>526, 7971=>526, 7972=>526, 7973=>526,
+ 7974=>526, 7975=>526, 7976=>683, 7977=>683, 7978=>683, 7979=>683, 7980=>683, 7981=>683, 7982=>683, 7983=>683, 7984=>286, 7985=>286, 7986=>286, 7987=>286, 7988=>286, 7989=>286,
+ 7990=>286, 7991=>286, 7992=>236, 7993=>236, 7994=>236, 7995=>236, 7996=>236, 7997=>236, 7998=>236, 7999=>236, 8000=>550, 8001=>550, 8002=>550, 8003=>550, 8004=>550, 8005=>550,
+ 8008=>750, 8009=>750, 8010=>750, 8011=>750, 8012=>750, 8013=>750, 8016=>515, 8017=>515, 8018=>515, 8019=>515, 8020=>515, 8021=>515, 8022=>515, 8023=>515, 8025=>684, 8027=>684,
+ 8029=>684, 8031=>684, 8032=>740, 8033=>740, 8034=>740, 8035=>740, 8036=>740, 8037=>740, 8038=>740, 8039=>740, 8040=>720, 8041=>720, 8042=>720, 8043=>720, 8044=>720, 8045=>720,
+ 8046=>720, 8047=>720, 8048=>596, 8049=>596, 8050=>510, 8051=>510, 8052=>526, 8053=>526, 8054=>286, 8055=>286, 8056=>550, 8057=>550, 8058=>515, 8059=>515, 8060=>740, 8061=>740,
+ 8064=>596, 8065=>596, 8066=>596, 8067=>596, 8068=>596, 8069=>596, 8070=>596, 8071=>596, 8072=>882, 8073=>882, 8074=>882, 8075=>882, 8076=>882, 8077=>882, 8078=>882, 8079=>882,
+ 8080=>526, 8081=>526, 8082=>526, 8083=>526, 8084=>526, 8085=>526, 8086=>526, 8087=>526, 8088=>857, 8089=>857, 8090=>857, 8091=>857, 8092=>857, 8093=>857, 8094=>857, 8095=>857,
+ 8096=>740, 8097=>740, 8098=>740, 8099=>740, 8100=>740, 8101=>740, 8102=>740, 8103=>740, 8104=>945, 8105=>945, 8106=>945, 8107=>945, 8108=>945, 8109=>945, 8110=>945, 8111=>945,
+ 8112=>596, 8113=>596, 8114=>596, 8115=>596, 8116=>596, 8118=>596, 8119=>596, 8120=>684, 8121=>684, 8122=>684, 8123=>684, 8124=>882, 8125=>278, 8126=>201, 8127=>333, 8128=>278,
+ 8129=>333, 8130=>526, 8131=>526, 8132=>536, 8134=>526, 8135=>526, 8136=>650, 8137=>650, 8138=>683, 8139=>683, 8140=>857, 8141=>582, 8142=>582, 8143=>333, 8144=>286, 8145=>286,
+ 8146=>286, 8147=>286, 8150=>286, 8151=>312, 8152=>236, 8153=>236, 8154=>236, 8155=>236, 8157=>582, 8158=>582, 8159=>333, 8160=>515, 8161=>515, 8162=>515, 8163=>515, 8164=>566,
+ 8165=>566, 8166=>515, 8167=>515, 8168=>684, 8169=>684, 8170=>684, 8171=>684, 8172=>638, 8173=>333, 8174=>393, 8175=>333, 8178=>740, 8179=>740, 8180=>740, 8182=>740, 8183=>740,
+ 8184=>750, 8185=>750, 8186=>720, 8187=>720, 8188=>939, 8189=>333, 8190=>333, 8208=>333, 8219=>221, 8223=>333, 8227=>350, 8241=>1360, 8242=>278, 8243=>469, 8244=>680, 8245=>278,
+ 8246=>469, 8247=>680, 8251=>622, 8252=>556, 8253=>556, 8260=>167, 8263=>1112, 8264=>834, 8265=>834, 8267=>537, 8304=>351, 8305=>351, 8308=>351, 8309=>351, 8310=>351, 8311=>351,
+ 8312=>351, 8313=>351, 8320=>351, 8321=>351, 8322=>351, 8323=>351, 8324=>351, 8325=>353, 8326=>351, 8327=>351, 8328=>351, 8329=>351, 8359=>1445, 8360=>1222, 8362=>869, 8459=>969,
+ 8460=>615, 8464=>809, 8465=>519, 8466=>874, 8470=>1008, 8475=>850, 8476=>644, 8486=>720, 8487=>720, 8488=>512, 8490=>667, 8491=>667, 8492=>908, 8493=>623, 8496=>562, 8497=>611,
+ 8498=>611, 8499=>1080, 8531=>869, 8532=>869, 8533=>869, 8534=>869, 8535=>869, 8536=>869, 8537=>869, 8538=>869, 8539=>869, 8540=>869, 8541=>869, 8542=>869, 8543=>869, 8544=>278,
+ 8545=>556, 8546=>834, 8547=>945, 8548=>667, 8549=>945, 8550=>1223, 8551=>1501, 8552=>945, 8553=>667, 8554=>945, 8555=>1223, 8556=>556, 8557=>722, 8558=>722, 8559=>833, 8560=>222,
+ 8561=>444, 8562=>666, 8563=>722, 8564=>500, 8565=>722, 8566=>944, 8567=>1166, 8568=>722, 8569=>500, 8570=>722, 8571=>944, 8572=>222, 8573=>500, 8574=>556, 8575=>833, 8592=>987,
+ 8593=>603, 8594=>987, 8595=>603, 8596=>1042, 8597=>1042, 8629=>658, 8656=>987, 8657=>603, 8658=>987, 8659=>603, 8660=>1042, 8704=>667, 8706=>556, 8707=>667, 8709=>556, 8710=>711,
+ 8711=>711, 8712=>713, 8713=>713, 8719=>823, 8720=>823, 8721=>804, 8722=>584, 8723=>584, 8727=>500, 8730=>542, 8733=>713, 8734=>713, 8736=>768, 8743=>603, 8744=>603, 8745=>768,
+ 8746=>768, 8747=>556, 8748=>796, 8749=>956, 8750=>556, 8756=>863, 8764=>549, 8766=>584, 8769=>584, 8770=>584, 8771=>584, 8777=>636, 8800=>548, 8804=>584, 8805=>584, 8853=>768,
+ 8854=>768, 8855=>768, 8869=>658, 8960=>823, 9674=>489, 9834=>555, 63033=>556, 63034=>556, 63035=>556, 63036=>556, 63037=>556, 63038=>556, 63039=>556, 63040=>556, 63041=>556, 63166=>222,
+ 63171=>333, 63196=>556, 64256=>556, 64257=>500, 64258=>500, 64259=>778, 64260=>778, 64261=>556, 64262=>778, 64285=>200, 64286=>305, 64287=>400, 64288=>587, 64289=>890, 64290=>848, 64291=>872,
+ 64292=>800, 64293=>850, 64294=>873, 64295=>797, 64296=>937, 64297=>584, 64298=>776, 64299=>776, 64300=>776, 64301=>776, 64302=>640, 64303=>640, 64304=>640, 64305=>591, 64306=>466, 64307=>598,
+ 64308=>622, 64309=>262, 64310=>351, 64312=>608, 64313=>270, 64314=>526, 64315=>550, 64316=>600, 64318=>621, 64320=>378, 64321=>607, 64323=>575, 64324=>568, 64326=>590, 64327=>606, 64328=>547,
+ 64329=>776, 64330=>687, 64331=>212, 64332=>591, 64333=>550, 64334=>568, 64335=>640, 65533=>788);
+$enc='';
+$diff='';
+$file='FreeSans.z';
+$ctg='FreeSans.ctg.z';
+$originalsize=236376;
+?>
diff --git a/libraries/fpdf/font/FreeSans.z b/libraries/fpdf/font/FreeSans.z
new file mode 100644
index 0000000000..579bfdd272
--- /dev/null
+++ b/libraries/fpdf/font/FreeSans.z
Binary files differ
diff --git a/libraries/fpdf/font/FreeSansBold.ctg.z b/libraries/fpdf/font/FreeSansBold.ctg.z
new file mode 100644
index 0000000000..93e09b99ba
--- /dev/null
+++ b/libraries/fpdf/font/FreeSansBold.ctg.z
Binary files differ
diff --git a/libraries/fpdf/font/FreeSansBold.php b/libraries/fpdf/font/FreeSansBold.php
new file mode 100644
index 0000000000..f77e4a8eb7
--- /dev/null
+++ b/libraries/fpdf/font/FreeSansBold.php
@@ -0,0 +1,79 @@
+<?php
+$type='TrueTypeUnicode';
+$name='FreeSansBold';
+$desc=array('Ascent'=>1159,'Descent'=>-355,'CapHeight'=>1159,'Flags'=>32,'FontBBox'=>'[-459 -355 1300 1159]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>600);
+$up=-155;
+$ut=69;
+$cw=array(
+ 13=>333, 32=>278, 33=>333, 34=>474, 35=>556, 36=>556, 37=>889, 38=>722, 39=>238, 40=>333, 41=>333, 42=>389, 43=>584, 44=>278, 45=>333, 46=>278,
+ 47=>278, 48=>556, 49=>556, 50=>556, 51=>556, 52=>556, 53=>556, 54=>556, 55=>556, 56=>556, 57=>556, 58=>333, 59=>333, 60=>584, 61=>584, 62=>584,
+ 63=>611, 64=>975, 65=>722, 66=>722, 67=>722, 68=>722, 69=>667, 70=>611, 71=>778, 72=>722, 73=>278, 74=>556, 75=>722, 76=>611, 77=>833, 78=>722,
+ 79=>778, 80=>667, 81=>778, 82=>722, 83=>667, 84=>611, 85=>722, 86=>667, 87=>944, 88=>667, 89=>667, 90=>611, 91=>333, 92=>278, 93=>333, 94=>584,
+ 95=>556, 96=>333, 97=>556, 98=>611, 99=>556, 100=>611, 101=>556, 102=>333, 103=>611, 104=>611, 105=>278, 106=>278, 107=>556, 108=>278, 109=>889, 110=>611,
+ 111=>611, 112=>611, 113=>611, 114=>389, 115=>556, 116=>333, 117=>611, 118=>556, 119=>778, 120=>556, 121=>556, 122=>500, 123=>389, 124=>280, 125=>389, 126=>584,
+ 8364=>556, 1027=>611, 8218=>278, 402=>556, 8222=>500, 8230=>1000, 8224=>556, 8225=>556, 710=>333, 8240=>1000, 352=>667, 8249=>333, 338=>1000, 1036=>722, 381=>611, 1039=>722,
+ 8216=>278, 8217=>278, 8220=>500, 8221=>500, 8226=>350, 8211=>556, 8212=>1000, 732=>333, 8482=>1000, 353=>556, 8250=>333, 339=>944, 1116=>573, 382=>500, 376=>667, 161=>333,
+ 162=>556, 163=>556, 164=>556, 165=>556, 166=>280, 167=>556, 168=>333, 169=>737, 170=>370, 171=>556, 172=>584, 174=>737, 175=>333, 176=>606, 177=>584, 178=>351,
+ 179=>351, 180=>333, 181=>611, 182=>556, 183=>278, 184=>333, 185=>351, 186=>365, 187=>556, 188=>869, 189=>869, 190=>869, 191=>611, 192=>722, 193=>722, 194=>722,
+ 195=>722, 196=>722, 197=>722, 198=>1000, 199=>722, 200=>667, 201=>667, 202=>667, 203=>667, 204=>278, 205=>278, 206=>278, 207=>278, 208=>722, 209=>722, 210=>778,
+ 211=>778, 212=>778, 213=>778, 214=>778, 215=>584, 216=>778, 217=>722, 218=>722, 219=>722, 220=>722, 221=>667, 222=>667, 223=>611, 224=>556, 225=>556, 226=>556,
+ 227=>556, 228=>556, 229=>556, 230=>889, 231=>556, 232=>556, 233=>556, 234=>556, 235=>556, 236=>278, 237=>278, 238=>278, 239=>278, 240=>611, 241=>611, 242=>611,
+ 243=>611, 244=>611, 245=>611, 246=>611, 247=>584, 248=>611, 249=>611, 250=>611, 251=>611, 252=>611, 253=>556, 254=>611, 255=>556, 256=>722, 257=>556, 258=>722,
+ 259=>556, 260=>722, 261=>556, 262=>722, 263=>556, 264=>722, 265=>556, 266=>722, 267=>556, 268=>722, 269=>556, 270=>722, 271=>611, 272=>722, 273=>611, 274=>667,
+ 275=>556, 276=>667, 277=>556, 278=>667, 279=>556, 280=>667, 281=>556, 282=>667, 283=>556, 284=>778, 285=>611, 286=>778, 287=>611, 288=>778, 289=>611, 290=>778,
+ 291=>611, 292=>722, 293=>611, 294=>722, 295=>611, 296=>278, 297=>278, 298=>278, 299=>278, 300=>278, 301=>278, 302=>278, 303=>278, 304=>278, 305=>278, 306=>808,
+ 307=>492, 308=>556, 309=>278, 310=>722, 311=>556, 312=>573, 313=>611, 314=>278, 315=>611, 316=>278, 317=>611, 318=>278, 319=>611, 320=>556, 321=>611, 322=>278,
+ 323=>722, 324=>611, 325=>722, 326=>611, 327=>722, 328=>611, 329=>611, 330=>722, 331=>611, 332=>778, 333=>611, 334=>778, 335=>611, 336=>778, 337=>611, 340=>722,
+ 341=>389, 342=>722, 343=>389, 344=>722, 345=>389, 346=>667, 347=>556, 348=>667, 349=>556, 350=>667, 351=>556, 354=>611, 355=>333, 356=>611, 357=>333, 358=>611,
+ 359=>333, 360=>722, 361=>611, 362=>722, 363=>611, 364=>722, 365=>611, 366=>722, 367=>611, 368=>722, 369=>611, 370=>722, 371=>611, 372=>944, 373=>778, 374=>667,
+ 375=>556, 377=>611, 378=>500, 379=>611, 380=>500, 383=>333, 452=>1333, 453=>1222, 454=>1111, 455=>1167, 456=>889, 457=>556, 458=>1278, 459=>1000, 460=>889, 461=>722,
+ 462=>556, 463=>278, 464=>278, 465=>778, 466=>611, 467=>722, 468=>611, 469=>722, 470=>611, 471=>722, 472=>611, 473=>722, 474=>611, 475=>722, 476=>611, 478=>722,
+ 479=>556, 482=>1000, 483=>889, 486=>778, 487=>611, 488=>722, 489=>556, 490=>778, 491=>611, 492=>778, 493=>611, 497=>1333, 498=>1222, 499=>1111, 504=>722, 505=>611,
+ 506=>722, 507=>556, 508=>1000, 509=>889, 510=>778, 511=>611, 514=>722, 515=>556, 518=>667, 519=>556, 522=>278, 523=>278, 526=>778, 527=>611, 530=>722, 531=>389,
+ 534=>722, 535=>611, 536=>667, 537=>556, 538=>611, 539=>333, 711=>333, 728=>333, 729=>333, 730=>333, 731=>333, 733=>333, 884=>379, 885=>379, 890=>332, 894=>333,
+ 900=>325, 901=>658, 902=>761, 903=>474, 904=>706, 905=>733, 906=>285, 908=>785, 910=>823, 911=>819, 913=>722, 914=>722, 915=>642, 916=>726, 917=>667, 918=>611,
+ 919=>722, 920=>810, 921=>278, 922=>722, 923=>744, 924=>860, 925=>714, 926=>690, 927=>822, 928=>781, 929=>698, 931=>688, 932=>688, 933=>804, 934=>777, 935=>783,
+ 936=>805, 937=>780, 938=>278, 939=>804, 940=>660, 941=>559, 942=>560, 943=>356, 944=>575, 945=>656, 946=>576, 947=>591, 948=>620, 949=>570, 950=>522, 951=>586,
+ 952=>586, 953=>346, 954=>576, 955=>620, 956=>667, 957=>564, 958=>530, 959=>610, 960=>721, 961=>626, 962=>595, 963=>676, 964=>592, 965=>575, 966=>801, 967=>632,
+ 968=>722, 969=>800, 970=>346, 971=>575, 972=>599, 973=>567, 974=>1125, 1024=>667, 1025=>709, 1026=>790, 1028=>722, 1029=>667, 1030=>278, 1031=>278, 1032=>556, 1033=>1110,
+ 1034=>1113, 1035=>790, 1037=>726, 1038=>718, 1040=>722, 1041=>722, 1042=>722, 1043=>611, 1044=>900, 1045=>709, 1046=>1093, 1047=>672, 1048=>757, 1049=>757, 1050=>750, 1051=>729,
+ 1052=>874, 1053=>753, 1054=>778, 1055=>753, 1056=>671, 1057=>722, 1058=>611, 1059=>718, 1060=>892, 1061=>667, 1062=>816, 1063=>685, 1064=>1057, 1065=>1183, 1066=>928, 1067=>949,
+ 1068=>687, 1069=>722, 1070=>1109, 1071=>698, 1072=>556, 1073=>606, 1074=>572, 1075=>454, 1076=>685, 1077=>556, 1078=>809, 1079=>546, 1080=>615, 1081=>615, 1082=>573, 1083=>577,
+ 1084=>666, 1085=>603, 1086=>611, 1087=>603, 1088=>611, 1089=>556, 1090=>454, 1091=>556, 1092=>957, 1093=>556, 1094=>652, 1095=>578, 1096=>886, 1097=>968, 1098=>693, 1099=>811,
+ 1100=>562, 1101=>564, 1102=>908, 1103=>596, 1104=>556, 1105=>556, 1106=>606, 1107=>454, 1108=>556, 1109=>556, 1110=>278, 1111=>278, 1112=>278, 1113=>900, 1114=>611, 1115=>606,
+ 1117=>608, 1118=>556, 1119=>608, 1164=>687, 1165=>562, 1166=>667, 1167=>611, 1168=>611, 1169=>454, 1170=>611, 1171=>454, 1172=>611, 1173=>454, 1174=>1093, 1175=>809, 1176=>672,
+ 1177=>546, 1178=>722, 1179=>573, 1180=>722, 1181=>573, 1182=>722, 1183=>573, 1184=>722, 1185=>573, 1186=>722, 1187=>608, 1188=>722, 1189=>608, 1190=>722, 1191=>608, 1192=>722,
+ 1193=>556, 1194=>722, 1195=>556, 1196=>611, 1197=>454, 1198=>667, 1199=>556, 1200=>667, 1201=>556, 1202=>667, 1203=>556, 1204=>814, 1205=>685, 1206=>675, 1207=>580, 1208=>675,
+ 1209=>580, 1210=>675, 1211=>580, 1212=>722, 1213=>556, 1214=>722, 1215=>556, 1216=>278, 1217=>1093, 1218=>809, 1219=>722, 1220=>573, 1223=>722, 1224=>608, 1227=>675, 1228=>580,
+ 1232=>722, 1233=>556, 1234=>722, 1235=>556, 1236=>1000, 1237=>889, 1238=>709, 1239=>556, 1240=>722, 1241=>556, 1242=>722, 1243=>556, 1244=>1093, 1245=>809, 1246=>672, 1247=>546,
+ 1248=>672, 1249=>546, 1250=>757, 1251=>615, 1252=>757, 1253=>615, 1254=>778, 1255=>611, 1256=>778, 1257=>611, 1258=>778, 1259=>611, 1260=>722, 1261=>564, 1262=>718, 1263=>556,
+ 1264=>718, 1265=>556, 1266=>718, 1267=>556, 1268=>685, 1269=>578, 1272=>949, 1273=>811, 1456=>82, 1457=>347, 1458=>341, 1459=>341, 1460=>82, 1461=>211, 1462=>211, 1463=>200,
+ 1464=>200, 1465=>82, 1467=>341, 1468=>82, 1469=>82, 1470=>516, 1471=>200, 1472=>297, 1473=>1038, 1474=>1038, 1475=>333, 1476=>82, 1488=>714, 1489=>651, 1490=>557, 1491=>638,
+ 1492=>682, 1493=>297, 1494=>443, 1495=>682, 1496=>670, 1497=>284, 1498=>590, 1499=>595, 1500=>667, 1501=>683, 1502=>704, 1503=>297, 1504=>429, 1505=>670, 1506=>653, 1507=>661,
+ 1508=>660, 1509=>616, 1510=>671, 1511=>672, 1512=>600, 1513=>840, 1514=>756, 1520=>554, 1521=>550, 1522=>542, 1523=>238, 1524=>474, 1559=>556, 1560=>778, 1561=>944, 1562=>611,
+ 1563=>278, 1564=>889, 1569=>844, 1576=>923, 1578=>922, 1579=>922, 1581=>649, 1582=>704, 1587=>1221, 7936=>656, 7937=>656, 7938=>656, 7939=>656, 7940=>656, 7941=>656, 7942=>656,
+ 7943=>656, 7944=>722, 7945=>722, 7946=>722, 7947=>722, 7948=>722, 7949=>722, 7950=>722, 7951=>722, 7952=>570, 7953=>570, 7954=>570, 7955=>570, 7956=>570, 7957=>570, 7960=>667,
+ 7961=>667, 7962=>667, 7963=>667, 7964=>667, 7965=>667, 7968=>586, 7969=>586, 7970=>586, 7971=>586, 7972=>586, 7973=>586, 7974=>586, 7975=>586, 7976=>722, 7977=>722, 7978=>722,
+ 7979=>722, 7980=>722, 7981=>722, 7982=>722, 7983=>722, 7984=>346, 7985=>346, 7986=>346, 7987=>346, 7988=>346, 7989=>346, 7990=>346, 7991=>346, 7992=>278, 7993=>278, 7994=>278,
+ 7995=>278, 7996=>278, 7997=>278, 7998=>278, 7999=>278, 8000=>610, 8001=>610, 8002=>610, 8003=>610, 8004=>610, 8005=>610, 8008=>822, 8009=>822, 8010=>822, 8011=>822, 8012=>822,
+ 8013=>822, 8016=>575, 8017=>575, 8018=>575, 8019=>575, 8020=>575, 8021=>575, 8022=>575, 8023=>575, 8025=>804, 8027=>804, 8029=>804, 8031=>804, 8032=>800, 8033=>800, 8034=>800,
+ 8035=>800, 8036=>800, 8037=>800, 8038=>800, 8039=>800, 8040=>780, 8041=>780, 8042=>780, 8043=>780, 8044=>780, 8045=>780, 8046=>780, 8047=>780, 8048=>656, 8049=>656, 8050=>570,
+ 8051=>570, 8052=>586, 8053=>586, 8054=>346, 8055=>346, 8056=>610, 8057=>610, 8058=>575, 8059=>575, 8060=>800, 8061=>800, 8064=>656, 8065=>656, 8066=>656, 8067=>656, 8068=>656,
+ 8069=>656, 8070=>656, 8071=>656, 8072=>968, 8073=>968, 8074=>968, 8075=>968, 8076=>968, 8077=>968, 8078=>968, 8079=>968, 8080=>586, 8081=>586, 8082=>586, 8083=>586, 8084=>586,
+ 8085=>586, 8086=>586, 8087=>586, 8088=>968, 8089=>968, 8090=>968, 8091=>968, 8092=>968, 8093=>968, 8094=>968, 8095=>968, 8096=>800, 8097=>800, 8098=>800, 8099=>800, 8100=>800,
+ 8101=>800, 8102=>800, 8103=>800, 8104=>1026, 8105=>1026, 8106=>1026, 8107=>1026, 8108=>1026, 8109=>1026, 8110=>1026, 8111=>1026, 8112=>656, 8113=>656, 8114=>656, 8115=>656, 8116=>660,
+ 8118=>656, 8119=>656, 8120=>722, 8121=>722, 8122=>722, 8123=>722, 8124=>968, 8125=>278, 8126=>346, 8127=>278, 8128=>278, 8129=>333, 8130=>586, 8131=>586, 8132=>560, 8134=>586,
+ 8135=>586, 8136=>667, 8137=>667, 8138=>722, 8139=>722, 8140=>968, 8141=>492, 8142=>489, 8143=>394, 8144=>346, 8145=>346, 8146=>346, 8147=>346, 8150=>346, 8151=>346, 8152=>278,
+ 8153=>278, 8154=>278, 8155=>278, 8157=>481, 8158=>589, 8159=>333, 8160=>575, 8161=>575, 8162=>575, 8163=>575, 8164=>626, 8165=>626, 8166=>575, 8167=>575, 8168=>804, 8169=>804,
+ 8170=>804, 8171=>804, 8172=>698, 8173=>333, 8174=>333, 8175=>333, 8178=>800, 8179=>800, 8180=>1125, 8182=>800, 8183=>800, 8184=>822, 8185=>822, 8186=>780, 8187=>780, 8188=>1111,
+ 8189=>333, 8190=>278, 8260=>167, 8308=>351, 8321=>351, 8322=>351, 8323=>351, 8324=>351, 8362=>1049, 8543=>869, 8706=>490, 8710=>729, 8721=>711, 8722=>584, 8730=>542, 8800=>548,
+ 8804=>584, 8805=>584, 9674=>489, 63033=>556, 63034=>556, 63035=>556, 63036=>556, 63037=>556, 63038=>556, 63039=>556, 63040=>556, 63041=>556, 63171=>333, 63196=>556, 64257=>611, 64258=>611,
+ 64285=>284, 64286=>305, 64287=>542, 64288=>653, 64289=>964, 64290=>888, 64291=>932, 64292=>845, 64293=>917, 64294=>933, 64295=>850, 64296=>1006, 64297=>584, 64298=>840, 64299=>840, 64300=>840,
+ 64301=>840, 64302=>714, 64303=>714, 64304=>714, 64305=>651, 64306=>557, 64307=>638, 64308=>682, 64309=>367, 64310=>443, 64312=>670, 64313=>354, 64314=>590, 64315=>595, 64316=>667, 64318=>704,
+ 64320=>429, 64321=>670, 64323=>661, 64324=>660, 64326=>671, 64327=>672, 64328=>600, 64329=>840, 64330=>756, 64331=>297, 64332=>651, 64333=>595, 64334=>660, 64335=>714, 65182=>636);
+$enc='';
+$diff='';
+$file='FreeSansBold.z';
+$ctg='FreeSansBold.ctg.z';
+$originalsize=88972;
+?>
diff --git a/libraries/fpdf/font/FreeSansBold.z b/libraries/fpdf/font/FreeSansBold.z
new file mode 100644
index 0000000000..1c7073a307
--- /dev/null
+++ b/libraries/fpdf/font/FreeSansBold.z
Binary files differ
diff --git a/libraries/fpdf/fpdf.php b/libraries/fpdf/fpdf.php
index c307b7bac8..7cf4a65f49 100644
--- a/libraries/fpdf/fpdf.php
+++ b/libraries/fpdf/fpdf.php
@@ -763,7 +763,7 @@ function MultiCell($w,$h,$txt,$border=0,$align='J',$fill=0)
$ls=$l;
$ns++;
}
- $l+=$cw[$c];
+ $l+=isset($cw[ord($c)])?$cw[ord($c)]:0;
if($l>$wmax)
{
//Automatic line break
@@ -1078,6 +1078,10 @@ function _begindoc()
$this->_out('%PDF-1.3');
}
+function _strreplace($what, $to, $where) {
+ return str_replace($what, $to, $where);
+}
+
function _putpages()
{
$nb=$this->page;
@@ -1085,7 +1089,7 @@ function _putpages()
{
//Replace number of pages
for($n=1;$n<=$nb;$n++)
- $this->pages[$n]=str_replace($this->AliasNbPages,$nb,$this->pages[$n]);
+ $this->pages[$n]=$this->_strreplace($this->AliasNbPages,$nb,$this->pages[$n]);
}
if($this->DefOrientation=='P')
{
diff --git a/libraries/fpdf/ufpdf.php b/libraries/fpdf/ufpdf.php
new file mode 100644
index 0000000000..5c72add087
--- /dev/null
+++ b/libraries/fpdf/ufpdf.php
@@ -0,0 +1,481 @@
+<?php
+/*******************************************************************************
+* Software: UFPDF, Unicode Free PDF generator *
+* Version: 0.1 *
+* based on FPDF 1.52 by Olivier PLATHEY *
+* Date: 2004-09-01 *
+* Author: Steven Wittens <steven@acko.net> *
+* License: GPL *
+* *
+* UFPDF is a modification of FPDF to support Unicode through UTF-8. *
+* *
+*******************************************************************************/
+
+if(!class_exists('UFPDF'))
+{
+define('UFPDF_VERSION','0.1');
+
+include_once 'fpdf.php';
+
+class UFPDF extends FPDF
+{
+
+/*******************************************************************************
+* *
+* Public methods *
+* *
+*******************************************************************************/
+function UFPDF($orientation='P',$unit='mm',$format='A4')
+{
+ FPDF::FPDF($orientation, $unit, $format);
+}
+
+function GetStringWidth($s)
+{
+ //Get width of a string in the current font
+ $s = (string)$s;
+ $codepoints=$this->utf8_to_codepoints($s);
+ $cw=&$this->CurrentFont['cw'];
+ $w=0;
+ foreach($codepoints as $cp)
+ $w+=isset($cw[$cp])?$cw[$cp]:0;
+ return $w*$this->FontSize/1000;
+}
+
+function AddFont($family,$style='',$file='')
+{
+ //Add a TrueType or Type1 font
+ $family=strtolower($family);
+ if($family=='arial')
+ $family='helvetica';
+ $style=strtoupper($style);
+ if($style=='IB')
+ $style='BI';
+ if(isset($this->fonts[$family.$style]))
+ $this->Error('Font already added: '.$family.' '.$style);
+ if($file=='')
+ $file=str_replace(' ','',$family).strtolower($style).'.php';
+ if(defined('FPDF_FONTPATH'))
+ $file=FPDF_FONTPATH.$file;
+ include($file);
+ if(!isset($name))
+ $this->Error('Could not include font definition file');
+ $i=count($this->fonts)+1;
+ $this->fonts[$family.$style]=array('i'=>$i,'type'=>$type,'name'=>$name,'desc'=>$desc,'up'=>$up,'ut'=>$ut,'cw'=>$cw,'file'=>$file,'ctg'=>$ctg);
+ if($file)
+ {
+ if($type=='TrueTypeUnicode')
+ $this->FontFiles[$file]=array('length1'=>$originalsize);
+ else
+ $this->FontFiles[$file]=array('length1'=>$size1,'length2'=>$size2);
+ }
+}
+
+function Text($x,$y,$txt)
+{
+ //Output a string
+ $s=sprintf('BT %.2f %.2f Td %s Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escapetext($txt));
+ if($this->underline and $txt!='')
+ $s.=' '.$this->_dounderline($x,$y,$this->GetStringWidth($txt),$txt);
+ if($this->ColorFlag)
+ $s='q '.$this->TextColor.' '.$s.' Q';
+ $this->_out($s);
+}
+
+function AcceptPageBreak()
+{
+ //Accept automatic page break or not
+ return $this->AutoPageBreak;
+}
+
+function Cell($w,$h=0,$txt='',$border=0,$ln=0,$align='',$fill=0,$link='')
+{
+ //Output a cell
+ $k=$this->k;
+ if($this->y+$h>$this->PageBreakTrigger and !$this->InFooter and $this->AcceptPageBreak())
+ {
+ //Automatic page break
+ $x=$this->x;
+ $ws=$this->ws;
+ if($ws>0)
+ {
+ $this->ws=0;
+ $this->_out('0 Tw');
+ }
+ $this->AddPage($this->CurOrientation);
+ $this->x=$x;
+ if($ws>0)
+ {
+ $this->ws=$ws;
+ $this->_out(sprintf('%.3f Tw',$ws*$k));
+ }
+ }
+ if($w==0)
+ $w=$this->w-$this->rMargin-$this->x;
+ $s='';
+ if($fill==1 or $border==1)
+ {
+ if($fill==1)
+ $op=($border==1) ? 'B' : 'f';
+ else
+ $op='S';
+ $s=sprintf('%.2f %.2f %.2f %.2f re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);
+ }
+ if(is_string($border))
+ {
+ $x=$this->x;
+ $y=$this->y;
+ if(is_int(strpos($border,'L')))
+ $s.=sprintf('%.2f %.2f m %.2f %.2f l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);
+ if(is_int(strpos($border,'T')))
+ $s.=sprintf('%.2f %.2f m %.2f %.2f l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);
+ if(is_int(strpos($border,'R')))
+ $s.=sprintf('%.2f %.2f m %.2f %.2f l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+ if(is_int(strpos($border,'B')))
+ $s.=sprintf('%.2f %.2f m %.2f %.2f l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+ }
+ if($txt!='')
+ {
+ $width = $this->GetStringWidth($txt);
+ if($align=='R')
+ $dx=$w-$this->cMargin-$width;
+ elseif($align=='C')
+ $dx=($w-$width)/2;
+ else
+ $dx=$this->cMargin;
+ if($this->ColorFlag)
+ $s.='q '.$this->TextColor.' ';
+ $txtstring=$this->_escapetext($txt);
+ $s.=sprintf('BT %.2f %.2f Td %s Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$txtstring);
+ if($this->underline)
+ $s.=' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$width,$txt);
+ if($this->ColorFlag)
+ $s.=' Q';
+ if($link)
+ $this->Link($this->x+$dx,$this->y+.5*$h-.5*$this->FontSize,$width,$this->FontSize,$link);
+ }
+ if($s)
+ $this->_out($s);
+ $this->lasth=$h;
+ if($ln>0)
+ {
+ //Go to next line
+ $this->y+=$h;
+ if($ln==1)
+ $this->x=$this->lMargin;
+ }
+ else
+ $this->x+=$w;
+}
+
+/*******************************************************************************
+* *
+* Protected methods *
+* *
+*******************************************************************************/
+
+function _puttruetypeunicode($font) {
+ //Type0 Font
+ $this->_newobj();
+ $this->_out('<</Type /Font');
+ $this->_out('/Subtype /Type0');
+ $this->_out('/BaseFont /'. $font['name'] .'-UCS');
+ $this->_out('/Encoding /Identity-H');
+ $this->_out('/DescendantFonts ['. ($this->n + 1) .' 0 R]');
+ $this->_out('>>');
+ $this->_out('endobj');
+
+ //CIDFont
+ $this->_newobj();
+ $this->_out('<</Type /Font');
+ $this->_out('/Subtype /CIDFontType2');
+ $this->_out('/BaseFont /'. $font['name']);
+ $this->_out('/CIDSystemInfo <</Registry (Adobe) /Ordering (UCS) /Supplement 0>>');
+ $this->_out('/FontDescriptor '. ($this->n + 1) .' 0 R');
+ $c = 0;
+ $widths = '';
+ foreach ($font['cw'] as $i => $w) {
+ $widths .= $i .' ['. $w.'] ';
+ }
+ $this->_out('/W ['. $widths .']');
+ $this->_out('/CIDToGIDMap '. ($this->n + 2) .' 0 R');
+ $this->_out('>>');
+ $this->_out('endobj');
+
+ //Font descriptor
+ $this->_newobj();
+ $this->_out('<</Type /FontDescriptor');
+ $this->_out('/FontName /'.$font['name']);
+ $s = '';
+ foreach ($font['desc'] as $k => $v) {
+ $s .= ' /'. $k .' '. $v;
+ }
+ if ($font['file']) {
+ $s .= ' /FontFile2 '. $this->FontFiles[$font['file']]['n'] .' 0 R';
+ }
+ $this->_out($s);
+ $this->_out('>>');
+ $this->_out('endobj');
+
+ //Embed CIDToGIDMap
+ $this->_newobj();
+ if(defined('FPDF_FONTPATH'))
+ $file=FPDF_FONTPATH.$font['ctg'];
+ else
+ $file=$font['ctg'];
+ $size=filesize($file);
+ if(!$size)
+ $this->Error('Font file not found');
+ $this->_out('<</Length '.$size);
+ if(substr($file,-2) == '.z')
+ $this->_out('/Filter /FlateDecode');
+ $this->_out('>>');
+ $f = fopen($file,'rb');
+ $this->_putstream(fread($f,$size));
+ fclose($f);
+ $this->_out('endobj');
+}
+
+function _dounderline($x,$y,$width,$txt)
+{
+ //Underline text
+ $up=$this->CurrentFont['up'];
+ $ut=$this->CurrentFont['ut'];
+ $w=$width+$this->ws*substr_count($txt,' ');
+ return sprintf('%.2f %.2f %.2f %.2f re f',$x*$this->k,($this->h-($y-$up/1000*$this->FontSize))*$this->k,$w*$this->k,-$ut/1000*$this->FontSizePt);
+}
+
+function _textstring($s)
+{
+ //Convert to UTF-16BE
+ $s = $this->utf8_to_utf16be($s);
+ //Escape necessary characters
+ return '('. strtr($s, array(')' => '\\)', '(' => '\\(', '\\' => '\\\\')) .')';
+}
+
+function _strreplace($what, $to, $where) {
+ $to = '' . $to;
+ return str_replace($this->utf8_to_utf16be($what, false), $this->utf8_to_utf16be($to, false), $where);
+}
+
+function _escapetext($s)
+{
+ //Convert to UTF-16BE
+ $s = $this->utf8_to_utf16be($s, false);
+ //Escape necessary characters
+ return '('. strtr($s, array(')' => '\\)', '(' => '\\(', '\\' => '\\\\')) .')';
+}
+
+function _putinfo()
+{
+ $this->_out('/Producer '.$this->_textstring('UFPDF '. UFPDF_VERSION));
+ if(!empty($this->title))
+ $this->_out('/Title '.$this->_textstring($this->title));
+ if(!empty($this->subject))
+ $this->_out('/Subject '.$this->_textstring($this->subject));
+ if(!empty($this->author))
+ $this->_out('/Author '.$this->_textstring($this->author));
+ if(!empty($this->keywords))
+ $this->_out('/Keywords '.$this->_textstring($this->keywords));
+ if(!empty($this->creator))
+ $this->_out('/Creator '.$this->_textstring($this->creator));
+ $this->_out('/CreationDate '.$this->_textstring('D:'.date('YmdHis')));
+}
+
+// UTF-8 to UTF-16BE conversion.
+// Correctly handles all illegal UTF-8 sequences.
+function utf8_to_utf16be(&$txt, $bom = true) {
+ $l = strlen($txt);
+ $out = $bom ? "\xFE\xFF" : '';
+ for ($i = 0; $i < $l; ++$i) {
+ $c = ord($txt{$i});
+ // ASCII
+ if ($c < 0x80) {
+ $out .= "\x00". $txt{$i};
+ }
+ // Lost continuation byte
+ else if ($c < 0xC0) {
+ $out .= "\xFF\xFD";
+ continue;
+ }
+ // Multibyte sequence leading byte
+ else {
+ if ($c < 0xE0) {
+ $s = 2;
+ }
+ else if ($c < 0xF0) {
+ $s = 3;
+ }
+ else if ($c < 0xF8) {
+ $s = 4;
+ }
+ // 5/6 byte sequences not possible for Unicode.
+ else {
+ $out .= "\xFF\xFD";
+ while (ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; }
+ continue;
+ }
+
+ $q = array($c);
+ // Fetch rest of sequence
+ while (ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; $q[] = ord($txt{$i}); }
+
+ // Check length
+ if (count($q) != $s) {
+ $out .= "\xFF\xFD";
+ continue;
+ }
+
+ switch ($s) {
+ case 2:
+ $cp = (($q[0] ^ 0xC0) << 6) | ($q[1] ^ 0x80);
+ // Overlong sequence
+ if ($cp < 0x80) {
+ $out .= "\xFF\xFD";
+ }
+ else {
+ $out .= chr($cp >> 8);
+ $out .= chr($cp & 0xFF);
+ }
+ continue;
+
+ case 3:
+ $cp = (($q[0] ^ 0xE0) << 12) | (($q[1] ^ 0x80) << 6) | ($q[2] ^ 0x80);
+ // Overlong sequence
+ if ($cp < 0x800) {
+ $out .= "\xFF\xFD";
+ }
+ // Check for UTF-8 encoded surrogates (caused by a bad UTF-8 encoder)
+ else if ($c > 0xD800 && $c < 0xDFFF) {
+ $out .= "\xFF\xFD";
+ }
+ else {
+ $out .= chr($cp >> 8);
+ $out .= chr($cp & 0xFF);
+ }
+ continue;
+
+ case 4:
+ $cp = (($q[0] ^ 0xF0) << 18) | (($q[1] ^ 0x80) << 12) | (($q[2] ^ 0x80) << 6) | ($q[3] ^ 0x80);
+ // Overlong sequence
+ if ($cp < 0x10000) {
+ $out .= "\xFF\xFD";
+ }
+ // Outside of the Unicode range
+ else if ($cp >= 0x10FFFF) {
+ $out .= "\xFF\xFD";
+ }
+ else {
+ // Use surrogates
+ $cp -= 0x10000;
+ $s1 = 0xD800 | ($cp >> 10);
+ $s2 = 0xDC00 | ($cp & 0x3FF);
+
+ $out .= chr($s1 >> 8);
+ $out .= chr($s1 & 0xFF);
+ $out .= chr($s2 >> 8);
+ $out .= chr($s2 & 0xFF);
+ }
+ continue;
+ }
+ }
+ }
+ return $out;
+}
+
+// UTF-8 to codepoint array conversion.
+// Correctly handles all illegal UTF-8 sequences.
+function utf8_to_codepoints(&$txt) {
+ $l = strlen($txt);
+ $out = array();
+ for ($i = 0; $i < $l; ++$i) {
+ $c = ord($txt{$i});
+ // ASCII
+ if ($c < 0x80) {
+ $out[] = ord($txt{$i});
+ }
+ // Lost continuation byte
+ else if ($c < 0xC0) {
+ $out[] = 0xFFFD;
+ continue;
+ }
+ // Multibyte sequence leading byte
+ else {
+ if ($c < 0xE0) {
+ $s = 2;
+ }
+ else if ($c < 0xF0) {
+ $s = 3;
+ }
+ else if ($c < 0xF8) {
+ $s = 4;
+ }
+ // 5/6 byte sequences not possible for Unicode.
+ else {
+ $out[] = 0xFFFD;
+ while (ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; }
+ continue;
+ }
+
+ $q = array($c);
+ // Fetch rest of sequence
+ while (ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; $q[] = ord($txt{$i}); }
+
+ // Check length
+ if (count($q) != $s) {
+ $out[] = 0xFFFD;
+ continue;
+ }
+
+ switch ($s) {
+ case 2:
+ $cp = (($q[0] ^ 0xC0) << 6) | ($q[1] ^ 0x80);
+ // Overlong sequence
+ if ($cp < 0x80) {
+ $out[] = 0xFFFD;
+ }
+ else {
+ $out[] = $cp;
+ }
+ continue;
+
+ case 3:
+ $cp = (($q[0] ^ 0xE0) << 12) | (($q[1] ^ 0x80) << 6) | ($q[2] ^ 0x80);
+ // Overlong sequence
+ if ($cp < 0x800) {
+ $out[] = 0xFFFD;
+ }
+ // Check for UTF-8 encoded surrogates (caused by a bad UTF-8 encoder)
+ else if ($c > 0xD800 && $c < 0xDFFF) {
+ $out[] = 0xFFFD;
+ }
+ else {
+ $out[] = $cp;
+ }
+ continue;
+
+ case 4:
+ $cp = (($q[0] ^ 0xF0) << 18) | (($q[1] ^ 0x80) << 12) | (($q[2] ^ 0x80) << 6) | ($q[3] ^ 0x80);
+ // Overlong sequence
+ if ($cp < 0x10000) {
+ $out[] = 0xFFFD;
+ }
+ // Outside of the Unicode range
+ else if ($cp >= 0x10FFFF) {
+ $out[] = 0xFFFD;
+ }
+ else {
+ $out[] = $cp;
+ }
+ continue;
+ }
+ }
+ }
+ return $out;
+}
+
+//End of class
+}
+
+}
+?>
diff --git a/libraries/mcrypt.lib.php b/libraries/mcrypt.lib.php
new file mode 100644
index 0000000000..6df3d05a38
--- /dev/null
+++ b/libraries/mcrypt.lib.php
@@ -0,0 +1,93 @@
+<?php
+
+/* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
+
+/**
+ * Initialization
+ */
+
+// Store the initialization vector because it will be needed for
+// further decryption. I don't think necessary to have one iv
+// per server so I don't put the server number in the cookie name.
+
+if (!isset($_COOKIE['pma_mcrypt_iv'])) {
+ srand();
+ $iv = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_BLOWFISH, MCRYPT_MODE_CBC), MCRYPT_RAND);
+ setcookie('pma_mcrypt_iv',
+ base64_encode($iv),
+ time() + (60 * 60 * 24 * 30),
+ $GLOBALS['cookie_path'], '',
+ $GLOBALS['is_https']);
+} else {
+ $iv = base64_decode($_COOKIE['pma_mcrypt_iv']);
+}
+
+/**
+ * String padding
+ *
+ * @param string input string
+ * @param integer length of the result
+ * @param string the filling string
+ * @param integer padding mode
+ *
+ * @return string the padded string
+ *
+ * @access public
+ */
+function full_str_pad($input, $pad_length, $pad_string = '', $pad_type = 0) {
+ $str = '';
+ $length = $pad_length - strlen($input);
+ if ($length > 0) { // str_repeat doesn't like negatives
+ if ($pad_type == STR_PAD_RIGHT) { // STR_PAD_RIGHT == 1
+ $str = $input.str_repeat($pad_string, $length);
+ } elseif ($pad_type == STR_PAD_BOTH) { // STR_PAD_BOTH == 2
+ $str = str_repeat($pad_string, floor($length/2));
+ $str .= $input;
+ $str .= str_repeat($pad_string, ceil($length/2));
+ } else { // defaults to STR_PAD_LEFT == 0
+ $str = str_repeat($pad_string, $length).$input;
+ }
+ } else { // if $length is negative or zero we don't need to do anything
+ $str = $input;
+ }
+ return $str;
+}
+/**
+ * Encryption using blowfish algorithm (mcrypt)
+ *
+ * @param string original data
+ * @param string the secret
+ *
+ * @return string the encrypted result
+ *
+ * @access public
+ *
+ * @author lem9
+ */
+function PMA_blowfish_encrypt($data, $secret) {
+ global $iv;
+ // Seems we don't need the padding. Anyway if we need it,
+ // we would have to replace 8 by the next 8-byte boundary.
+ //$data = full_str_pad($data, 8, "\0", STR_PAD_RIGHT);
+ return base64_encode(mcrypt_encrypt(MCRYPT_BLOWFISH, $secret, $data, MCRYPT_MODE_CBC, $iv));
+}
+
+/**
+ * Decryption using blowfish algorithm (mcrypt)
+ *
+ * @param string encrypted data
+ * @param string the secret
+ *
+ * @return string original data
+ *
+ * @access public
+ *
+ * @author lem9
+ */
+function PMA_blowfish_decrypt($encdata, $secret) {
+ global $iv;
+ return trim(mcrypt_decrypt(MCRYPT_BLOWFISH, $secret, base64_decode($encdata), MCRYPT_MODE_CBC, $iv));
+}
+
+?>
diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php
index 2fedfa3198..fa79a479f0 100644
--- a/libraries/mysql_charsets.lib.php
+++ b/libraries/mysql_charsets.lib.php
@@ -45,6 +45,14 @@ if (PMA_MYSQL_INT_VERSION >= 40100){
unset($res, $row);
function PMA_getCollationDescr($collation) {
+ static $collation_cache;
+
+ if (!is_array($collation_cache)) {
+ $collation_cache = array();
+ } elseif (isset($collation_cache[$collation])) {
+ return $collation_cache[$collation];
+ }
+
if ($collation == 'binary') {
return $GLOBALS['strBinary'];
}
@@ -254,6 +262,8 @@ if (PMA_MYSQL_INT_VERSION >= 40100){
$descr .= ', ' . $GLOBALS['strCaseSensitive'];
}
}
+
+ $collation_cache[$collation] = $descr;
return $descr;
}
@@ -286,7 +296,7 @@ if (PMA_MYSQL_INT_VERSION >= 40100){
define('PMA_CSDROPDOWN_COLLATION', 0);
define('PMA_CSDROPDOWN_CHARSET', 1);
-
+
function PMA_generateCharsetDropdownBox($type = PMA_CSDROPDOWN_COLLATION, $name = NULL, $id = NULL, $default = NULL, $label = TRUE, $indent = 0, $submitOnChange = FALSE) {
global $mysql_charsets, $mysql_charsets_descriptions, $mysql_collations;
diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php
index 6b69bf2d4c..0d7c5698e9 100644
--- a/libraries/select_server.lib.php
+++ b/libraries/select_server.lib.php
@@ -71,7 +71,7 @@ if (count($cfg['Servers']) > 1) {
</select>
<input type="hidden" name="lang" value="<?php echo $lang; ?>" />
<input type="hidden" name="convcharset" value="<?php echo $convcharset; ?>" />
- <noscript><input type="submit" value="<?php echo $strGo; ?>" /></noscript>
+ <input type="submit" value="<?php echo $strGo; ?>" />
</form>
<?php
}
diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
index e2e5ad8787..101836645d 100644
--- a/libraries/sqlparser.data.php
+++ b/libraries/sqlparser.data.php
@@ -347,6 +347,7 @@ $PMA_SQPdata_reserved_word = array (
'MONTH',
'MRG_MYISAM',
'MYISAM',
+ 'NAMES',
'NATURAL',
// 'NO' is not allowed in SQL-99 but is allowed in MySQL
//'NO',
@@ -454,6 +455,7 @@ $PMA_SQPdata_reserved_word = array (
'USING',
'VALUES',
'VARIABLES',
+ 'VIEW',
'WHEN',
'WHERE',
'WITH',
@@ -463,7 +465,7 @@ $PMA_SQPdata_reserved_word = array (
'YEAR_MONTH'
);
//$PMA_SQPdata_reserved_word_cnt = count($PMA_SQPdata_reserved_word);
-$PMA_SQPdata_reserved_word_cnt = 266;
+$PMA_SQPdata_reserved_word_cnt = 268;
$PMA_SQPdata_column_type = array (
'BIGINT',
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index c403721263..9dcee413b1 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -308,7 +308,7 @@ if ($is_minimum_common == FALSE) {
// ($pos === FALSE)
if ($pos < 0) {
$debugstr = $GLOBALS['strSQPBugUnclosedQuote'] . ' @ ' . $startquotepos. "\n"
- . 'STR: ' . $quotetype;
+ . 'STR: ' . htmlspecialchars($quotetype);
PMA_SQP_throwError($debugstr, $sql);
return $sql;
}
@@ -434,7 +434,7 @@ if ($is_minimum_common == FALSE) {
} else if ($last != '~') {
$debugstr = $GLOBALS['strSQPBugUnknownPunctuation'] . ' @ ' . ($count1+1) . "\n"
- . 'STR: ' . $punct_data;
+ . 'STR: ' . htmlspecialchars($punct_data);
PMA_SQP_throwError($debugstr, $sql);
return $sql;
}
@@ -476,7 +476,7 @@ if ($is_minimum_common == FALSE) {
continue;
} else {
$debugstr = $GLOBALS['strSQPBugInvalidIdentifer'] . ' @ ' . ($count1+1) . "\n"
- . 'STR: ' . PMA_substr($sql, $count1, $count2 - $count1);
+ . 'STR: ' . htmlspecialchars(PMA_substr($sql, $count1, $count2 - $count1));
PMA_SQP_throwError($debugstr, $sql);
return $sql;
}
@@ -755,6 +755,7 @@ if ($is_minimum_common == FALSE) {
* ['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
*
* lem9: query clauses
* -------------
@@ -1309,6 +1310,10 @@ if ($is_minimum_common == FALSE) {
$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;
diff --git a/libraries/string.lib.php b/libraries/string.lib.php
index a31860e56e..6e92ffc4cb 100644
--- a/libraries/string.lib.php
+++ b/libraries/string.lib.php
@@ -13,12 +13,24 @@
*
* The SQL Parser code relies heavily on these functions.
*/
-
- /* windows-* and tis-620 are not supported and are not multibyte, so there is
- * no need to handle them. */
-$GLOBALS['PMA_allow_mbstr'] = @function_exists('mb_strlen')
- && substr($GLOBALS['charset'], 0, 8) != 'windows-'
- && $GLOBALS['charset'] != 'tis-620';
+
+/* Try to load mbstring, unless we're using buggy php version */
+if (PMA_PHP_INT_VERSION != 40203) {
+ if (!@extension_loaded('mbstring')) {
+ //PMA_dl('mbstring');
+ }
+}
+
+/* windows-* and tis-620 are not supported and are not multibyte,
+ * others can be ignored as they're not multibyte */
+$GLOBALS['using_mb_charset'] =
+ substr($GLOBALS['charset'], 0, 8) != 'windows-' &&
+ substr($GLOBALS['charset'], 0, 9) != 'iso-8859-' &&
+ substr($GLOBALS['charset'], 0, 3) != 'cp-' &&
+ $GLOBALS['charset'] != 'koi8-r' &&
+ $GLOBALS['charset'] != 'tis-620';
+
+$GLOBALS['PMA_allow_mbstr'] = @function_exists('mb_strlen') && $GLOBALS['using_mb_charset'];
if ($GLOBALS['PMA_allow_mbstr']) {
// the hebrew lang file uses iso-8859-8-i, encoded RTL,
diff --git a/libraries/tbl_change.js b/libraries/tbl_change.js
index 16eb1960f5..d974a33d51 100644
--- a/libraries/tbl_change.js
+++ b/libraries/tbl_change.js
@@ -61,7 +61,7 @@ function unNullify(urlField, multi_edit)
if (typeof(rowForm.elements['fields_null[multi_edit][' + multi_edit + '][' + urlField + ']']) != 'undefined') {
rowForm.elements['fields_null[multi_edit][' + multi_edit + '][' + urlField + ']'].checked = false
} // end if
-
+
if (typeof(rowForm.elements['insert_ignore_' + multi_edit]) != 'undefined') {
rowForm.elements['insert_ignore_' + multi_edit].checked = false
} // end if
@@ -79,7 +79,7 @@ function onKeyDownArrowsHandler(e) {
var o = (e.srcElement||e.target);
if (!o) return;
if (o.tagName != "TEXTAREA" && o.tagName != "INPUT" && o.tagName != "SELECT") return;
- if (!e.ctrlKey) return;
+ if (!e.ctrlKey || e.shiftKey || e.altKey) return;
if (!o.id) return;
var pos = o.id.split("_");
@@ -248,13 +248,29 @@ function initCalendar() {
//heading table
str += '<table class="calendar"><tr><th width="50%">';
+ str += '<form method="NONE" onsubmit="return 0">';
str += '<a href="javascript:month--; initCalendar();">&laquo;</a> ';
- str += month_names[month];
+ str += '<select id="select_month" name="monthsel" onchange="month = parseInt(document.getElementById(\'select_month\').value); initCalendar();">';
+ for (i =0; i < 12; i++) {
+ if (i == month) selected = ' selected="selected"';
+ else selected = '';
+ str += '<option value="' + i + '" ' + selected + '>' + month_names[i] + '</option>';
+ }
+ str += '</select>';
str += ' <a href="javascript:month++; initCalendar();">&raquo;</a>';
+ str += '</form>';
str += '</th><th width="50%">';
+ str += '<form method="NONE" onsubmit="return 0">';
str += '<a href="javascript:year--; initCalendar();">&laquo;</a> ';
- str += year;
+ str += '<select id="select_year" name="yearsel" onchange="year = parseInt(document.getElementById(\'select_year\').value); initCalendar();">';
+ for (i = year - 25; i < year + 25; i++) {
+ if (i == year) selected = ' selected="selected"';
+ else selected = '';
+ str += '<option value="' + i + '" ' + selected + '>' + i + '</option>';
+ }
+ str += '</select>';
str += ' <a href="javascript:year++; initCalendar();">&raquo;</a>';
+ str += '</form>';
str += '</th></tr></table>';
str += '<table class="calendar"><tr>';
diff --git a/libraries/tbl_move_copy.php b/libraries/tbl_move_copy.php
index 39fea3f514..9bd99275d5 100644
--- a/libraries/tbl_move_copy.php
+++ b/libraries/tbl_move_copy.php
@@ -145,8 +145,8 @@ function PMA_table_move_copy($source_db, $source_table, $target_db, $target_tabl
$sql_query = $sql_structure . ';';
}
- if (($move || isset($GLOBALS['constraints'])) && isset($sql_constraints)) {
- $parsed_sql = PMA_SQP_parse($sql_constraints);
+ if (($move || isset($GLOBALS['constraints'])) && isset($GLOBALS['sql_constraints'])) {
+ $parsed_sql = PMA_SQP_parse($GLOBALS['sql_constraints']);
$i = 0;
while ($parsed_sql[$i]['type'] != 'quote_backtick') $i++;
@@ -155,13 +155,15 @@ function PMA_table_move_copy($source_db, $source_table, $target_db, $target_tabl
$parsed_sql[$i]['data'] = $target;
/* Generate query back */
- $sql_constraints = PMA_SQP_formatHtml($parsed_sql, 'query_only');
- $result = PMA_DBI_query($sql_constraints);
+ $GLOBALS['sql_constraints'] = PMA_SQP_formatHtml($parsed_sql, 'query_only');
+ $result = PMA_DBI_query($GLOBALS['sql_constraints']);
if (isset($sql_query)) {
- $sql_query .= "\n" . $sql_constraints;
+ $sql_query .= "\n" . $GLOBALS['sql_constraints'];
} else {
- $sql_query = $sql_constraints;
+ $sql_query = $GLOBALS['sql_constraints'];
}
+
+ unset($GLOBALS['sql_constraints']);
}
} else {
diff --git a/libraries/transformations/text_plain__external.inc.php b/libraries/transformations/text_plain__external.inc.php
index 1545908993..b0520245ed 100644
--- a/libraries/transformations/text_plain__external.inc.php
+++ b/libraries/transformations/text_plain__external.inc.php
@@ -2,51 +2,6 @@
/* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4:
-function PMA_EscapeShellArg($string) {
- return '\'' . str_replace('\'', '\\\'', $string) . '\'';
-}
-
-function PMA_SecureShellArgs($s) {
- $len = strlen($s);
- $inside_single = FALSE;
- $inside_double = FALSE;
- $is_escaped = FALSE;
- for($i = 0; $i < $len; $i++) {
- if (!$inside_single && $s[$i] == '\\') {
- $is_escaped = ! $is_escaped;
- continue;
- }
- if ($is_escaped && $s[$i - 1] != '\\') {
- $is_escaped = FALSE;
- }
- if (!$inside_double && !$is_escaped && $s[$i] == '\'') {
- $inside_single = ! $inside_single;
- continue;
- }
- if (!$inside_single && !$is_escaped && $s[$i] == '"') {
- $inside_double = ! $inside_double;
- continue;
- }
- // escape shell special chars in we're not inside quotes
- if (!$inside_single && !$is_escaped && !$inside_double) {
- if (strstr('><$`|;&', $s[$i])) {
- $s = substr($s, 0, $i) . '\\' . substr($s, $i);
- $i++;
- continue;
- }
- }
- // in double quotes we need to escape more
- if ($inside_double && !$is_escaped) {
- if (strstr('$`', $s[$i])) {
- $s = substr($s, 0, $i) . '\\' . substr($s, $i);
- $i++;
- }
- }
- }
- return $s;
-}
-
-
function PMA_transformation_text_plain__external_nowrap($options = array()) {
if (!isset($options[3]) || $options[3] == '') {
$nowrap = true;
@@ -78,8 +33,8 @@ function PMA_transformation_text_plain__external($buffer, $options = array(), $m
// Add here program definitions like (note that these are NOT safe
// programs):
//
- // $allowed_programs[0] = '/usr/local/bin/tidy';
- // $allowed_programs[1] = '/usr/local/bin/validate';
+ //$allowed_programs[0] = '/usr/local/bin/tidy';
+ //$allowed_programs[1] = '/usr/local/bin/validate';
// no-op when no allowed programs
if (count($allowed_programs) == 0) {
@@ -106,8 +61,24 @@ function PMA_transformation_text_plain__external($buffer, $options = array(), $m
$options[3] = 1;
}
- $cmdline = 'echo ' . PMA_EscapeShellArg($buffer) . ' | ' . $program . ' ' . PMA_SecureShellArgs($poptions);
- $newstring = `$cmdline`;
+ // needs PHP >= 4.3.0
+ $newstring = '';
+ $descriptorspec = array(
+ 0 => array("pipe", "r"),
+ 1 => array("pipe", "w")
+ );
+ $process = proc_open($program . ' ' . $poptions, $descriptorspec, $pipes);
+ if (is_resource($process)) {
+ fwrite($pipes[0], $buffer);
+ fclose($pipes[0]);
+
+ while (!feof($pipes[1])) {
+ $newstring .= fgets($pipes[1], 1024);
+ }
+ fclose($pipes[1]);
+ // we don't currently use the return value
+ $return_value = proc_close($process);
+ }
if ($options[2] == 1 || $options[2] == '2') {
$retstring = htmlspecialchars($newstring);
@@ -117,5 +88,4 @@ function PMA_transformation_text_plain__external($buffer, $options = array(), $m
return $retstring;
}
-
?>
diff --git a/libraries/zip.lib.php b/libraries/zip.lib.php
index b29435fb69..00a0ca090b 100644
--- a/libraries/zip.lib.php
+++ b/libraries/zip.lib.php
@@ -67,12 +67,12 @@ class zipfile
$timearray = ($unixtime == 0) ? getdate() : getdate($unixtime);
if ($timearray['year'] < 1980) {
- $timearray['year'] = 1980;
- $timearray['mon'] = 1;
- $timearray['mday'] = 1;
- $timearray['hours'] = 0;
- $timearray['minutes'] = 0;
- $timearray['seconds'] = 0;
+ $timearray['year'] = 1980;
+ $timearray['mon'] = 1;
+ $timearray['mday'] = 1;
+ $timearray['hours'] = 0;
+ $timearray['minutes'] = 0;
+ $timearray['seconds'] = 0;
} // end if
return (($timearray['year'] - 1980) << 25) | ($timearray['mon'] << 21) | ($timearray['mday'] << 16) |
diff --git a/main.php b/main.php
index 98cc5e0e71..438fba1f41 100644
--- a/main.php
+++ b/main.php
@@ -180,7 +180,7 @@ if ($server > 0) {
$is_superuser = PMA_DBI_try_query('SELECT COUNT(*) FROM mysql.user', $userlink, PMA_DBI_QUERY_STORE);
function PMA_analyseShowGrant($rs_usr, &$is_create_priv, &$db_to_create) {
-
+
$re0 = '(^|(\\\\\\\\)+|[^\])'; // non-escaped wildcards
$re1 = '(^|[^\])(\\\)+'; // escaped wildcards
while ($row = PMA_DBI_fetch_row($rs_usr)) {
@@ -206,7 +206,7 @@ function PMA_analyseShowGrant($rs_usr, &$is_create_priv, &$db_to_create) {
} // end while
} // end function
-// Detection for some CREATE privilege.
+// Detection for some CREATE privilege.
// Since MySQL 4.1.2, we can easily detect current user's grants
// using $userlink (no control user needed)
@@ -215,16 +215,16 @@ function PMA_analyseShowGrant($rs_usr, &$is_create_priv, &$db_to_create) {
if (PMA_MYSQL_INT_VERSION >= 40102) {
$rs_usr = PMA_DBI_try_query('SHOW GRANTS', $userlink, PMA_DBI_QUERY_STORE);
if ($rs_usr) {
- PMA_analyseShowGrant($rs_usr,&$is_create_priv, &$db_to_create);
+ PMA_analyseShowGrant($rs_usr,$is_create_priv, $db_to_create);
PMA_DBI_free_result($rs_usr);
unset($rs_usr);
}
} else {
-// Before MySQL 4.1.2, we first try to find a priv in mysql.user. Hopefuly
+// Before MySQL 4.1.2, we first try to find a priv in mysql.user. Hopefuly
// the controluser is correctly defined; but here, $dbh could contain
// $userlink so maybe the SELECT will fail
-
+
if (!$is_create_priv) {
$local_query = 'SELECT Create_priv, Reload_priv FROM mysql.user WHERE ' . PMA_convert_using('User') . ' = ' . PMA_convert_using(PMA_sqlAddslashes($mysql_cur_user), 'quoted') . ' OR ' . PMA_convert_using('User') . ' = ' . PMA_convert_using('', 'quoted') . ';';
$rs_usr = PMA_DBI_try_query($local_query, $dbh); // Debug: or PMA_mysqlDie('', $local_query, FALSE);
@@ -275,7 +275,7 @@ function PMA_analyseShowGrant($rs_usr, &$is_create_priv, &$db_to_create) {
}
unset($local_query);
if ($rs_usr) {
- PMA_analyseShowGrant($rs_usr,&$is_create_priv, &$db_to_create);
+ PMA_analyseShowGrant($rs_usr,$is_create_priv, $db_to_create);
PMA_DBI_free_result($rs_usr);
unset($rs_usr);
} // end if
@@ -760,6 +760,23 @@ if (PMA_PHP_INT_VERSION == 40203 && @extension_loaded('mbstring')) {
}
/**
+ * Nijel: As we try to hadle charsets by ourself, mbstring overloads just
+ * break it, see bug 1063821.
+ */
+
+if (@extension_loaded('mbstring') && @ini_get('mbstring.func_overload') > 1) {
+ echo '<div class="warning">' . $strMbOverloadWarning . '</div>' . "\n";
+}
+
+/**
+ * Nijel: mbstring is used for handling multibyte inside parser, so it is good
+ * to tell user something might be broken without it, see bug #1063149.
+ */
+if ($GLOBALS['using_mb_charset'] && !@extension_loaded('mbstring')) {
+ echo '<div class="warning">' . $strMbExtensionMissing . '</div>' . "\n";
+}
+
+/**
* Warning for old PHP version
* modified: 2004-05-05 mkkeck
*/
diff --git a/mult_submits.inc.php b/mult_submits.inc.php
index ccc05ca6ad..f19f377fa2 100644
--- a/mult_submits.inc.php
+++ b/mult_submits.inc.php
@@ -233,9 +233,9 @@ if (!empty($submit_mult) && !empty($what)) {
<input type="hidden" name="query_type" value="<?php echo $what; ?>" />
<?php
if ($what == 'row_delete') {
- echo '<input type="hidden" name="original_sql_query" value="' . $original_sql_query . '" />' . "\n";
+ echo '<input type="hidden" name="original_sql_query" value="' . htmlspecialchars($original_sql_query) . '" />' . "\n";
echo '<input type="hidden" name="original_pos" value="' . $original_pos . '" />' . "\n";
- echo '<input type="hidden" name="original_url_query" value="' . $original_url_query . '" />' . "\n";
+ echo '<input type="hidden" name="original_url_query" value="' . htmlspecialchars($original_url_query) . '" />' . "\n";
}
?>
<input type="submit" name="mult_btn" value="<?php echo $strYes; ?>" id="buttonYes" />
@@ -372,7 +372,6 @@ else if ($mult_btn == $strYes) {
// statements will be run at once below
if ($run_parts) {
$sql_query .= $a_query . ';' . "\n";
-
if ($query_type != 'drop_db') {
PMA_DBI_select_db($db);
}
@@ -382,7 +381,7 @@ else if ($mult_btn == $strYes) {
if ($use_sql) {
require('./sql.php');
- } else {
+ } elseif (!$run_parts) {
PMA_DBI_select_db($db);
$result = PMA_DBI_query($sql_query);
}
diff --git a/pdf_schema.php b/pdf_schema.php
index 523b90beb6..d1802b509e 100644
--- a/pdf_schema.php
+++ b/pdf_schema.php
@@ -39,10 +39,20 @@ if (!$cfgRelation['pdfwork']) {
/**
- * Gets the "fpdf" libraries and defines the pdf font path
+ * Gets the "fpdf" libraries and defines the pdf font path, use unicode version for unicode.
*/
define('FPDF_FONTPATH','./libraries/fpdf/font/');
-require_once('./libraries/fpdf/fpdf.php');
+if ($charset == 'utf-8') {
+ define('PMA_PDF_FONT', 'FreeSans');
+ require_once('./libraries/fpdf/ufpdf.php');
+ class PMA_FPDF extends UFPDF {
+ };
+} else {
+ define('PMA_PDF_FONT', 'Arial');
+ require_once('./libraries/fpdf/fpdf.php');
+ class PMA_FPDF extends FPDF {
+ };
+}
/**
@@ -52,7 +62,7 @@ require_once('./libraries/fpdf/fpdf.php');
*
* @see FPDF
*/
-class PMA_PDF extends FPDF
+class PMA_PDF extends PMA_FPDF
{
/**
* Defines private properties
@@ -100,7 +110,7 @@ class PMA_PDF extends FPDF
$nb=$this->page;
foreach ($this->Alias AS $alias => $value) {
for ($n=1;$n<=$nb;$n++)
- $this->pages[$n]=str_replace($alias,$value,$this->pages[$n]);
+ $this->pages[$n]=$this->_strreplace($alias,$value,$this->pages[$n]);
}
}
parent::_putpages();
@@ -512,7 +522,7 @@ function NbLines($w,$txt)
}
if ($c==' ')
$sep=$i;
- $l+=$cw[$c];
+ $l+=isset($cw[ord($c)])?$cw[ord($c)]:0 ;
if ($l>$wmax)
{
if ($sep==-1)
@@ -889,7 +899,7 @@ class PMA_RT
*/
var $tables = array();
var $relations = array();
- var $ff = 'Arial';
+ var $ff = PMA_PDF_FONT;
var $x_max = 0;
var $y_max = 0;
var $scale;
@@ -1080,6 +1090,7 @@ class PMA_RT
// Font face depends on the current language
$this->ff = str_replace('"', '', substr($GLOBALS['right_font_family'], 0, strpos($GLOBALS['right_font_family'], ',')));
+
$this->same_wide = $all_tab_same_wide;
// Initializes a new document
@@ -1091,13 +1102,20 @@ class PMA_RT
$pdf->SetAuthor('phpMyAdmin ' . PMA_VERSION);
$pdf->AliasNbPages();
- // fonts added to phpMyAdmin and considered non-standard by fpdf
- // (Note: those tahoma fonts are iso-8859-2 based)
- if ($this->ff == 'tahoma') {
- $pdf->AddFont('tahoma','','tahoma.php');
- $pdf->AddFont('tahoma','B','tahomab.php');
- }
-
+ if ($GLOBALS['charset'] == 'utf-8') {
+ // Force FreeSans for utf-8
+ $this->ff = 'FreeSans';
+ $pdf->AddFont('FreeSans','','FreeSans.php');
+ $pdf->AddFont('FreeSans','B','FreeSansBold.php');
+ $pdf->SetFont('FreeSans', '', 14);
+ } else {
+ // fonts added to phpMyAdmin and considered non-standard by fpdf
+ // (Note: those tahoma fonts are iso-8859-2 based)
+ if ($this->ff == 'tahoma') {
+ $pdf->AddFont('tahoma','','tahoma.php');
+ $pdf->AddFont('tahoma','B','tahomab.php');
+ }
+ }
$pdf->SetFont($this->ff, '', 14);
$pdf->SetAutoPageBreak('auto');
diff --git a/queryframe.php b/queryframe.php
index 497b9097fb..79bb9e2ecf 100644
--- a/queryframe.php
+++ b/queryframe.php
@@ -119,9 +119,20 @@ function resizeRowsLeft() {
}
}
+//-->
+</script>
+<?php
+ // setup the onload handler for resizing frames
+ $js_frame_onload=' onload="resizeRowsLeft();"';
+}
+if ($cfg['QueryFrame']) {
+?>
+<script type="text/javascript" language="javascript">
+<!--
// added 2004-09-16 by Michael Keck (mkkeck)
// bug: #1027321
// drop-down databases list keep focus on database change
+// modified 2004-11-06: bug #1046434 (Light mode does not work)
var focus_removed = false;
function remove_focus_select() {
focus_removed = false;
@@ -139,8 +150,6 @@ function set_focus_to_nav() {
//-->
</script>
<?php
- // setup the onload handler for resizing frames
- $js_frame_onload=' onload="resizeRowsLeft();"';
}
?>
</head>
diff --git a/read_dump.php b/read_dump.php
index 5e1e7db743..c029fe8ce7 100644
--- a/read_dump.php
+++ b/read_dump.php
@@ -36,7 +36,12 @@ $err_url = $goto
$view_bookmark = 0;
$sql_bookmark = isset($sql_bookmark) ? $sql_bookmark : '';
$sql_query = isset($sql_query) ? $sql_query : '';
+
if (!empty($sql_localfile) && !empty($cfg['UploadDir'])) {
+
+ // sanitize $sql_localfile as it comes from a POST
+ $sql_localfile = PMA_securePath($sql_localfile);
+
if (substr($cfg['UploadDir'], -1) != '/') {
$cfg['UploadDir'] .= '/';
}
@@ -73,13 +78,7 @@ if (!empty($id_bookmark)) {
*/
// Gets the query from a file if required
if ($sql_file != 'none') {
-// loic1 : fixed a security issue
-// if ((file_exists($sql_file) && is_uploaded_file($sql_file))
-// || file_exists($cfg['UploadDir'] . $sql_localfile)) {
-
// file_exists() returns false if open_basedir is set
- //if (file_exists($sql_file)
- // && ((isset($sql_localfile) && $sql_file == $cfg['UploadDir'] . $sql_localfile) || is_uploaded_file($sql_file))) {
if ((is_uploaded_file($sql_file))
||(isset($sql_localfile) && $sql_file == $cfg['UploadDir'] . $sql_localfile) && file_exists($sql_file)) {
@@ -321,15 +320,15 @@ if ($sql_query != '') {
// If a 'USE <db>' SQL-clause was found and the query succeeded, set our current $db to the new one
// .*? below is non greedy expansion, just in case somebody wants to understand it...
- if ($result != FALSE && preg_match('@^((-- |#)^[\n]*|/\*.*?\*/)*USE[[:space:]]*([^[:space]+)@i', $a_sql_query, $match)) {
- $db = trim($match[0]);
+ if ($result != FALSE && preg_match('@^((-- |#)^[\n]*|/\*.*?\*/)*USE[[:space:]]*([\S]+)@i', $a_sql_query, $match)) {
+ $db = trim($match[3]);
$reload = 1;
}
// .*? below is non greedy expansion, just in case somebody wants to understand it...
// must check $a_sql_query and use PCRE_MULTILINE
- if (!isset($reload) && preg_match('@^((-- |#)[^\n]*\n|/\*.*?\*/)*(DROP|CREATE)[[:space:]]+(IF EXISTS[[:space:]]+)?(TABLE|DATABASE)[[:space:]]+(.+)@im', $a_sql_query)) {
+ if (!isset($reload) && preg_match('@^((-- |#)[^\n]*\n|/\*.*?\*/)*(DROP|CREATE)[\s]+(IF EXISTS[[:space:]]+)?(TABLE|DATABASE)[[:space:]]+(.+)@im', $a_sql_query)) {
$reload = 1;
}
} // end for
@@ -411,7 +410,7 @@ if (!empty($id_bookmark) && $action_bookmark == 2) {
$message = $strNoQuery;
}
} else if ($sql_query_cpy == '') {
- $message = "$strSuccess:<br />$strTheContent ("
+ $message = "$strSuccess:[br]$strTheContent ("
. (isset($sql_file_name) ? $sql_file_name . ': ' : '')
. "$pieces_count $strInstructions)&nbsp;";
} else {
diff --git a/scripts/upgrade_tables_mysql_4_1_2+.sql b/scripts/upgrade_tables_mysql_4_1_2+.sql
index 9f20756bf7..48f2305c77 100644
--- a/scripts/upgrade_tables_mysql_4_1_2+.sql
+++ b/scripts/upgrade_tables_mysql_4_1_2+.sql
@@ -8,12 +8,6 @@
-- If you are running one MySQL 4.1.0 or 4.1.1, please create the tables using
-- create_tables.sql, then use this script.
--
--- This script expects the user pma to already be existing. If we would put a
--- line here to create him too many users might just use this script and end
--- up with having the same password for the controluser.
---
--- This user "pma" must be defined in config.inc.php (controluser/controlpass)
---
-- Please don't forget to set up the tablenames in config.inc.php
--
-- $Id$
diff --git a/server_binlog.php b/server_binlog.php
index 27a015888e..7c12ab9b11 100644
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -79,8 +79,8 @@ PMA_showMessage($GLOBALS['strSuccess']);
<?php
$useBgcolorOne = TRUE;
foreach ($serverProcesses as $value) {
- if (empty($full) && strlen($value['Info']) > $GLOBALS['cfg']['LimitChars']) {
- $value['Info'] = substr($value['Info'], 0, $GLOBALS['cfg']['LimitChars']) . '...';
+ if (empty($full) && PMA_strlen($value['Info']) > $GLOBALS['cfg']['LimitChars']) {
+ $value['Info'] = PMA_substr($value['Info'], 0, $GLOBALS['cfg']['LimitChars']) . '...';
}
?>
<tr>
diff --git a/server_databases.php b/server_databases.php
index fc24c38ad1..6b5cc2b9d1 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -46,10 +46,15 @@ function reload_window(db) {
function PMA_dbCmp($a, $b)
{
global $sort_by, $sort_order;
+ if ($GLOBALS['cfg']['NaturalOrder']) {
+ $sorter = 'strnatcmp';
+ } else {
+ $sorter = 'strcasecmp';
+ }
if ($sort_by == 'db_name') {
- return ($sort_order == 'asc' ? 1 : -1) * strcasecmp($a['db_name'], $b['db_name']);
+ return ($sort_order == 'asc' ? 1 : -1) * $sorter($a['db_name'], $b['db_name']);
} else if ($a[$sort_by] == $b[$sort_by]) {
- return strcasecmp($a['db_name'], $b['db_name']);
+ return $sorter($a['db_name'], $b['db_name']);
} else {
return ($sort_order == 'asc' ? 1 : -1) * ((int)$a[$sort_by] > (int)$b[$sort_by] ? 1 : -1);
}
@@ -162,20 +167,13 @@ if (count($statistics) > 0) {
. ' <tr>' . "\n"
. ($is_superuser || $cfg['AllowUserDropDatabase'] ? ' <th>&nbsp;</th>' . "\n" : '')
. ' <th>' . "\n"
- . ' &nbsp;';
- if (empty($dbstats)) {
- echo $strDatabase . "\n"
- . ' <img src="' . $pmaThemeImage . 's_asc.png" border="0" width="11" height="9" alt="' . $strAscending . '" />' . "\n"
- . ' &nbsp;' . "\n"
- . ' </th>' . "\n";
- } else {
- echo "\n"
- . ' <a href="./server_databases.php?' . $url_query . '&amp;dbstats=1&amp;sort_by=db_name&amp;sort_order=' . (($sort_by == 'db_name' && $sort_order == 'asc') ? 'desc' : 'asc') . '">' . "\n"
- . ' ' . $strDatabase . "\n"
- . ($sort_by == 'db_name' ? ' <img src="' . $pmaThemeImage . 's_' . $sort_order . '.png" border="0" width="11" height="9" alt="' . ($sort_order == 'asc' ? $strAscending : $strDescending) . '" />' . "\n" : '')
- . ' </a>' . "\n"
- . ' &nbsp;' . "\n"
- . ' </th>' . "\n";
+ . ' <a href="./server_databases.php?' . $url_query . (!empty($dbstats) ? '&amp;dbstats=1' : '') . '&amp;sort_by=db_name&amp;sort_order=' . (($sort_by == 'db_name' && $sort_order == 'asc') ? 'desc' : 'asc') . '">' . "\n"
+ . ' ' . $strDatabase . "\n"
+ . ($sort_by == 'db_name' ? ' <img src="' . $pmaThemeImage . 's_' . $sort_order . '.png" border="0" width="11" height="9" alt="' . ($sort_order == 'asc' ? $strAscending : $strDescending) . '" />' . "\n" : '')
+ . ' </a>' . "\n"
+ . ' &nbsp;' . "\n"
+ . ' </th>' . "\n";
+ if (!empty($dbstats)) {
if (PMA_MYSQL_INT_VERSION >= 40101) {
echo ' <th>' . "\n"
. ' &nbsp;' . $strCollation . '&nbsp;' . "\n"
diff --git a/server_privileges.php b/server_privileges.php
index 4c028a5a10..42a6d8a819 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -591,7 +591,7 @@ if (!empty($adduser_submit) || !empty($change_copy)) {
$res = PMA_DBI_query('SELECT \'foo\' FROM `user` WHERE ' . PMA_convert_using('User') . ' = ' . PMA_convert_using(PMA_sqlAddslashes($username), 'quoted') . ' AND ' . PMA_convert_using('Host') . ' = ' . PMA_convert_using($hostname, 'quoted') . ';');
if (PMA_DBI_affected_rows() == 1) {
PMA_DBI_free_result($res);
- $message = sprintf($strUserAlreadyExists, '<i>\'' . $username . '\'@\'' . $hostname . '\'</i>');
+ $message = sprintf($strUserAlreadyExists, '[i]\'' . $username . '\'@\'' . $hostname . '\'[/i]');
$adduser = 1;
} else {
PMA_DBI_free_result($res);
@@ -692,13 +692,13 @@ if (!empty($change_copy)) {
$tmp_privs1[] = 'SELECT (`' . join('`, `', $tmp_privs2['Select']) . '`)';
}
if (count($tmp_privs2['Insert']) > 0 && !in_array('INSERT', $tmp_privs1)) {
- $tmp_privs1[] = 'INSERT (`' . join(', ', $tmp_privs2['Insert']) . '`)';
+ $tmp_privs1[] = 'INSERT (`' . join('`, `', $tmp_privs2['Insert']) . '`)';
}
if (count($tmp_privs2['Update']) > 0 && !in_array('UPDATE', $tmp_privs1)) {
- $tmp_privs1[] = 'UPDATE (`' . join(', ', $tmp_privs2['Update']) . '`)';
+ $tmp_privs1[] = 'UPDATE (`' . join('`, `', $tmp_privs2['Update']) . '`)';
}
if (count($tmp_privs2['References']) > 0 && !in_array('REFERENCES', $tmp_privs1)) {
- $tmp_privs1[] = 'REFERENCES (`' . join(', ', $tmp_privs2['References']) . '`)';
+ $tmp_privs1[] = 'REFERENCES (`' . join('`, `', $tmp_privs2['References']) . '`)';
}
unset($tmp_privs2);
$queries[] = 'GRANT ' . join(', ', $tmp_privs1) . ' ON `' . $row['Db'] . '`.`' . $row['Table_name'] . '` TO \'' . PMA_sqlAddslashes($username) . '\'@\'' . $hostname . '\'' . (in_array('Grant', explode(',', $row['Table_priv'])) ? ' WITH GRANT OPTION' : '') . ';';
@@ -710,7 +710,16 @@ if (!empty($change_copy)) {
* Updates privileges
*/
if (!empty($update_privs)) {
- $db_and_table = empty($dbname) ? '*.*' : PMA_backquote($dbname) . '.' . (empty($tablename) ? '*' : PMA_backquote($tablename));
+ // escaping a wildcard character in a GRANT is only accepted at the global
+ // or database level, not at table level; this is why I remove
+ // the escaping character
+ // Note: in the Database-specific privileges, we will have for example
+ // test\_db SELECT (this one is for privileges on a db level)
+ // test_db USAGE (this one is for table-specific privileges)
+ //
+ // It looks curious but reflects IMO the way MySQL works
+
+ $db_and_table = empty($dbname) ? '*.*' : str_replace('\\','',PMA_backquote($dbname)) . '.' . (empty($tablename) ? '*' : PMA_backquote($tablename));
$sql_query0 = 'REVOKE ALL PRIVILEGES ON ' . $db_and_table . ' FROM \'' . PMA_sqlAddslashes($username) . '\'@\'' . $hostname . '\';';
if (!isset($Grant_priv) || $Grant_priv != 'Y') {
$sql_query1 = 'REVOKE GRANT OPTION ON ' . $db_and_table . ' FROM \'' . PMA_sqlAddslashes($username) . '\'@\'' . $hostname . '\';';
diff --git a/sql.php b/sql.php
index 2a8d0db939..e29ce90ad2 100644
--- a/sql.php
+++ b/sql.php
@@ -9,7 +9,6 @@ require_once('./libraries/grab_globals.lib.php');
require_once('./libraries/common.lib.php');
require_once('./libraries/tbl_indexes.lib.php');
-
/**
* Defines the url to return to in case of error in a sql statement
*/
@@ -231,14 +230,14 @@ if ($do_confirm) {
?>
<?php echo PMA_generate_common_hidden_inputs($db, (isset($table)?$table:'')); ?>
<input type="hidden" name="sql_query" value="<?php echo urlencode($sql_query); ?>" />
- <input type="hidden" name="zero_rows" value="<?php echo isset($zero_rows) ? $zero_rows : ''; ?>" />
+ <input type="hidden" name="zero_rows" value="<?php echo isset($zero_rows) ? PMA_sanitize($zero_rows) : ''; ?>" />
<input type="hidden" name="goto" value="<?php echo $goto; ?>" />
- <input type="hidden" name="back" value="<?php echo isset($back) ? $back : ''; ?>" />
- <input type="hidden" name="reload" value="<?php echo isset($reload) ? $reload : 0; ?>" />
- <input type="hidden" name="purge" value="<?php echo isset($purge) ? $purge : ''; ?>" />
- <input type="hidden" name="cpurge" value="<?php echo isset($cpurge) ? $cpurge : ''; ?>" />
- <input type="hidden" name="purgekey" value="<?php echo isset($purgekey) ? $purgekey : ''; ?>" />
- <input type="hidden" name="show_query" value="<?php echo isset($show_query) ? $show_query : ''; ?>" />
+ <input type="hidden" name="back" value="<?php echo isset($back) ? PMA_sanitize($back) : ''; ?>" />
+ <input type="hidden" name="reload" value="<?php echo isset($reload) ? PMA_sanitize($reload) : 0; ?>" />
+ <input type="hidden" name="purge" value="<?php echo isset($purge) ? PMA_sanitize($purge) : ''; ?>" />
+ <input type="hidden" name="cpurge" value="<?php echo isset($cpurge) ? PMA_sanitize($cpurge) : ''; ?>" />
+ <input type="hidden" name="purgekey" value="<?php echo isset($purgekey) ? PMA_sanitize($purgekey) : ''; ?>" />
+ <input type="hidden" name="show_query" value="<?php echo isset($show_query) ? PMA_sanitize($show_query) : ''; ?>" />
<input type="submit" name="btnDrop" value="<?php echo $strYes; ?>" id="buttonYes" />
<input type="submit" name="btnDrop" value="<?php echo $strNo; ?>" id="buttonNo" />
<?php
@@ -314,6 +313,7 @@ else {
&& (!$cfg['ShowAll'] || $session_max_rows != 'all')
&& !($is_count || $is_export || $is_func || $is_analyse)
&& isset($analyzed_sql[0]['queryflags']['select_from'])
+ && !isset($analyzed_sql[0]['queryflags']['offset'])
&& !preg_match('@[[:space:]]LIMIT[[:space:]0-9,-]+$@i', $sql_query)) {
$sql_limit_to_append = " LIMIT $pos, ".$cfg['MaxRows'];
if (preg_match('@(.*)([[:space:]](PROCEDURE[[:space:]](.*)|FOR[[:space:]]+UPDATE|LOCK[[:space:]]+IN[[:space:]]+SHARE[[:space:]]+MODE))$@i', $sql_query, $regs)) {
@@ -584,7 +584,7 @@ else {
$message = $strInsertedRows . '&nbsp;' . $num_rows;
$insert_id = PMA_DBI_insert_id();
if ($insert_id != 0) {
- $message .= '<br />'.$strInsertedRowId . '&nbsp;' . $insert_id;
+ $message .= '[br]'.$strInsertedRowId . '&nbsp;' . $insert_id;
}
} else if ($is_affected) {
$message = $strAffectedRows . '&nbsp;' . $num_rows;
@@ -721,7 +721,7 @@ else {
?>
<table border="0" cellpadding="2" cellspacing="0">
<tr>
- <td class="tblHeaders" colspan="7"><?php printf($strIndexWarningTable, $tbl_name); ?></td>
+ <td class="tblHeaders" colspan="7"><?php printf($strIndexWarningTable, urldecode($tbl_name)); ?></td>
</tr>
<?php echo $check; ?>
</table>
diff --git a/tbl_change.php b/tbl_change.php
index fb0f4379ad..2ee1b9f7b7 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -447,6 +447,7 @@ foreach ($loop_array AS $vrowcount => $vrow) {
$default_function = $cfg['DefaultFunctions'][$current_func_type];
} else {
$dropdown = array();
+ $default_function = '';
}
$dropdown_built = array();
@@ -871,10 +872,21 @@ if (!empty($disp_message)) {
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b><?php echo $strOr; ?></b><br />
<input type="radio" name="after_insert" value="new_insert" id="radio_after_insert_new_insert"<?php echo $checked_after_insert_new_insert; ?> tabindex="<?php echo ($tabindex + $tabindex_for_value + 4); ?>" style="vertical-align: middle" /><label for="radio_after_insert_new_insert"><?php echo $strAfterInsertNewInsert; ?></label><br />
-<?php if (isset($primary_key)) { ?>
+<?php
+if (isset($primary_key))
+{?>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b><?php echo $strOr; ?></b><br />
- <input type="radio" name="after_insert" value="same_insert" id="radio_after_insert_same_insert"<?php echo $checked_after_insert_new_insert; ?> tabindex="<?php echo ($tabindex + $tabindex_for_value + 5); ?>" style="vertical-align: middle" /><label for="radio_after_insert_same_insert"><?php echo $strAfterInsertSame; ?></label>
-<?php } ?>
+ <input type="radio" name="after_insert" value="same_insert" id="radio_after_insert_same_insert"<?php echo $checked_after_insert_new_insert; ?> tabindex="<?php echo ($tabindex + $tabindex_for_value + 5); ?>" style="vertical-align: middle" /><label for="radio_after_insert_same_insert"><?php echo $strAfterInsertSame; ?></label><br />
+<?php
+ // If we have just numeric primary key, we can also edit next
+ if (preg_match('@^[\s]*`[^`]*` = [0-9]+@', $primary_key)) {
+?>
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b><?php echo $strOr; ?></b><br />
+ <input type="radio" name="after_insert" value="edit_next" id="radio_after_insert_edit_next"<?php echo $checked_after_insert_new_insert; ?> tabindex="<?php echo ($tabindex + $tabindex_for_value + 5); ?>" style="vertical-align: middle" /><label for="radio_after_insert_edit_next"><?php echo $strAfterInsertNext; ?></label><br />
+<?php
+ }
+}
+?>
</td>
</tr>
diff --git a/tbl_create.php b/tbl_create.php
index 3e21e716e0..eb44d1bc5d 100644
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -60,7 +60,8 @@ if (isset($submit_num_fields)) {
continue;
}
$query = PMA_backquote($field_name[$i]) . ' ' . $field_type[$i];
- if ($field_length[$i] != '') {
+ if ($field_length[$i] != ''
+ && !preg_match('@^(DATE|DATETIME|TIME|TINYBLOB|TINYTEXT|BLOB|TEXT|MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT)$@i', $field_type[$i])) {
$query .= '(' . $field_length[$i] . ')';
}
if ($field_attribute[$i] != '') {
diff --git a/tbl_indexes.php b/tbl_indexes.php
index 3cbe31e54d..8ee60e67f0 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -2,7 +2,6 @@
/* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4:
-
/**
* Gets some core libraries
*/
@@ -51,7 +50,7 @@ if (!defined('PMA_IDX_INCLUDED')) {
/**
* Gets fields and indexes informations
*/
-if (defined('PMA_IDX_INCLUDED')) {
+if (!defined('PMA_IDX_INCLUDED')) {
$err_url_0 = 'db_details.php?' . PMA_generate_common_url($db);
}
@@ -61,10 +60,10 @@ $indexes_info = array();
$indexes_data = array();
// keys had already been grabbed in "tbl_properties.php"
if (!defined('PMA_IDX_INCLUDED')) {
- $tbl_ret_keys = PMA_get_indexes($table, $err_url_0);
+ $ret_keys = PMA_get_indexes($table, $err_url_0);
}
-PMA_extract_indexes($tbl_ret_keys, $indexes, $indexes_info, $indexes_data);
+PMA_extract_indexes($ret_keys, $indexes, $indexes_info, $indexes_data);
// Get fields and stores their name/type
// fields had already been grabbed in "tbl_properties.php"
diff --git a/tbl_properties_operations.php b/tbl_properties_operations.php
index 18edd1c15a..f88354b312 100644
--- a/tbl_properties_operations.php
+++ b/tbl_properties_operations.php
@@ -250,9 +250,22 @@ for ($i = 0; $i < $num_dbs; $i++) {
<form method="post" action="tbl_properties_operations.php">
<tr>
<th colspan="2" class="tblHeaders" align="left">
- <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
- <?php echo $strTableComments; ?>:&nbsp;
- <?php $comment = ereg_replace('; InnoDB free:.*$' , '', ereg_replace('^InnoDB free:.*$', '', $show_comment)); ?>
+ <?php
+ echo PMA_generate_common_hidden_inputs($db, $table);
+ echo $strTableComments . '&nbsp;';
+ if (strstr($show_comment, '; InnoDB free') === FALSE) {
+ if (strstr($show_comment, 'InnoDB free') === FALSE) {
+ // only user entered comment
+ $comment = $show_comment;
+ } else {
+ // here we have just InnoDB generated part
+ $comment = '';
+ }
+ } else {
+ // remove InnoDB comment from end, just the minimal part (*? is non greedy)
+ $comment = preg_replace('@; InnoDB free:.*?$@' , '', $show_comment);
+ }
+ ?>
<input type="hidden" name="prev_comment" value="<?php echo urlencode($comment); ?>" />&nbsp;
</th>
<tr>
diff --git a/tbl_relation.php b/tbl_relation.php
index 0d5c2a7103..17e26f102a 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -204,11 +204,17 @@ if (isset($submit_rel) && $submit_rel == 'true') {
} // end if... else....
if (isset($upd_query)) {
- $upd_rs = PMA_DBI_try_query($upd_query);
- if (substr(PMA_DBI_getError(), 1, 4) == '1005') {
+ $upd_rs = PMA_DBI_try_query($upd_query);
+ $tmp_error = PMA_DBI_getError();
+ if (substr($tmp_error, 1, 4) == '1216') {
+ PMA_mysqlDie($tmp_error, $upd_query, FALSE, '', FALSE);
+ echo PMA_showMySQLDocu('manual_Table_types', 'InnoDB_foreign_key_constraints') . "\n";
+ }
+ if (substr($tmp_error, 1, 4) == '1005') {
echo '<p class="warning">' . $strNoIndex . ' (' . $master_field .')</p>' . PMA_showMySQLDocu('manual_Table_types', 'InnoDB_foreign_key_constraints') . "\n";
}
unset($upd_query);
+ unset($tmp_error);
}
} // end while
} // end if isset($destination_innodb)
@@ -391,7 +397,7 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) {
if ($cfgRelation['relwork']) {
echo ' <th><b>' .$strInternalRelations;
if ($tbl_type=='INNODB') {
- echo '&nbsp;(*)';
+ echo '&nbsp;' . PMA_showHint($strInternalNotNecessary);
}
echo '</b></th>';
}
@@ -454,56 +460,60 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) {
} // end if (internal relations)
if ($tbl_type=='INNODB') {
+ if (!empty($save_row[$i]['Key'])) {
?>
<td bgcolor="<?php echo ($i % 2) ? $GLOBALS['cfg']['BgcolorOne'] : $GLOBALS['cfg']['BgcolorTwo']; ?>">
<select name="destination_innodb[<?php echo htmlspecialchars($save_row[$i]['Field']); ?>]">
<?php
- if (isset($existrel_innodb[$myfield])) {
- $foreign_field = $existrel_innodb[$myfield]['foreign_db'] . '.'
- . $existrel_innodb[$myfield]['foreign_table'] . '.'
- . $existrel_innodb[$myfield]['foreign_field'];
- } else {
- $foreign_field = FALSE;
- }
-
- $found_foreign_field = FALSE;
- foreach ($selectboxall_innodb AS $key => $value) {
- echo ' '
- . '<option value="' . htmlspecialchars($key) . '"';
- if ($foreign_field && $key == $foreign_field) {
- echo ' selected="selected"';
- $found_foreign_field = TRUE;
+ if (isset($existrel_innodb[$myfield])) {
+ $foreign_field = $existrel_innodb[$myfield]['foreign_db'] . '.'
+ . $existrel_innodb[$myfield]['foreign_table'] . '.'
+ . $existrel_innodb[$myfield]['foreign_field'];
+ } else {
+ $foreign_field = FALSE;
}
- echo '>' . $value . '</option>'. "\n";
- } // end while
+
+ $found_foreign_field = FALSE;
+ foreach ($selectboxall_innodb AS $key => $value) {
+ echo ' '
+ . '<option value="' . htmlspecialchars($key) . '"';
+ if ($foreign_field && $key == $foreign_field) {
+ echo ' selected="selected"';
+ $found_foreign_field = TRUE;
+ }
+ echo '>' . $value . '</option>'. "\n";
+ } // end while
// we did not find the foreign field in the tables of current db,
// must be defined in another db so show it to avoid erasing it
- if (!$found_foreign_field && $foreign_field) {
- echo ' '
- . '<option value="' . htmlspecialchars($foreign_field) . '"';
- echo ' selected="selected"';
- echo '>' . $foreign_field . '</option>'. "\n";
- }
+ if (!$found_foreign_field && $foreign_field) {
+ echo ' '
+ . '<option value="' . htmlspecialchars($foreign_field) . '"';
+ echo ' selected="selected"';
+ echo '>' . $foreign_field . '</option>'. "\n";
+ }
?>
</select>
</td>
<td bgcolor="<?php echo ($i % 2) ? $GLOBALS['cfg']['BgcolorOne'] : $GLOBALS['cfg']['BgcolorTwo']; ?>">
<?php
- PMA_generate_dropdown('ON DELETE',
- htmlspecialchars($save_row[$i]['Field']) . '_on_delete',
- $options_array,
- (isset($existrel_innodb[$myfield]['on_delete']) ? $existrel_innodb[$myfield]['on_delete']: '') );
-
- echo '&nbsp;&nbsp;&nbsp;';
-
- PMA_generate_dropdown('ON UPDATE',
- htmlspecialchars($save_row[$i]['Field']) . '_on_update',
- $options_array,
- (isset($existrel_innodb[$myfield]['on_update']) ? $existrel_innodb[$myfield]['on_update']: '') );
-
- }
+ PMA_generate_dropdown('ON DELETE',
+ htmlspecialchars($save_row[$i]['Field']) . '_on_delete',
+ $options_array,
+ (isset($existrel_innodb[$myfield]['on_delete']) ? $existrel_innodb[$myfield]['on_delete']: '') );
+
+ echo '&nbsp;&nbsp;&nbsp;';
+
+ PMA_generate_dropdown('ON UPDATE',
+ htmlspecialchars($save_row[$i]['Field']) . '_on_update',
+ $options_array,
+ (isset($existrel_innodb[$myfield]['on_update']) ? $existrel_innodb[$myfield]['on_update']: '') );
+
+ } else {
+ echo '<td>' . PMA_showHint($strNoIndex) . '</td>';
+ } // end if (a key exists)
+ } // end if (InnoDB)
?>
</td>
</tr>
@@ -520,9 +530,6 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) {
</table>
<?php
if ($tbl_type=='INNODB') {
- if ($cfgRelation['relwork']) {
- echo $strInternalNotNecessary . '<br />';
- }
if (PMA_MYSQL_INT_VERSION < 40013) {
echo '** ' . sprintf($strUpgrade, 'MySQL', '4.0.13') . '<br />';
}
diff --git a/tbl_replace.php b/tbl_replace.php
index 7067460c04..839483fcfe 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -12,6 +12,8 @@ require_once('./libraries/common.lib.php');
// Check parameters
PMA_checkParameters(array('db','table','goto'));
+PMA_DBI_select_db($db);
+
/**
* Initializes some variables
*/
@@ -48,6 +50,25 @@ if (isset($after_insert) && $after_insert == 'new_insert') {
$goto .= '&primary_key[]=' . $pk;
}
}
+} elseif (isset($after_insert) && $after_insert == 'edit_next') {
+ $goto = 'tbl_change.php?'
+ . PMA_generate_common_url($db, $table, '&')
+ . '&goto=' . urlencode($goto)
+ . '&pos=' . $pos
+ . '&session_max_rows=' . $session_max_rows
+ . '&disp_direction=' . $disp_direction
+ . '&repeat_cells=' . $repeat_cells
+ . '&dontlimitchars=' . $dontlimitchars
+ . (empty($sql_query) ? '' : '&sql_query=' . urlencode($sql_query));
+ if (isset($primary_key)) {
+ foreach ($primary_key AS $pk) {
+ $local_query = 'SELECT * FROM ' . PMA_backquote($table) . ' WHERE ' . str_replace('` =', '` >', urldecode($pk)) . ' LIMIT 1;';
+ $res = PMA_DBI_query($local_query);
+ $row = PMA_DBI_fetch_row($res);
+ $meta = PMA_DBI_get_fields_meta($res);
+ $goto .= '&primary_key[]=' . urlencode(PMA_getUvaCondition($res, count($row), $meta, $row));
+ }
+ }
} else if ($goto == 'sql.php') {
$goto = 'sql.php?'
. PMA_generate_common_url($db, $table, '&')
@@ -76,11 +97,6 @@ if (isset($err_url)) {
. (empty($primary_key) ? '' : '&amp;primary_key=' . (is_array($primary_key) ? $primary_key[0] : $primary_key));
}
-// Resets tables defined in the configuration file
-if (isset($funcs)) {
- reset($funcs);
-}
-
// Misc
$seen_binary = FALSE;
@@ -100,7 +116,6 @@ if (isset($primary_key)) {
$is_insert = TRUE;
}
-PMA_DBI_select_db($db);
$query = array();
$message = '';
@@ -222,7 +237,7 @@ foreach ($query AS $query_index => $single_query) {
$insert_id = PMA_DBI_insert_id();
if ($insert_id != 0) {
- $last_message .= '<br />'.$strInsertedRowId . '&nbsp;' . $insert_id;
+ $last_message .= '[br]'.$strInsertedRowId . '&nbsp;' . $insert_id;
}
} // end if
PMA_DBI_free_result($result);
@@ -230,7 +245,6 @@ foreach ($query AS $query_index => $single_query) {
}
if ($total_affected_rows != 0) {
- //$message .= '<br />' . $total_affected_rows;
$message .= $total_affected_rows;
} else {
$message .= $strModifications;
diff --git a/tbl_row_delete.php b/tbl_row_delete.php
index 688c7717fd..f394b8e7d7 100644
--- a/tbl_row_delete.php
+++ b/tbl_row_delete.php
@@ -20,9 +20,9 @@ if ((!isset($rows_to_delete) || !is_array($rows_to_delete)) && !isset($mult_btn)
*/
// workaround for IE problem:
-if (isset($submit_mult_x)) {
+if (isset($submit_mult_delete_x)) {
$submit_mult = 'row_delete';
-} elseif (isset($submit_mult_edit_x)) {
+} elseif (isset($submit_mult_change_x)) {
$submit_mult = 'row_edit';
} elseif (isset($submit_mult_export_x)) {
$submit_mult = 'row_export';
@@ -119,7 +119,7 @@ if (!empty($submit_mult)) {
}
if (isset($original_sql_query)) {
- $sql_query = urldecode($original_sql_query);
+ $sql_query = $original_sql_query;
}
if (isset($original_url_query)) {
diff --git a/tbl_select.php b/tbl_select.php
index 454517784e..d9f3fc64b9 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -303,7 +303,7 @@ function PMA_tbl_select_operator(f, index, multiple) {
?>
<input type="hidden" name="names[<?php echo $i; ?>]" value="<?php echo htmlspecialchars($fields_list[$i]); ?>" />
<input type="hidden" name="types[<?php echo $i; ?>]" value="<?php echo $fields_type[$i]; ?>" />
- <input type="hidden" name="collations[<?php echo $i; ?>]" value="<?php echo $fields_collation[$i]; ?>" />
+ <input type="hidden" name="collations[<?php echo $i; ?>]" value="<?php echo $fields_collation[$i]; ?>" />
</td>
</tr>
<?php
@@ -359,9 +359,9 @@ else {
$cnt_func = count($func);
reset($func);
while (list($i, $func_type) = each($func)) {
- if (PMA_MYSQL_INT_VERSION >= 40100) {
- list($charsets[$i]) = explode('_', $collations[$i]);
- }
+ if (PMA_MYSQL_INT_VERSION >= 40100) {
+ list($charsets[$i]) = explode('_', $collations[$i]);
+ }
if (@$GLOBALS['cfg']['UnaryOperators'][$func_type] == 1) {
$fields[$i] = '';
$w[] = PMA_backquote(urldecode($names[$i])) . ' ' . $func_type;
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index 48808bf16c..be6679ee25 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -14,7 +14,7 @@ body{
background-color: #ffffff;
margin: 5px;
}
-
+
pre, tt, code{
font-size: 11px;
}
diff --git a/translators.html b/translators.html
index 5291668e65..c9af26a94b 100644
--- a/translators.html
+++ b/translators.html
@@ -5,7 +5,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <title>phpMyAdmin 2.6.1-dev - Official translators</title>
+ <title>phpMyAdmin 2.6.1-rc2 - Official translators</title>
<link rel="stylesheet" type="text/css" href="docs.css" />
<script lanuage="javascript" type="text/javascript">
<!--
@@ -45,7 +45,7 @@
<hr noshade="noshade" width="100%" />
</div>
-<h1>phpMyAdmin 2.6.1-dev official translators list</h1>
+<h1>phpMyAdmin 2.6.1-rc2 official translators list</h1>
<p>
Here is the list of the so called &quot;official translators&quot; of
diff --git a/user_password.php b/user_password.php
index 8fdee0a1da..f656f3547c 100644
--- a/user_password.php
+++ b/user_password.php
@@ -58,7 +58,7 @@ if (isset($nopass)) {
// Duration = till the browser is closed for password (we don't want this to be saved)
if ($cfg['Server']['auth_type'] == 'cookie') {
- setcookie('pma_cookie_password',
+ setcookie('pma_cookie_password-' . $server,
PMA_blowfish_encrypt($pma_pw,
$GLOBALS['cfg']['blowfish_secret'] . $GLOBALS['current_time']),
0,