Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

added infou about UFPDF to documentation

  • Loading branch information...
commit f1f39b8ed115c5cfbd18d3dca5fad1707beb00f2 1 parent 9edf126
Michal Čihař nijel authored

Showing 162 changed files with 4,211 additions and 2,300 deletions. Show diff stats Hide diff stats

  1. +185 0 ChangeLog
  2. +67 24 Documentation.html
  3. +2 2 README
  4. +3 3 browse_foreigners.php
  5. +3 6 config.inc.php
  6. +3 13 css/phpmyadmin.css.php
  7. +2 2 db_details_structure.php
  8. +1 1  footer.inc.php
  9. +6 0 lang/afrikaans-iso-8859-1.inc.php
  10. +6 0 lang/afrikaans-utf-8.inc.php
  11. +6 0 lang/albanian-iso-8859-1.inc.php
  12. +6 0 lang/albanian-utf-8.inc.php
  13. +6 0 lang/arabic-utf-8.inc.php
  14. +6 0 lang/arabic-windows-1256.inc.php
  15. +6 0 lang/azerbaijani-iso-8859-9.inc.php
  16. +6 0 lang/azerbaijani-utf-8.inc.php
  17. +6 0 lang/basque-iso-8859-1.inc.php
  18. +6 0 lang/basque-utf-8.inc.php
  19. +6 0 lang/bosnian-utf-8.inc.php
  20. +6 0 lang/bosnian-windows-1250.inc.php
  21. +6 0 lang/brazilian_portuguese-iso-8859-1.inc.php
  22. +6 0 lang/brazilian_portuguese-utf-8.inc.php
  23. +6 0 lang/bulgarian-koi8-r.inc.php
  24. +6 0 lang/bulgarian-utf-8.inc.php
  25. +6 0 lang/bulgarian-windows-1251.inc.php
  26. +28 22 lang/catalan-iso-8859-1.inc.php
  27. +28 22 lang/catalan-utf-8.inc.php
  28. +6 0 lang/chinese_simplified-gb2312.inc.php
  29. +6 0 lang/chinese_simplified-utf-8.inc.php
  30. +170 164 lang/chinese_traditional-big5.inc.php
  31. +170 167 lang/chinese_traditional-utf-8.inc.php
  32. +6 0 lang/croatian-iso-8859-2.inc.php
  33. +6 0 lang/croatian-utf-8.inc.php
  34. +6 0 lang/croatian-windows-1250.inc.php
  35. +142 136 lang/czech-iso-8859-2.inc.php
  36. +142 136 lang/czech-utf-8.inc.php
  37. +142 136 lang/czech-windows-1250.inc.php
  38. +35 28 lang/danish-iso-8859-1.inc.php
  39. +35 28 lang/danish-utf-8.inc.php
  40. +6 0 lang/dutch-iso-8859-1.inc.php
  41. +6 0 lang/dutch-utf-8.inc.php
  42. +120 114 lang/english-iso-8859-1.inc.php
  43. +120 114 lang/english-utf-8.inc.php
  44. +6 0 lang/estonian-iso-8859-1.inc.php
  45. +6 0 lang/estonian-utf-8.inc.php
  46. +6 0 lang/finnish-iso-8859-1.inc.php
  47. +6 0 lang/finnish-utf-8.inc.php
  48. +25 18 lang/french-iso-8859-1.inc.php
  49. +25 18 lang/french-utf-8.inc.php
  50. +38 32 lang/galician-iso-8859-1.inc.php
  51. +38 32 lang/galician-utf-8.inc.php
  52. +6 0 lang/georgian-utf-8.inc.php
  53. +6 0 lang/german-iso-8859-1.inc.php
  54. +6 0 lang/german-utf-8.inc.php
  55. +6 0 lang/greek-iso-8859-7.inc.php
  56. +6 0 lang/greek-utf-8.inc.php
  57. +6 0 lang/hebrew-iso-8859-8-i.inc.php
  58. +6 0 lang/hebrew-utf-8.inc.php
  59. +6 0 lang/hindi-utf-8.inc.php
  60. +6 0 lang/hungarian-iso-8859-2.inc.php
  61. +6 0 lang/hungarian-utf-8.inc.php
  62. +126 120 lang/indonesian-iso-8859-1.inc.php
  63. +126 120 lang/indonesian-utf-8.inc.php
  64. +6 0 lang/italian-iso-8859-1.inc.php
  65. +6 0 lang/italian-utf-8.inc.php
  66. +50 40 lang/japanese-euc.inc.php
  67. +52 43 lang/japanese-sjis.inc.php
  68. +51 41 lang/japanese-utf-8.inc.php
  69. +6 0 lang/korean-euc-kr.inc.php
  70. +6 0 lang/korean-utf-8.inc.php
  71. +34 17 lang/latvian-utf-8.inc.php
  72. +34 17 lang/latvian-windows-1257.inc.php
  73. +6 0 lang/lithuanian-utf-8.inc.php
  74. +6 0 lang/lithuanian-windows-1257.inc.php
  75. +6 0 lang/malay-iso-8859-1.inc.php
  76. +6 0 lang/malay-utf-8.inc.php
  77. +23 17 lang/norwegian-iso-8859-1.inc.php
  78. +23 17 lang/norwegian-utf-8.inc.php
  79. +6 0 lang/persian-utf-8.inc.php
  80. +6 0 lang/persian-windows-1256.inc.php
  81. +29 23 lang/polish-iso-8859-2.inc.php
  82. +29 23 lang/polish-utf-8.inc.php
  83. +6 0 lang/portuguese-iso-8859-1.inc.php
  84. +6 0 lang/portuguese-utf-8.inc.php
  85. +6 0 lang/romanian-iso-8859-1.inc.php
  86. +6 0 lang/romanian-utf-8.inc.php
  87. +6 0 lang/russian-cp-866.inc.php
  88. +6 0 lang/russian-koi8-r.inc.php
  89. +6 0 lang/russian-utf-8.inc.php
  90. +6 0 lang/russian-windows-1251.inc.php
  91. +28 22 lang/serbian_cyrillic-utf-8.inc.php
  92. +28 22 lang/serbian_cyrillic-windows-1251.inc.php
  93. +28 22 lang/serbian_latin-utf-8.inc.php
  94. +28 22 lang/serbian_latin-windows-1250.inc.php
  95. +6 0 lang/slovak-iso-8859-2.inc.php
  96. +6 0 lang/slovak-utf-8.inc.php
  97. +6 0 lang/slovak-windows-1250.inc.php
  98. +6 0 lang/slovenian-iso-8859-2.inc.php
  99. +6 0 lang/slovenian-utf-8.inc.php
  100. +6 0 lang/slovenian-windows-1250.inc.php
  101. +28 22 lang/spanish-iso-8859-1.inc.php
  102. +28 22 lang/spanish-utf-8.inc.php
  103. +6 0 lang/swedish-iso-8859-1.inc.php
  104. +6 0 lang/swedish-utf-8.inc.php
  105. +6 0 lang/thai-tis-620.inc.php
  106. +6 0 lang/thai-utf-8.inc.php
  107. +36 30 lang/turkish-iso-8859-9.inc.php
  108. +6 0 lang/turkish-utf-8.inc.php
  109. +6 0 lang/ukrainian-utf-8.inc.php
  110. +6 0 lang/ukrainian-windows-1251.inc.php
  111. +27 43 left.php
  112. +20 87 libraries/auth/cookie.auth.lib.php
  113. +96 1 libraries/blowfish.php
  114. +40 0 libraries/bookmark.lib.php
  115. +122 59 libraries/common.lib.php
  116. +6 3 libraries/config_import.lib.php
  117. +2 2 libraries/database_interface.lib.php
  118. +4 4 libraries/dbg/profiling.php
  119. +1 1  libraries/defines.lib.php
  120. +13 0 libraries/display_export.lib.php
  121. +8 11 libraries/display_tbl.lib.php
  122. +1 1  libraries/display_tbl_links.lib.php
  123. +13 4 libraries/export/sql.php
  124. BIN  libraries/fpdf/font/FreeSans.ctg.z
  125. +150 0 libraries/fpdf/font/FreeSans.php
  126. BIN  libraries/fpdf/font/FreeSans.z
  127. BIN  libraries/fpdf/font/FreeSansBold.ctg.z
  128. +79 0 libraries/fpdf/font/FreeSansBold.php
  129. BIN  libraries/fpdf/font/FreeSansBold.z
  130. +6 2 libraries/fpdf/fpdf.php
  131. +481 0 libraries/fpdf/ufpdf.php
  132. +93 0 libraries/mcrypt.lib.php
  133. +11 1 libraries/mysql_charsets.lib.php
  134. +1 1  libraries/select_server.lib.php
  135. +3 1 libraries/sqlparser.data.php
  136. +8 3 libraries/sqlparser.lib.php
  137. +18 6 libraries/string.lib.php
  138. +20 4 libraries/tbl_change.js
  139. +8 6 libraries/tbl_move_copy.php
  140. +20 50 libraries/transformations/text_plain__external.inc.php
  141. +6 6 libraries/zip.lib.php
  142. +23 6 main.php
  143. +3 4 mult_submits.inc.php
  144. +31 13 pdf_schema.php
  145. +11 2 queryframe.php
  146. +9 10 read_dump.php
  147. +0 6 scripts/upgrade_tables_mysql_4_1_2+.sql
  148. +2 2 server_binlog.php
  149. +14 16 server_databases.php
  150. +14 5 server_privileges.php
  151. +10 10 sql.php
  152. +15 3 tbl_change.php
  153. +2 1  tbl_create.php
  154. +3 4 tbl_indexes.php
  155. +16 3 tbl_properties_operations.php
  156. +49 42 tbl_relation.php
  157. +22 8 tbl_replace.php
  158. +3 3 tbl_row_delete.php
  159. +4 4 tbl_select.php
  160. +1 1  themes/darkblue_orange/css/theme_right.css.php
  161. +2 2 translators.html
  162. +1 1  user_password.php
185 ChangeLog
@@ -5,8 +5,193 @@ phpMyAdmin - Changelog
5 5 $Id$
6 6 $Source$
7 7
  8 +2004-12-29 Michal Čihař <michal@cihar.com>
  9 + * libraries/export/sql.php: Fix typo.
  10 + * server_databases.php: Use same sort order as in left frame (bug
  11 + #1087244), allow sorting even if not showing stats.
  12 + * pdf_schema.php, libraries/fpdf/fpdf.php, libraries/fpdf/ufpdf.php,
  13 + libraries/fpdf/font/FreeSans*: Added support for PDF output in utf-8,
  14 + uses UFPDF class from http://www.acko.net/node/56. NOTE: We now have a
  15 + bit modified FPDF class. (bug #1046051)
  16 + * Documentation.html: Added info about UFPDF library.
  17 +
  18 +2004-12-28 Michal Čihař <michal@cihar.com>
  19 + * libraries/tbl_move_copy.php: Fix constraints copying (bug #1085900).
  20 + * config.inc.php, lang/*, libraries/common.lib.php,
  21 + libraries/config_import.lib.php, libraries/display_export.lib.php,
  22 + libraries/export/sql.php: Support for selecting SQL export compatibility
  23 + (RFE #1060040).
  24 + * libraries/tbl_change.js: Faster navigation in calendar (RFE #1090315).
  25 + * mult_submits.inc.php, tbl_row_delete.php: Fix % escaping (bug #1082954).
  26 + * read_dump.php: Fix database name extraction from use statement (bug
  27 + #1084777).
  28 + * css/phpmyadmin.css.php, libraries/common.lib.php: Disabled theme manager
  29 + still allows to select theme in configuration (bug #1084712).
  30 + * tbl_replace.php: Remove unused code.
  31 + * main.php, lang/*, libraries/string.lib.php: Added warnings about
  32 + mbstring - one to disable function overloading and one for requesting
  33 + mbstring for multibyte charsets (bugs #1063149 and #1063821).
  34 + * tbl_change.php, tbl_replace.php, lang/*, libraries/common.lib.php:
  35 + Support for editing next entry (when numeric primary key) (RFE
  36 + #1074906).
  37 +
  38 +2004-12-26 Marc Delisle <lem9@users.sourceforge.net>
  39 + * libraries/database_interface.lib.php: bug #1085647, wrong parameters
  40 + for strpos(), thanks to Meithar - meithar
  41 + * libraries/select_server.lib.php, bug #1073056, unable to submit selected server,
  42 + thanks to jamaz - jamaz
  43 + * tbl_change.php: bug #1090608, undefined variable, thanks to peterinsb
  44 + * scripts/upgrade_tables_mysql_4_1_2+.sql: bug #1084426, misleading comments
  45 + * tbl_create.php: bug #1085494, illegal length value for LONGTEXT, thanks to mjec
  46 +
  47 +2004-12-16 Marc Delisle <lem9@users.sourceforge.net>
  48 + * libraries/blowfish.php: bug #1085997, undefined variables,
  49 + patch thanks to Chandrakumar Muthaiah - sudhach
  50 +
  51 +2004-12-14 Alexander M. Turek <me@derrabus.de>
  52 + * libraries/sqlparser.data.php: Added keywords NAMES and VIEW.
  53 +
  54 +2004-12-13 Michal Čihař <michal@cihar.com>
  55 + * libraries/tbl_change.js: Do not catch Alt and Shift keys (bug #1082315).
  56 + * libraries/export/sql.php: Do not duplicate constraints when exporting
  57 + multiple databases (bug #1084459).
  58 +
  59 +2004-12-12 Marc Delisle <lem9@users.sourceforge.net>
  60 + * lang/japanese: updated, thanks to Tadashi Jokagi (elf2000)
  61 + * lang/latvian: Updated, thanks to Sandis Jerics (saaa2002).
  62 + * lang/serbian: Updated, thanks to Mihailo Stefanovic (mikis).
  63 + * lang/catalan update, thanks to Xavier Navarro (xavin).
  64 + * lang/danish: Updated, thanks to AlleyKat - dk_alleykat.
  65 + * lang/galician: Updated, thanks to Xosé Calvo.
  66 + * lang/polish: Updated, thanks to Jakub Wilk (ubanus).
  67 + * lang/chinese_traditional-*.inc.php: Updates, thanks to Siu Sun.
  68 + * lang/spanish: Updated, thanks to Daniel Hinostroza (hinostroza).
  69 + * lang/turkish update, thanks to boralioglu.
  70 + ### 2.6.1-rc1 released
  71 +
  72 +2004-12-10 Marc Delisle <lem9@users.sourceforge.net>
  73 + * libraries/transformations/text_plain__external.inc.php:
  74 + security fix: no longer use the shell to execute external program
  75 + * Documentation.html: mention the new need of PHP >= 4.3.0 to run
  76 + external programs
  77 +
  78 +2004-12-09 Marc Delisle <lem9@users.sourceforge.net>
  79 + * tbl_row_delete.php, libraries/display_tbl.lib.php:
  80 + cannot drop or export multiple rows under IE6
  81 +
  82 +2004-12-07 Marc Delisle <lem9@users.sourceforge.net>
  83 + * read_dump.php: security fix on $sql_localfile
  84 + * lang/norwegian: Update, thanks to Sven-Erik Andersen
  85 + * lang/danish: Updated, thanks to AlleyKat - dk_alleykat.
  86 + * lang/indonesian: Update thanks to Rachim Tamsjadi - tamsy.
  87 +
  88 +2004-12-01 Marc Delisle <lem9@users.sourceforge.net>
  89 + * db_details_structure.php, lang/*: added hint strApproximateCount referring
  90 + to FAQ 3.11 (bug #1075658)
  91 +
  92 +2004-11-30 Marc Delisle <lem9@users.sourceforge.net>
  93 + * libraries/auth/cookie.auth.lib.php: Avoid displaying the
  94 + "No activity" message if more than 4 times the LoginCookieValidity
  95 + timeout has passed: no need to alert users the next morning
  96 + (for example) that they have been inactive.
  97 +
  98 +2004-11-25 Marc Delisle <lem9@users.sourceforge.net>
  99 + * libraries/auth/cookie.auth.lib.php, lang/*: "No activity" message
  100 + to explain to users why they have to relogin
  101 +
  102 +2004-11-25 Michal Čihař <michal@cihar.com>
  103 + * libraries/mcrypt.lib.php: Trim result, because it can be paded with \0s.
  104 +
  105 +2004-11-24 Marc Delisle <lem9@users.sourceforge.net>
  106 + * libraries/mcrypt.lib.php, /libraries/blowfish.php,
  107 + libraries/auth/cookie.auth.lib.php: support of mcrypt
  108 + library (blowfish) for speed improvement in auth_type cookie
  109 +
  110 +2004-11-23 Marc Delisle <lem9@users.sourceforge.net>
  111 + * user_password.php: wrong generated cookie name
  112 +
  113 +2004-11-21 Marc Delisle <lem9@users.sourceforge.net>
  114 + * server_privileges.php: bug #1067626, column privileges while copying user
  115 + * libraries/common.lib.php: bug #1070197, not connecting if using
  116 + a non-standard HTTP port (bug introduced in 2.6.0-pl3)
  117 +
  118 +2004-11-19 Garvin Hicking <pma@supergarv.de>
  119 + * libraries/bookmark.lib.php, left.php:
  120 + Massively speed up table display for left frame, if
  121 + PMA infrastructure is used. Use native PHP function
  122 + for indenting.
  123 + * libraries/mysql_charsets.lib.php: Use a static
  124 + array cache to speed up returning the same collation
  125 + information.
  126 +
  127 +2004-11-19 Marc Delisle <lem9@users.sourceforge.net>
  128 + * libraries/display_tbl.lib.php: we have the PMA_get_indexes() function,
  129 + let's use it!
  130 + * tbl_indexes.php: bug #1068994, undefined variable
  131 + * libraries/dbg/profiling.php: bug #1068318, call-time pass-by-reference
  132 +
  133 +2004-11-16 Michal Čihař <michal@cihar.com>
  134 + * left.php: Possible undefined index (bug #1067199).
  135 + * Documentation.html: Warn about Excel export problems in documentation
  136 + (bug #1063082).
  137 +
  138 +2004-11-14 Marc Delisle <lem9@users.sourceforge.net>
  139 + * tbl_relation.php: bug #1050437, intercept constraint failure
  140 + and do not offer to add an InnoDB foreign key if the field
  141 + does not have a key
  142 +
  143 +2004-11-13 Marc Delisle <lem9@users.sourceforge.net>
  144 + * server_privileges.php: bug #1056706: table specific privs for a db containing an escaped wildcard character
  145 + * libraries/display_tbl.lib.php: bug #1065688: display the Full text link
  146 + on the results for PROCEDURE ANALYSE
  147 +
  148 +2004-11-11 Michal Čihař <michal@cihar.com>
  149 + * tbl_properties_operations.php: Allow InnoDB text to be included in user
  150 + comment.
  151 +
  152 +2004-11-09 Michal Čihař <michal@cihar.com>
  153 + * browse_foreigners.php, server_binlog.php: Truncate text according to
  154 + text length and not byte count.
  155 +
  156 +2004-11-07 Alexander M. Turek <me@derrabus.de>
  157 + * Documentation.html, README: Updated credits.
  158 +
  159 +2004-11-07 Marc Delisle <lem9@users.sourceforge.net>
  160 + * mult_submits.inc.php: bug #1054720, multi-row delete
  161 +
  162 +2004-11-06 Michael Keck <mkkeck@users.sourceforge.net>
  163 + * queryframe.php: bug #1046434 (Light mode does not work)
  164 +
  165 +2004-11-06 Marc Delisle <lem9@users.sourceforge.net>
  166 + * libraries/common.lib.php: put sanitize logic in PMA_sanitize()
  167 + * sql.php: sanitize confirm page
  168 + * db_details_structure.php: bug #1049553, undefined $db_collation
  169 +
  170 +2004-11-05 Marc Delisle <lem9@users.sourceforge.net>
  171 + * Documentation.html: new controluser behavior starting from MySQL 4.1.2
  172 +
  173 +2004-11-04 Marc Delisle <lem9@users.sourceforge.net>
  174 + * libraries/common.lib.php, tbl_replace.php, sql.php, read_dump.php,
  175 + server_privileges.php: now PMA_showMessage() sanitizes the message
  176 + to defeat XSS attacks. Calling scripts use special tags like
  177 + [br], [i], [/i], [b], [/b] in the message.
  178 + * main.php: bug #1058692, call-time pass-by-reference error
  179 + * sql.php, libraries/sqlparser.lib.php: bug #1054590, handling of OFFSET
  180 +
  181 +2004-11-10 Garvin Hicking
  182 + * config.inc.php: Reverted commenting out of QueryWindowWidth/Height
  183 + settings. Those can be overriden by a themes layout.inc.php,
  184 + but not neccessarily so.
  185 +
  186 +2004-11-03 Michal Čihař <michal@cihar.com>
  187 + * libraries/common.lib.php: More robust PmaAbsoluteUri detection.
  188 + * libraries/sqlparser.lib.php: Escape html special chars in parser bugs.
  189 + * libraries/common.lib.php: HTTP_HOST might be unset (bug #1053310).
  190 +
8 191 2004-11-02 Michal Čihař <michal@cihar.com>
9 192 * tbl_indexes.php: Fix index editing.
  193 + * sql.php: Decode table name.
  194 + * lang/czech: Updated.
10 195
11 196 2004-11-09 Garvin Hicking
12 197 * libraries/display_tbl.lib.php, libraries/common.lib.php,
91 Documentation.html
@@ -8,7 +8,7 @@
8 8
9 9 <head>
10 10 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
11   - <title>phpMyAdmin 2.6.1-dev - Documentation</title>
  11 + <title>phpMyAdmin 2.6.1-rc2 - Documentation</title>
12 12 <link rel="stylesheet" type="text/css" href="docs.css" />
13 13 </head>
14 14
@@ -31,7 +31,7 @@
31 31 <hr noshade="noshade" width="100%" />
32 32 </div>
33 33
34   -<h1>phpMyAdmin 2.6.1-dev Documentation</h1>
  34 +<h1>phpMyAdmin 2.6.1-rc2 Documentation</h1>
35 35
36 36
37 37 <!-- TOP MENU -->
@@ -62,12 +62,24 @@
62 62
63 63 <ul>
64 64 <li>
65   - php 4.1.0 or later (<a href="#faqphp5">*</a>)<br />
66   - If you want to display inline thumbnails of JPEGs with the original
67   - aspect ratio, you also need GD2 support in PHP.
  65 + <b>PHP</b>
  66 + <ul>
  67 + <li>You need PHP 4.1.0 or newer (<a href="#faqphp5">*</a>)</li>
  68 + <li>If you want to display inline thumbnails of JPEGs with the
  69 + original aspect ratio, you also need GD2 support in PHP</li>
  70 + <li>Starting with phpMyAdmin 2.6.1, MIME-based transformations
  71 + that use an external program need PHP 4.3.0 or newer</li>
  72 + </ul>
  73 + </li>
  74 + <li>
  75 + <b>MySQL</b> 3.23.32 or newer (<a href="#faqmysqlversions">details</a>);
68 76 </li>
69 77 <li>
70   - MySQL 3.23.32 or newer (<a href="#faqmysqlversions">details</a>);
  78 + Not really a requirement but a <b>strong suggestion</b>:
  79 + if you are using
  80 + the &quot;cookie&quot; authentication method, having the <tt>mcrypt</tt>
  81 + PHP extension on your web server accelerates not only the login
  82 + phase but every other action that you do in phpMyAdmin.
71 83 </li>
72 84 <li>
73 85 a web-browser (doh!).
@@ -156,7 +168,9 @@
156 168 Also insert the correct value for <tt>$cfg['PmaAbsoluteUri']</tt>.
157 169 Have a look at
158 170 <a href="#config">Configuration section</a> for an
159   - explanation of all values.</li>
  171 + explanation of all values. Please also read the remaining of this
  172 + Installation section for information about authentication modes
  173 + and the linked-tables infrastructure.</li>
160 174 <li> It is recommended that you protect the directory in which you
161 175 installed phpMyAdmin (unless it's on a closed intranet, or you wish to
162 176 use HTTP or cookie authentication), for example with HTTP-AUTH (in a
@@ -227,9 +241,9 @@
227 241 in the configuration file.<br /><br /></li>
228 242
229 243 <li>HTTP and cookie authentication modes are more secure: the MySQL
230   - password does not need to be set in the phpMyAdmin configuration file
231   - (except for the &quot;controluser&quot; -see the
232   - <a href="#config">Configuration section</a>).
  244 + login information does not need to be set in the phpMyAdmin
  245 + configuration file
  246 + (except possibly for the <a href="#controluser">controluser</a>).
233 247 <br />
234 248 However, keep in mind that the password travels in plain text, unless
235 249 you are using the HTTPS protocol.
@@ -239,14 +253,18 @@
239 253 <br /><br /></li>
240 254
241 255 <li>
  256 + <b>Note: starting with phpMyAdmin 2.6.1, configuring the controluser
  257 + to enable HTTP and cookie authentication applies <i>only
  258 + to MySQL servers older than 4.1.2</i>.</b>
  259 + <br /><br />
242 260 For 'HTTP' and 'cookie' modes, phpMyAdmin needs a controluser that has
243 261 <b>only</b> the <tt>SELECT</tt> privilege on the <i>mysql.user (all
244 262 columns except &quot;Password&quot;)</i>, <i>mysql.db (all
245 263 columns)</i>, <i>mysql.host (all columns)</i> and
246 264 <i>mysql.tables_priv (all columns except
247 265 &quot;Grantor&quot; &amp; &quot;Timestamp&quot;) </i>tables.<br /> You
248   - must specify the details for the controluser in the
249   - <i>config.inc.php</i> file under the
  266 + must specify the details for the <a href="#controluser">controluser</a>
  267 + in the <i>config.inc.php</i> file under the
250 268 <tt>$cfg['Servers'][$i]['controluser']</tt>&amp;
251 269 <tt>$cfg['Servers'][$i]['controlpass']</tt> settings.<br /> The
252 270 following example assumes you want to use <tt>pma</tt> as the
@@ -328,6 +346,8 @@
328 346 with the same username.</li>
329 347 <li>If you want to login to arbitrary server see
330 348 <tt><a href="#AllowArbitraryServer">$cfg['AllowArbitraryServer']</a></tt> directive.</li>
  349 + <li>See also the <a href="#require">requirements</a> section for a way
  350 + to improve the interface speed while using this mode.</li>
331 351 </ul>
332 352
333 353 <h4>'config' authentication mode</h4>
@@ -495,14 +515,20 @@
495 515 </dd>
496 516
497 517 <dt>
  518 +<a name="controluser"></a><br />
498 519 <b>$cfg['Servers'][$i]['controluser']</b> string<br />
499 520 <b>$cfg['Servers'][$i]['controlpass']</b> string
500 521 </dt>
501 522 <dd>
  523 + <i>Note: starting with phpMyAdmin 2.6.1, configuring the controluser
  524 + to enable HTTP and cookie authentication applies only
  525 + to MySQL servers older than 4.1.2.</i>
  526 + <br /><br />
502 527 This special account is used for 2 distinct purposes: to make possible
503   - a multi-user installation (http or cookie authentication mode) and
504   - also for all relational features (see
505   - <a href="#pmadb">$cfg['Servers'][$i]['pmadb']</a>).
  528 + all relational features
  529 + (see <a href="#pmadb">$cfg['Servers'][$i]['pmadb']</a>) and, for a
  530 + MySQL server older than 4.1.2, to enable a multi-user installation
  531 + (http or cookie authentication mode).
506 532 <br /><br />
507 533 When using HTTP or cookie authentication modes (or 'config'
508 534 authentication mode since phpMyAdmin 2.2.1), you need to supply the
@@ -521,7 +547,7 @@
521 547 privileges you gave to the &quot;controluser&quot;. phpMyAdmin does not
522 548 support a direct login with the &quot;controluser&quot;.
523 549 <br /><br />
524   - In versions before 2.2.5, those were called
  550 + In phpMyAdmin versions before 2.2.5, those were called
525 551 &quot;stduser/stdpass&quot;.
526 552 <br /><br />
527 553 </dd>
@@ -844,7 +870,7 @@
844 870 <b>$cfg['Servers'][$i]['AllowRoot']</b> boolean
845 871 </dt>
846 872 <dd>
847   - Whethet to allow root access, This is just simplification of rules bellow.
  873 + Whether to allow root access, This is just simplification of rules below.
848 874 <br /><br />
849 875 </dd>
850 876 <dt>
@@ -1713,7 +1739,8 @@
1713 1739 Determines for how large tables phpMyAdmin should get exact row count by
1714 1740 <code>SELECT COUNT</code>. If approximate row count is smaller than this
1715 1741 value, <code>SELECT COUNT</code> will be used, otherwise only value
1716   - returned by <code>SHOW TABLE STATUS</code>.
  1742 + returned by <code>SHOW TABLE STATUS</code>. This has currently an impact
  1743 + only on InnoDB tables.
1717 1744 <br /><br />
1718 1745 </dd>
1719 1746
@@ -2955,6 +2982,16 @@
2955 2982 can use it for the Edit and Delete links.
2956 2983 </p>
2957 2984
  2985 +<h4>
  2986 + [3.11] The number of records for InnoDB tables is not correct.
  2987 +</h4>
  2988 +<p>
  2989 + phpMyAdmin uses a quick method to get the row count, and this method
  2990 + only returns an approximate count in the case of InnoDB tables. See
  2991 + <tt>$cfg['MaxExactCount']</tt> for a way to modify those results, but
  2992 + this could have a serious impact on performance.
  2993 +</p>
  2994 +
2958 2995 <a name="faqmultiuser"></a><br />
2959 2996 <h3>[4. ISPs, multi-user installations ]</h3>
2960 2997
@@ -3664,11 +3701,13 @@
3664 3701 </h4>
3665 3702 <p>
3666 3703 You can either export as CSV suitable for MS Excel, which works out of the
3667   - box or you can try native <b>experimental</b> MS Excel exporter. For
3668   - enabling this you need to set $cfg['TempDir'] to place where web server
3669   - user can write (for example <tt>'./tmp'</tt>)
3670   - and install PEAR module Spreadsheet_Excel_Writer into php
3671   - include path. The installation can be done by following command:
  3704 + box or you can try native <b>experimental</b> MS Excel exporter. <b>This
  3705 + export has several problems, most important are limitation of cell content
  3706 + to 255 chars and no support for charsets, so think carefully whether you
  3707 + want to enable this.</b>. For enabling this you need to set
  3708 + $cfg['TempDir'] to place where web server user can write (for example
  3709 + <tt>'./tmp'</tt>) and install PEAR module Spreadsheet_Excel_Writer into
  3710 + php include path. The installation can be done by following command:
3672 3711 </p>
3673 3712 <pre>
3674 3713 pear -d preferred_state=beta install -a Spreadsheet_Excel_Writer
@@ -4037,7 +4076,8 @@
4037 4076
4038 4077 - Maxime Delorme &lt;delorme.maxime_at_free.fr&gt;
4039 4078 * PDF schema output, thanks also to Olivier Plathey for the
4040   - &quot;FPDF&quot; library (see http://www.fpdf.org/).
  4079 + &quot;FPDF&quot; library (see <a href="http://www.fpdf.org/">http://www.fpdf.org/</a>) and Steven Wittens
  4080 + for the &quot;UFPDF&quot; library (see <a href="http://www.acko.net/node/56">http://www.acko.net/node/56</a>).
4041 4081
4042 4082 - Olof Edlund &lt;olof.edlund_at_upright.se&gt;
4043 4083 * SQL validator server
@@ -4056,6 +4096,9 @@
4056 4096 * redesign for 2.6.0
4057 4097 * phpMyAdmin sailboat logo (June 2004)
4058 4098
  4099 +- Mathias Landh&auml;u&szlig;er
  4100 + * Representation at conferences
  4101 +
4059 4102 And also to the following people who have contributed minor changes,
4060 4103 enhancements, bugfixes or support for a new language since version 2.1.0:
4061 4104
4 README
@@ -5,7 +5,7 @@ phpMyAdmin - Readme
5 5
6 6 A set of PHP-scripts to manage MySQL over the web.
7 7
8   - Version 2.6.1-dev
  8 + Version 2.6.1-rc1
9 9 -----------------
10 10 http://www.phpmyadmin.net/
11 11
@@ -16,7 +16,7 @@ phpMyAdmin - Readme
16 16 Alexander M. Turek <me_at_derrabus.de>
17 17 Michal Cihar <michal_at_cihar.com>
18 18 Garvin Hicking <me_at_supergarv.de>
19   - Marcel Tschopp <ne0x_at_users.sourceforge.net>
  19 + Michael Keck <mkkeck_at_users.sourceforge.net>
20 20 [check Documentation.txt/.html file for more details]
21 21
22 22 This program is free software; you can redistribute it and/or modify
6 browse_foreigners.php
@@ -182,7 +182,7 @@ function dimsort($arrayA, $arrayB) {
182 182 $val = key($mysql_val_relrow[$i]);
183 183 $key = $mysql_val_relrow[$i][$val];
184 184
185   - if (strlen($val) <= $cfg['LimitChars']) {
  185 + if (PMA_strlen($val) <= $cfg['LimitChars']) {
186 186 $value = htmlspecialchars($val);
187 187 $vtitle = '';
188 188 } else {
@@ -199,12 +199,12 @@ function dimsort($arrayA, $arrayB) {
199 199 <?php
200 200 $key = key($mysql_key_relrow[$i]);
201 201 $val = $mysql_key_relrow[$i][$key];
202   - if (strlen($val) <= $cfg['LimitChars']) {
  202 + if (PMA_strlen($val) <= $cfg['LimitChars']) {
203 203 $value = htmlspecialchars($val);
204 204 $vtitle = '';
205 205 } else {
206 206 $vtitle = htmlspecialchars($val);
207   - $value = htmlspecialchars(substr($val, 0, $cfg['LimitChars']) . '...');
  207 + $value = htmlspecialchars(PMA_substr($val, 0, $cfg['LimitChars']) . '...');
208 208 }
209 209
210 210 $key_equals_data = isset($data) && $key == $data;
9 config.inc.php
@@ -342,6 +342,7 @@
342 342
343 343 $cfg['Export']['sql_structure'] = TRUE;
344 344 $cfg['Export']['sql_data'] = TRUE;
  345 +$cfg['Export']['sql_compat'] = 'NONE';
345 346 $cfg['Export']['sql_disable_fk'] = FALSE;
346 347 $cfg['Export']['sql_use_transaction'] = FALSE;
347 348 $cfg['Export']['sql_drop_database'] = FALSE;
@@ -507,12 +508,8 @@
507 508 $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.
508 509 $cfg['QueryFrameJS'] = TRUE; // whether to use JavaScript functions for opening a new window for SQL commands.
509 510 // if set to 'false', the target of the querybox is always the right frame.
510   -
511   -/* is moved to ./themes/.../layout.inc.php
512   - * bug #1050666: Query window too small darkblue/orange theme
513   - * $cfg['QueryWindowWidth'] = 550; // Width of Query window
514   - * $cfg['QueryWindowHeight'] = 310; // Height of Query window
515   -*/
  511 +$cfg['QueryWindowWidth'] = 550; // Width of Query window
  512 +$cfg['QueryWindowHeight'] = 310; // Height of Query window
516 513 $cfg['QueryHistoryDB'] = FALSE; // Set to TRUE if you want DB-based query history.
517 514 // If FALSE, this utilizes JS-routines to display
518 515 // query history (lost by window close)
16 css/phpmyadmin.css.php
@@ -20,23 +20,13 @@
20 20 $js_frame = 'left';
21 21 }
22 22
23   -// 2004-05-30: Michael Keck (mail@mnichaelkeck.de)
24   -// check, if select_theme.lib.php exists
25   -// and include it
26   -$tmp_file_lib = './libraries/select_theme.lib.php';
27   -if (@file_exists($tmp_file_lib) && isset($GLOBALS['cfg']['ThemePath']) && !empty($GLOBALS['cfg']['ThemePath'])){
28   - require_once($tmp_file_lib);
29   -}else{
30   - $pmaTheme = 'original';
31   -}
32   -
33 23 if ($js_frame == 'left') {
34 24 /************************************************************************************
35 25 * LEFT FRAME
36 26 ************************************************************************************/
37 27 // 2004-05-30: Michael Keck (mail@michaelkeck.de)
38 28 // Check, if theme_left.css.php exists and include
39   - $tmp_file = $GLOBALS['cfg']['ThemePath'] . '/' . $pmaTheme . '/css/theme_left.css.php';
  29 + $tmp_file = $GLOBALS['cfg']['ThemePath'] . '/' . $theme . '/css/theme_left.css.php';
40 30 if (@file_exists($tmp_file)) {
41 31 include($tmp_file);
42 32 } // end of include theme_left.css.php
@@ -46,7 +36,7 @@
46 36 ************************************************************************************/
47 37 // 2004-05-30: Michael Keck (mail@michaelkeck.de)
48 38 // Check, if theme_print.css.php exists and include
49   - $tmp_file = $GLOBALS['cfg']['ThemePath'] . '/' . $pmaTheme . '/css/theme_print.css.php';
  39 + $tmp_file = $GLOBALS['cfg']['ThemePath'] . '/' . $theme . '/css/theme_print.css.php';
50 40 if (@file_exists($tmp_file)) {
51 41 include($tmp_file);
52 42 } // end of include theme_print.css.php
@@ -56,7 +46,7 @@
56 46 ************************************************************************************/
57 47 // 2004-05-30: Michael Keck (mail@michaelkeck.de)
58 48 // Check, if theme_right.css.php exists and include
59   - $tmp_file = $GLOBALS['cfg']['ThemePath'] . '/' . $pmaTheme . '/css/theme_right.css.php';
  49 + $tmp_file = $GLOBALS['cfg']['ThemePath'] . '/' . $theme . '/css/theme_right.css.php';
60 50 if (@file_exists($tmp_file)) {
61 51 include($tmp_file);
62 52 } // end of include theme_right.css.php
4 db_details_structure.php
@@ -45,7 +45,7 @@ function pma_TableHeader($alternate = FALSE) {
45 45 . ' &nbsp;' . $GLOBALS['strAction'] . '&nbsp;' . "\n"
46 46 . ' </th>' . "\n"
47 47 . ' <th>' . "\n"
48   - . ' &nbsp;' . $GLOBALS['strRecords'] . '&nbsp;' . "\n"
  48 + . ' &nbsp;' . $GLOBALS['strRecords'] . PMA_showHint($GLOBALS['strApproximateCount']) . '&nbsp;' . "\n"
49 49 . ' </th>' . "\n";
50 50 if (!$alternate) {
51 51 if (!($GLOBALS['cfg']['PropertiesNumColumns'] > 1)) {
@@ -439,7 +439,7 @@ function pma_TableHeader($alternate = FALSE) {
439 439 echo ' <th align="center">' . "\n"
440 440 . ' <b>--</b>' . "\n"
441 441 . ' </th>' . "\n";
442   - if (PMA_MYSQL_INT_VERSION >= 40100) {
  442 + if (PMA_MYSQL_INT_VERSION >= 40101) {
443 443 echo ' <th align="center">' . "\n"
444 444 . ' &nbsp;<b><dfn title="' . PMA_getCollationDescr($db_collation) . '">' . $db_collation . '</dfn></b>&nbsp;' . "\n"
445 445 . ' </th>' . "\n";
2  footer.inc.php
@@ -39,7 +39,7 @@ function dbBoxSetup() {
6 lang/afrikaans-iso-8859-1.inc.php
@@ -753,4 +753,10 @@
753 753 $strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
754 754 $strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
755 755 $strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
  756 +$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
  757 +$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
  758 +$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
  759 +$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
  760 +$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
  761 +$strAfterInsertNext = 'Edit next row'; //to translate
756 762 ?>
6 lang/afrikaans-utf-8.inc.php
@@ -754,4 +754,10 @@
754 754 $strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
755 755 $strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
756 756 $strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
  757 +$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
  758 +$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
  759 +$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
  760 +$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
  761 +$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
  762 +$strAfterInsertNext = 'Edit next row'; //to translate
757 763 ?>
6 lang/albanian-iso-8859-1.inc.php
@@ -743,4 +743,10 @@
743 743 $strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
744 744 $strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
745 745 $strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
  746 +$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
  747 +$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
  748 +$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
  749 +$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
  750 +$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
  751 +$strAfterInsertNext = 'Edit next row'; //to translate
746 752 ?>
6 lang/albanian-utf-8.inc.php
@@ -744,4 +744,10 @@
744 744 $strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
745 745 $strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
746 746 $strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
  747 +$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
  748 +$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
  749 +$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
  750 +$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
  751 +$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
  752 +$strAfterInsertNext = 'Edit next row'; //to translate
747 753 ?>
6 lang/arabic-utf-8.inc.php
@@ -747,4 +747,10 @@
747 747 $strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
748 748 $strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
749 749 $strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
  750 +$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
  751 +$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
  752 +$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
  753 +$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
  754 +$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
  755 +$strAfterInsertNext = 'Edit next row'; //to translate
750 756 ?>
6 lang/arabic-windows-1256.inc.php
@@ -746,4 +746,10 @@
746 746 $strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
747 747 $strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
748 748 $strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
  749 +$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
  750 +$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
  751 +$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
  752 +$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
  753 +$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
  754 +$strAfterInsertNext = 'Edit next row'; //to translate
749 755 ?>
6 lang/azerbaijani-iso-8859-9.inc.php
@@ -742,4 +742,10 @@
742 742 $strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
743 743 $strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
744 744 $strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
  745 +$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
  746 +$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
  747 +$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
  748 +$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
  749 +$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
  750 +$strAfterInsertNext = 'Edit next row'; //to translate
745 751 ?>
6 lang/azerbaijani-utf-8.inc.php
@@ -743,4 +743,10 @@
743 743 $strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
744 744 $strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
745 745 $strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
  746 +$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
  747 +$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
  748 +$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
  749 +$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
  750 +$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
  751 +$strAfterInsertNext = 'Edit next row'; //to translate
746 752 ?>
6 lang/basque-iso-8859-1.inc.php
@@ -745,4 +745,10 @@
745 745 $strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
746 746 $strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
747 747 $strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
  748 +$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
  749 +$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
  750 +$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
  751 +$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
  752 +$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
  753 +$strAfterInsertNext = 'Edit next row'; //to translate
748 754 ?>
6 lang/basque-utf-8.inc.php
@@ -746,4 +746,10 @@
746 746 $strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
747 747 $strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
748 748 $strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
  749 +$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
  750 +$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
  751 +$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
  752 +$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
  753 +$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
  754 +$strAfterInsertNext = 'Edit next row'; //to translate
749 755 ?>
6 lang/bosnian-utf-8.inc.php
@@ -752,4 +752,10 @@
752 752 $strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
753 753 $strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
754 754 $strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
  755 +$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
  756 +$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
  757 +$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
  758 +$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
  759 +$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
  760 +$strAfterInsertNext = 'Edit next row'; //to translate
755 761 ?>
6 lang/bosnian-windows-1250.inc.php
@@ -751,4 +751,10 @@
751 751 $strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
752 752 $strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
753 753 $strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
  754 +$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
  755 +$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
  756 +$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
  757 +$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
  758 +$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
  759 +$strAfterInsertNext = 'Edit next row'; //to translate
754 760 ?>
6 lang/brazilian_portuguese-iso-8859-1.inc.php
@@ -767,4 +767,10 @@
767 767 $strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
768 768 $strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
769 769 $strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
  770 +$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
  771 +$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
  772 +$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
  773 +$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
  774 +$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
  775 +$strAfterInsertNext = 'Edit next row'; //to translate
770 776 ?>
6 lang/brazilian_portuguese-utf-8.inc.php
@@ -768,4 +768,10 @@
768 768 $strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
769 769 $strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
770 770 $strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
  771 +$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
  772 +$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
  773 +$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
  774 +$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
  775 +$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
  776 +$strAfterInsertNext = 'Edit next row'; //to translate
771 777 ?>
6 lang/bulgarian-koi8-r.inc.php
@@ -752,4 +752,10 @@
752 752 $strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
753 753 $strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
754 754 $strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
  755 +$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
  756 +$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
  757 +$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
  758 +$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
  759 +$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
  760 +$strAfterInsertNext = 'Edit next row'; //to translate
755 761 ?>
6 lang/bulgarian-utf-8.inc.php
@@ -753,4 +753,10 @@
753 753 $strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
754 754 $strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
755 755 $strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
  756 +$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
  757 +$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
  758 +$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
  759 +$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
  760 +$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
  761 +$strAfterInsertNext = 'Edit next row'; //to translate
756 762 ?>
6 lang/bulgarian-windows-1251.inc.php
@@ -752,4 +752,10 @@
752 752 $strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
753 753 $strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
754 754 $strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
  755 +$strNoActivity = 'No activity since %s seconds or more, please login again'; //to translate
  756 +$strApproximateCount = 'May be approximate. See FAQ 3.11'; //to translate
  757 +$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
  758 +$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
  759 +$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
  760 +$strAfterInsertNext = 'Edit next row'; //to translate
755 761 ?>
50 lang/catalan-iso-8859-1.inc.php
@@ -28,6 +28,7 @@
28 28 $strAddDeleteColumn = 'Afegir/esborrar Camps de Columna';
29 29 $strAddDeleteRow = 'Afegir/esborrar fila de criteri';
30 30 $strAddDropDatabase = 'Afegir DROP DATABASE';
  31 +$strAddFields = 'Afegir %s camp(s)';
31 32 $strAddHeaderComment = 'Afegir comentari personalitzat a la cap�alera (\\n divideix linies)';
32 33 $strAddIfNotExists = 'Afegir IF NOT EXISTS';
33 34 $strAddIntoComments = 'Afegir en comentaris';
@@ -55,6 +56,7 @@
55 56 $strAny = 'Qualsevol';
56 57 $strAnyHost = 'Qualsevol servidor';
57 58 $strAnyUser = 'Qualsevol usuari';
  59 +$strApproximateCount = 'Pot ser aproximat. Veure FAQ 3.11';
58 60 $strArabic = '�rab';
59 61 $strArmenian = 'Armeni';
60 62 $strAscending = 'Ascendent';
@@ -68,8 +70,15 @@
68 70 $strBaltic = 'B�ltic';
69 71 $strBeginCut = 'INICI DEL TALL';
70 72 $strBeginRaw = 'INICI DEL VOLCAT';
  73 +$strBinLogEventType = 'Tipus d\'event';
  74 +$strBinLogInfo = 'Informaci�';
  75 +$strBinLogName = 'Nom del registre';
  76 +$strBinLogOriginalPosition = 'Posici� original';
  77 +$strBinLogPosition = 'Posici�';
  78 +$strBinLogServerId = 'ID de Servidor';
71 79 $strBinary = ' Binari ';
72 80 $strBinaryDoNotEdit = ' Binari - no editeu ';
  81 +$strBinaryLog = 'Registre binari';
73 82 $strBookmarkAllUsers = 'Deixa accedir a cada usuari a aquesta consulta arxivada';
74 83 $strBookmarkDeleted = 'S\'ha esborrat la consulta arxivada.';
75 84 $strBookmarkLabel = 'Etiqueta';
@@ -121,6 +130,7 @@
121 130 $strCommand = 'Ordre';
122 131 $strComments = 'Comentaris';
123 132 $strCommentsForTable = 'COMENTARIS PER LA TAULA';
  133 +$strCompatibleHashing = 'Compatible amb MySQL&nbsp;4.0';
124 134 $strCompleteInserts = 'Completar insercions';
125 135 $strCompression = 'Compressi�';
126 136 $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 @@
130 140 $strConstraintsForDumped = 'Restriccions per taules volcades';
131 141 $strConstraintsForTable = 'Restriccions per la taula';
132 142 $strCookiesRequired = 'A partir d\'aquest punt �s necessari tenir les galetes (cookies) activades.';
  143 +$strCopyDatabaseOK = 'La Base de dades %s s\'ha copiat a %s';
133 144 $strCopyTable = 'Copia taula a (base-de-dades<b>.</b>taula):';
134 145 $strCopyTableOK = 'La taula %s ha estat copiada a %s.';
135 146 $strCopyTableSameNames = 'No es pot copiar la taula sobre ella mateixa';
@@ -149,6 +160,7 @@
149 160 $strCzechSlovak = 'Txec-Eslovac';
150 161
151 162 $strDBComment = 'Comentaris de la Base de Dades: ';
  163 +$strDBCopy = 'Copiar base de dades a';
152 164 $strDBGContext = 'Contexte';
153 165 $strDBGContextID = 'ID de contexte';
154 166 $strDBGHits = 'Accessos';
@@ -221,6 +233,7 @@
221 233 $strEnglish = 'Angl�s';
222 234 $strEnglishPrivileges = ' Nota: Els noms dels privilegis del MySQL s�n en llengua anglesa ';
223 235 $strError = 'Errada';
  236 +$strEscapeWildcards = 'Els comodins _ i % han de marcar-se amb una \ per usar-las literalment';
224 237 $strEstonian = 'Estoni� ';
225 238 $strExcelEdition = 'Edici� per Excel';
226 239 $strExcelOptions = 'Opcions d\'Excel';
@@ -290,11 +303,16 @@
290 303 $strIndexHasBeenDropped = 'S\'ha esborrat l\'�ndex %s';
291 304 $strIndexName = 'Nom d\'�ndex:';
292 305 $strIndexType = 'Tipus d\'�ndex:';
  306 +$strIndexWarningMultiple = 'M�s d\'una clau %s s\'ha creat per a la columna `%s`';
  307 +$strIndexWarningPrimary = 'Les claus PRIMARY i INDEX no es poden establir alhora per a la columna `%s`';
  308 +$strIndexWarningTable = 'Problemes amb els index de la taula `%s`';
  309 +$strIndexWarningUnique = 'Les claus UNIQUE i INDEX no es poden establir alhora per a la columna `%s`';
293 310 $strIndexes = 'Indexos';
294 311 $strInnodbStat = 'Estat InnoDB';
295 312 $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.';
296 313 $strInsert = 'Insereix';
297 314 $strInsertAsNewRow = 'Inserir com a nova fila';
  315 +$strInsertBookmarkTitle = 'Entra un t�tol de consulta arxivada';
298 316 $strInsertNewRow = 'Inserir nova fila';
299 317 $strInsertTextfiles = 'Inserir fitxers de text a la taula';
300 318 $strInsertedRowId = 'Id de la fila inserida:';
@@ -376,6 +394,7 @@
376 394 $strNeedPrimaryKey = 'S\'ha de definir una clau principal per a aquesta taula.';
377 395 $strNext = 'Seg�ent';
378 396 $strNo = 'No';
  397 +$strNoActivity = 'Sense activitat des de fa %s segons o m�s, entra de nou';
379 398 $strNoDatabases = 'No hi ha Bases de Dades';
380 399 $strNoDatabasesSelected = 'No hi han Bases de dades sel.leccionades.';
381 400 $strNoDescription = 'Sense Descripci�';
@@ -395,6 +414,7 @@
395 414 $strNoRowsSelected = 'No s\'han seleccionat files';
396 415 $strNoSpace = 'No hi ha prou espai per guardar l\'arxiu %s.';
397 416 $strNoTablesFound = 'Base de dades sense taules.';
  417 +$strNoThemeSupport = 'No hi ha suport pels temes, si et plau comprova la teva configuraci� i/o els teus temes al directori %s.';
398 418 $strNoUsersFound = 'No s\'han trobat usuaris.';
399 419 $strNoValidateSQL = 'Saltar la Validaci� de l\'SQL';
400 420 $strNone = 'Res';
@@ -426,6 +446,7 @@
426 446 $strPassword = 'Contrasenya';
427 447 $strPasswordChanged = 'La contrasenya per a %s s\'ha canviat correctament.';
428 448 $strPasswordEmpty = 'La contrasenya �s buida!';
  449 +$strPasswordHashing = 'Contrasenya Hashing';
429 450 $strPasswordNotSame = 'Les contrasenyes no coincideixen!';
430 451 $strPdfDbSchema = 'Esquema de la base de dades "%s" - P�gina %s';
431 452 $strPdfInvalidTblName = 'La taula "%s" no existeix!';
@@ -562,6 +583,7 @@
562 583 $strSecretRequired = 'El fitxer de configuraci� necessita ara una frase de pas secreta (blowfish_secret).';
563 584 $strSelectADb = 'Selecciona una Base de Dades';
564 585 $strSelectAll = 'Selecciona Tot';
  586 +$strSelectBinaryLog = 'Selecciona el registre binari per veure';
565 587 $strSelectFields = 'Selecciona els camps (un com a m�nim):';
566 588 $strSelectNumRows = 'en consulta';
567 589 $strSelectTables = 'Selecciona Taules';
@@ -617,6 +639,7 @@
617 639 $strSuccess = 'La vostra comanda SQL ha estat executada amb �xit';
618 640 $strSum = 'Suma';
619 641 $strSwedish = 'Suec';
  642 +$strSwitchToDatabase = 'Canviar a la base de dades copiada';
620 643 $strSwitchToTable = 'Canvia a una taula copiada';
621 644
622 645 $strTable = 'Taula';
@@ -678,6 +701,7 @@
678 701 $strUsage = '�s';
679 702 $strUseBackquotes = 'Usa &quot;backquotes&quot; amb taules i noms de camps';
680 703 $strUseHostTable = 'Utilitza la Taula de Hosts';
  704 +$strUseTabKey = 'Usa la tecla TAB per moure\'t de valor en valor, o CTRL+fletxes per moure\'t on vulguis';
681 705 $strUseTables = 'Usa Taules';
682 706 $strUseTextField = 'Usa camp de texte';
683 707 $strUseThisValue = 'Fes servir aquest valor';
@@ -716,26 +740,8 @@
716 740 $strZeroRemovesTheLimit = 'Nota: Establint aquestes opcions a 0 (zero) treu el limit.';
717 741 $strZip = '"comprimit amb zip"';
718 742
719   -$strAddFields = 'Add %s field(s)'; //to translate
720   -$strInsertBookmarkTitle = 'Please insert bookmark title'; //to translate
721   -$strNoThemeSupport = 'No themes support, please check your configuration and/or your themes in directory %s.'; //to translate
722   -$strUseTabKey = 'Use TAB key to move from value to value, or CTRL+arrows to move anywhere'; //to translate
723   -$strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; //to translate
724   -$strBinLogName = 'Log name'; //to translate
725   -$strBinLogPosition = 'Position'; //to translate
726   -$strBinLogEventType = 'Event type'; //to translate
727   -$strBinLogServerId = 'Server ID'; //to translate
728   -$strBinLogOriginalPosition = 'Original position'; //to translate
729   -$strBinLogInfo = 'Information'; //to translate
730   -$strBinaryLog = 'Binary log'; //to translate
731   -$strSelectBinaryLog = 'Select binary log to view'; //to translate
732   -$strDBCopy = 'Copy database to'; //to translate
733   -$strCopyDatabaseOK = 'Database %s has been copied to %s'; //to translate
734   -$strSwitchToDatabase = 'Switch to copied database'; //to translate
735   -$strPasswordHashing = 'Password Hashing'; //to translate
736   -$strCompatibleHashing = 'MySQL&nbsp;4.0 compatible'; //to translate
737   -$strIndexWarningPrimary = 'PRIMARY and INDEX keys should not both be set for column `%s`';//to translate
738   -$strIndexWarningUnique = 'UNIQUE and INDEX keys should not both be set for column `%s`';//to translate
739   -$strIndexWarningMultiple = 'More than one %s key was created for column `%s`';//to translate
740   -$strIndexWarningTable = 'Problems with indexes of table `%s`';//to translate
  743 +$strSQLExportCompatibility = 'SQL export compatibility'; //to translate
  744 +$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
  745 +$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
  746 +$strAfterInsertNext = 'Edit next row'; //to translate
741 747 ?>
50 lang/catalan-utf-8.inc.php
@@ -29,6 +29,7 @@
29 29 $strAddDeleteColumn = 'Afegir/esborrar Camps de Columna';
30 30 $strAddDeleteRow = 'Afegir/esborrar fila de criteri';
31 31 $strAddDropDatabase = 'Afegir DROP DATABASE';
  32 +$strAddFields = 'Afegir %s camp(s)';
32 33 $strAddHeaderComment = 'Afegir comentari personalitzat a la capçalera (\\n divideix linies)';
33 34 $strAddIfNotExists = 'Afegir IF NOT EXISTS';
34 35 $strAddIntoComments = 'Afegir en comentaris';
@@ -56,6 +57,7 @@
56 57 $strAny = 'Qualsevol';
57 58 $strAnyHost = 'Qualsevol servidor';
58 59 $strAnyUser = 'Qualsevol usuari';
  60 +$strApproximateCount = 'Pot ser aproximat. Veure FAQ 3.11';
59 61 $strArabic = 'Àrab';
60 62 $strArmenian = 'Armeni';
61 63 $strAscending = 'Ascendent';
@@ -69,8 +71,15 @@
69 71 $strBaltic = 'Bàltic';
70 72 $strBeginCut = 'INICI DEL TALL';
71 73 $strBeginRaw = 'INICI DEL VOLCAT';
  74 +$strBinLogEventType = 'Tipus d\'event';
  75 +$strBinLogInfo = 'Informació';
  76 +$strBinLogName = 'Nom del registre';
  77 +$strBinLogOriginalPosition = 'Posició original';
  78 +$strBinLogPosition = 'Posició';
  79 +$strBinLogServerId = 'ID de Servidor';
72 80 $strBinary = ' Binari ';
73 81 $strBinaryDoNotEdit = ' Binari - no editeu ';
  82 +$strBinaryLog = 'Registre binari';
74 83 $strBookmarkAllUsers = 'Deixa accedir a cada usuari a aquesta consulta arxivada';
75 84 $strBookmarkDeleted = 'S\'ha esborrat la consulta arxivada.';
76 85 $strBookmarkLabel = 'Etiqueta';
@@ -122,6 +131,7 @@
122 131 $strCommand = 'Ordre';
123 132 $strComments = 'Comentaris';
124 133 $strCommentsForTable = 'COMENTARIS PER LA TAULA';
  134 +$strCompatibleHashing = 'Compatible amb MySQL&nbsp;4.0';
125 135 $strCompleteInserts = 'Completar insercions';
126 136 $strCompression = 'Compressió';
127 137 $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 @@
131 141 $strConstraintsForDumped = 'Restriccions per taules volcades';
132 142 $strConstraintsForTable = 'Restriccions per la taula';
133 143 $strCookiesRequired = 'A partir d\'aquest punt és necessari tenir les galetes (cookies) activades.';
  144 +$strCopyDatabaseOK = 'La Base de dades %s s\'ha copiat a %s';
134 145 $strCopyTable = 'Copia taula a (base-de-dades<b>.</b>taula):';
135 146 $strCopyTableOK = 'La taula %s ha estat copiada a %s.';
136 147 $strCopyTableSameNames = 'No es pot copiar la taula sobre ella mateixa';
@@ -150,6 +161,7 @@
150 161 $strCzechSlovak = 'Txec-Eslovac';
151 162
152 163 $strDBComment = 'Comentaris de la Base de Dades: ';
  164 +$strDBCopy = 'Copiar base de dades a';
153 165 $strDBGContext = 'Contexte';
154 166 $strDBGContextID = 'ID de contexte';
155 167 $strDBGHits = 'Accessos';
@@ -222,6 +234,7 @@
222 234 $strEnglish = 'Anglès';
223 235 $strEnglishPrivileges = ' Nota: Els noms dels privilegis del MySQL són en llengua anglesa ';
224 236 $strError = 'Errada';
  237 +$strEscapeWildcards = 'Els comodins _ i % han de marcar-se amb una \ per usar-las literalment';
225 238 $strEstonian = 'Estonià ';
226 239 $strExcelEdition = 'Edició per Excel';
227 240 $strExcelOptions = 'Opcions d\'Excel';
@@ -291,11 +304,16 @@
291 304 $strIndexHasBeenDropped = 'S\'ha esborrat l\'índex %s';
292 305 $strIndexName = 'Nom d\'índex:';
293 306 $strIndexType = 'Tipus d\'índex:';
  307 +$strIndexWarningMultiple = 'Més d\'una clau %s s\'ha creat per a la columna `%s`';
  308 +$strIndexWarningPrimary = 'Les claus PRIMARY i INDEX no es poden establir alhora per a la columna `%s`';
  309 +$strIndexWarningTable = 'Problemes amb els index de la taula `%s`';
  310 +$strIndexWarningUnique = 'Les claus UNIQUE i INDEX no es poden establir alhora per a la columna `%s`';
294 311 $strIndexes = 'Indexos';
295 312 $strInnodbStat = 'Estat InnoDB';
296 313 $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.';
297 314 $strInsert = 'Insereix';
298 315 $strInsertAsNewRow = 'Inserir com a nova fila';
  316 +$strInsertBookmarkTitle = 'Entra un títol de consulta arxivada';
299 317 $strInsertNewRow = 'Inserir nova fila';
300 318 $strInsertTextfiles = 'Inserir fitxers de text a la taula';
301 319 $strInsertedRowId = 'Id de la fila inserida:';
@@ -377,6 +395,7 @@
377 395 $strNeedPrimaryKey = 'S\'ha de definir una clau principal per a aquesta taula.';
378 396 $strNext = 'Següent';
379 397 $strNo = 'No';
  398 +$strNoActivity = 'Sense activitat des de fa %s segons o més, entra de nou';
380 399 $strNoDatabases = 'No hi ha Bases de Dades';
381 400 $strNoDatabasesSelected = 'No hi han Bases de dades sel.leccionades.';
382 401 $strNoDescription = 'Sense Descripció';
@@ -396,6 +415,7 @@
396 415 $strNoRowsSelected = 'No s\'han seleccionat files';
397 416 $strNoSpace = 'No hi ha prou espai per guardar l\'arxiu %s.';
398 417 $strNoTablesFound = 'Base de dades sense taules.';
  418 +$strNoThemeSupport = 'No hi ha suport pels temes, si et plau comprova la teva configuració i/o els teus temes al directori %s.';
399 419 $strNoUsersFound = 'No s\'han trobat usuaris.';
400 420 $strNoValidateSQL = 'Saltar la Validació de l\'SQL';
401 421 $strNone = 'Res';
@@ -427,6 +447,7 @@
427 447 $strPassword = 'Contrasenya';
428 448 $strPasswordChanged = 'La contrasenya per a %s s\'ha canviat correctament.';
429 449 $strPasswordEmpty = 'La contrasenya és buida!';
  450 +$strPasswordHashing = 'Contrasenya Hashing';
430 451 $strPasswordNotSame = 'Les contrasenyes no coincideixen!';
431 452 $strPdfDbSchema = 'Esquema de la base de dades "%s" - Pàgina %s';
432 453 $strPdfInvalidTblName = 'La taula "%s" no existeix!';
@@ -563,6 +584,7 @@
563 584 $strSecretRequired = 'El fitxer de configuració necessita ara una frase de pas secreta (blowfish_secret).';
564 585 $strSelectADb = 'Selecciona una Base de Dades';
565 586 $strSelectAll = 'Selecciona Tot';
  587 +$strSelectBinaryLog = 'Selecciona el registre binari per veure';
566