gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source 
Signed-off-by: Marc Delisle <marc@infomarc.info>
This commit is contained in:
Marc Delisle 2014-04-21 16:12:35 -04:00
commit 8ef6a0fac0
6 changed files with 68 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -4,6 +4,8 @@ phpMyAdmin - ChangeLog
4.1.14.0 (not yet released)
- bug #4365 Creating bookmark with multiple queries not working
- bug #4372 Changing browser transformation results in unnecessary table rebuild
- bug #4375 Group two DB, one's name is the prefix of the other one
- bug #4376 [interface] Login fields show in separate line
4.1.13.0 (2014-04-13)
- bug #4279 CTRL + up or down moves 2 fields
@ -14,9 +16,9 @@ phpMyAdmin - ChangeLog
- bug #4353 makeProfilingChart is not defined
- bug #4355 Precision specifier for DOUBLE type is truncated
- bug #4346 Incorrect "Export incomplete" message
- bug #4359 Notices on create table page
- bug #4359 Notices on create table page
- bug #4356 GROUPed selects show number of rows as if not grouped
- bug #4357 JS Form submitted on "enter" even if focus is inside a select field
- bug #4357 JS Form submitted on "enter" even if focus is inside a select field
4.1.12.0 (2014-03-27)
- bug #4334 Add event : datepicker won't open
@ -25,7 +27,7 @@ phpMyAdmin - ChangeLog
- bug #4326 Cannot find the import plugins which start with uppercase 'I'
4.1.11.0 (2014-03-23)
- bug #4335 reCaptcha problem (4.1.10 regression)
- bug #4335 reCaptcha problem (4.1.10 regression)
4.1.10.0 (2014-03-22)
- bug #4301 Grid edit: "SELECT" query is replaced by "UPDATE" query after edit
@ -33,11 +35,11 @@ phpMyAdmin - ChangeLog
- bug #4324 Datepicker not showing up on insert page
- bug #3991 Problem selecting item in select boxes with the ENTER keystroke in some browsers
- bug #4323 QueryWindow ignores CodeMirror
- bug None of the live charts shown on "Status -> Monitor" (Chrome)
- bug None of the live charts shown on "Status -> Monitor" (Chrome)
4.1.9.0 (2014-03-06)
- bug #4279 CTRL + up or down moves two fields (part one)
- bug #4294 output as text radio clickable for "OpenDocument Text" export
- bug #4294 output as text radio clickable for "OpenDocument Text" export
- bug #4297 DROP DATABASE tick box in export no longer works
- bug #4291 Unable to export comments in OpenDocument text format
- bug #4299 Deletion even when the user says "No" to the confirmation message
@ -63,7 +65,7 @@ phpMyAdmin - ChangeLog
- Fixed altering table to DOUBLE/FLOAT field
- bug #4292 Success message and failure message being shown together
- bug #4293 opening new tab (using selflink) for import.php based actions
results in error and logout
results in error and logout
4.1.7.0 (2014-02-09)
- bug #4245 initial Browse query does not match sorting order

6
libraries/navigation/NavigationTree.class.php
View File

@ -557,6 +557,12 @@ class PMA_NavigationTree
}
}
}
//Bug #4375: Check if prefix is the name of a DB, to create a group.
foreach ($node->children as $child) {
if (array_key_exists($child->name, $prefixes)) {
$prefixes[$child->name]++;
}
}
}
foreach ($prefixes as $key => $value) {
if ($value == 1) {

34
po/ia.po
View File

@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.1.13-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2014-03-27 13:53+0100\n"
"PO-Revision-Date: 2014-04-09 17:00+0200\n"
"PO-Revision-Date: 2014-04-20 19:15+0200\n"
"Last-Translator: Giovanni Sora <g.sora@tiscali.it>\n"
"Language-Team: Interlingua "
"<https://l10n.cihar.com/projects/phpmyadmin/4-1/ia/>\n"
@ -5743,7 +5743,7 @@ msgstr ""
#: libraries/config/messages.inc.php:362
msgid "Recoding engine"
msgstr ""
msgstr "Motor de recodificar"
#: libraries/config/messages.inc.php:363
msgid "When browsing tables, the sorting of each table is remembered"
@ -5763,11 +5763,11 @@ msgstr "Repite capites"
#: libraries/config/messages.inc.php:368
msgid "Grid editing: trigger action"
msgstr ""
msgstr "Action discatenante modifica de grillia"
#: libraries/config/messages.inc.php:369
msgid "Grid editing: save all edited cells at once"
msgstr ""
msgstr "Modification de grillia: salveguarda omne cellas modificate in un vice"
#: libraries/config/messages.inc.php:370
msgid "Directory where exports can be saved on server"
@ -5775,7 +5775,7 @@ msgstr ""
#: libraries/config/messages.inc.php:371
msgid "Save directory"
msgstr ""
msgstr "Salveguarda dossier"
#: libraries/config/messages.inc.php:372
msgid "Leave blank if not used"
@ -5783,7 +5783,7 @@ msgstr ""
#: libraries/config/messages.inc.php:373
msgid "Host authorization order"
msgstr ""
msgstr "Ordine de autorisation o permission de hospite"
#: libraries/config/messages.inc.php:374
msgid "Leave blank for defaults"
@ -5791,15 +5791,15 @@ msgstr ""
#: libraries/config/messages.inc.php:375
msgid "Host authorization rules"
msgstr ""
msgstr "Regulas de autorisation o permission de hospite"
#: libraries/config/messages.inc.php:376
msgid "Allow logins without a password"
msgstr ""
msgstr "Permitte accessos sin un contrasigno"
#: libraries/config/messages.inc.php:377
msgid "Allow root login"
msgstr ""
msgstr "Permitte accesso de nivello root (radice)"
#: libraries/config/messages.inc.php:378
msgid "HTTP Basic Auth Realm name to display when doing HTTP Auth"
@ -5818,7 +5818,7 @@ msgstr ""
#: libraries/config/messages.inc.php:381
msgid "SweKey config file"
msgstr ""
msgstr "File de configuration de SweKey"
#: libraries/config/messages.inc.php:382
msgid "Authentication method to use"
@ -5826,7 +5826,7 @@ msgstr ""
#: libraries/config/messages.inc.php:383 setup/frames/index.inc.php:160
msgid "Authentication type"
msgstr ""
msgstr "Typo de authentication"
#: libraries/config/messages.inc.php:384
msgid ""
@ -5838,7 +5838,7 @@ msgstr ""
#: libraries/config/messages.inc.php:385
msgid "Bookmark table"
msgstr ""
msgstr "Tabella de marcatores de libro"
#: libraries/config/messages.inc.php:386
msgid ""
@ -5848,7 +5848,7 @@ msgstr ""
#: libraries/config/messages.inc.php:387
msgid "Column information table"
msgstr ""
msgstr "Tabella de information de columna"
#: libraries/config/messages.inc.php:388
msgid "Compress connection to MySQL server"
@ -5856,7 +5856,7 @@ msgstr ""
#: libraries/config/messages.inc.php:389
msgid "Compress connection"
msgstr ""
msgstr "Comprime connexion"
#: libraries/config/messages.inc.php:390
msgid "How to connect to server, keep [kbd]tcp[/kbd] if unsure"
@ -5864,11 +5864,11 @@ msgstr ""
#: libraries/config/messages.inc.php:391
msgid "Connection type"
msgstr ""
msgstr "Typo de connexion"
#: libraries/config/messages.inc.php:392
msgid "Control user password"
msgstr ""
msgstr "Contrasigno de usator de controlo"
#: libraries/config/messages.inc.php:393
msgid ""
@ -5878,7 +5878,7 @@ msgstr ""
#: libraries/config/messages.inc.php:394
msgid "Control user"
msgstr ""
msgstr "Usator de controlo"
#: libraries/config/messages.inc.php:395
msgid ""

32
po/ko.po
View File

@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.1.13-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2014-03-27 13:53+0100\n"
"PO-Revision-Date: 2014-04-17 05:23+0200\n"
"Last-Translator: Jun-seong Lee <acu.pe.kr@gmail.com>\n"
"PO-Revision-Date: 2014-04-19 15:04+0200\n"
"Last-Translator: Yungu Kim <crimsonpi@gmail.com>\n"
"Language-Team: Korean <https://l10n.cihar.com/projects/phpmyadmin/4-1/ko/>\n"
"Language: ko\n"
"MIME-Version: 1.0\n"
@ -8380,6 +8380,8 @@ msgid ""
"&nbsp; &nbsp; Example: <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES "
"(1,2,3)</code>"
msgstr ""
"모든 <code>INSERT</code> 구문에 컬럼 이름을 포함<br />&nbsp; &nbsp; &nbsp;예: <code>"
"INSERT INTO tbl_name (col_A,col_B,col_C) VALUES (1,2,3)</code>"
#: libraries/plugins/export/ExportSql.class.php:377
msgid ""
@ -8387,18 +8389,24 @@ msgid ""
"&nbsp; &nbsp; Example: <code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), "
"(7,8,9)</code>"
msgstr ""
"모든 <code>INSERT</code> 구문에 여러개의 행을 삽입<br />&nbsp; &nbsp; &nbsp; 예:<code>"
"INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), (7,8,9)</code>"
#: libraries/plugins/export/ExportSql.class.php:382
msgid ""
"both of the above<br /> &nbsp; &nbsp; &nbsp; Example: <code>INSERT INTO "
"tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>"
msgstr ""
"위의 것 둘 다<br /> &nbsp; &nbsp; &nbsp; 예: <code>INSERT INTO tbl_name "
"(col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>"
#: libraries/plugins/export/ExportSql.class.php:387
msgid ""
"neither of the above<br /> &nbsp; &nbsp; &nbsp; Example: <code>INSERT INTO "
"tbl_name VALUES (1,2,3)</code>"
msgstr ""
"위의 것 둘 다 안 함<br /> &nbsp; &nbsp; &nbsp; 예: <code>INSERT INTO tbl_name VALUES "
"(1,2,3)</code>"
#: libraries/plugins/export/ExportSql.class.php:406
msgid ""
@ -12739,6 +12747,8 @@ msgid ""
"%sLogin cookie validity%s greater than %ssession.gc_maxlifetime%s may cause "
"random session invalidation (currently session.gc_maxlifetime is %d)."
msgstr ""
"%ssession.gc_maxlifetime%s보다 큰 %sLogin cookie validity%s은 불규칙적으로 세션 파기를 유발할 "
"수 있습니다(현재 session.gc_maxlifetime은 %d)."
#: setup/lib/index.lib.php:257
#, php-format
@ -12746,6 +12756,8 @@ msgid ""
"%sLogin cookie validity%s should be set to 1800 seconds (30 minutes) at "
"most. Values larger than 1800 may pose a security risk such as impersonation."
msgstr ""
"%sLogin cookie validity%s은 1800초(30분) 이하로 설정되어야 합니다.. 1800 초과시 인증 속이기 등의 보안 "
"위험에 노출될 수 있습니다."
#: setup/lib/index.lib.php:263
#, php-format
@ -12762,6 +12774,9 @@ msgid ""
"protection may not be reliable if your IP belongs to an ISP where thousands "
"of users, including you, are connected to."
msgstr ""
"만약 이것이 필요하다고 느낀다면, 추가적인 보안 설정을 하세요 - %shost authentication%s 설정과 %strusted "
"proxies list%s. 하지만 IP 기반 보안은, 당신이 수천명의 사용자와 함께 쓰는 IP 대역을 사용할경우 그다지 안전하지 "
"않습니다."
#: setup/lib/index.lib.php:278
#, php-format
@ -12772,6 +12787,9 @@ msgid ""
"phpMyAdmin panel. Set %sauthentication type%s to [kbd]cookie[/kbd] or "
"[kbd]http[/kbd]."
msgstr ""
"[kbd]config[/kbd] 권한 타입 설정에 자동 로그인을 위해 사용자명과 암호를 포함했습니다. 이 설정은 실서비스용으로는 권장하지 "
"않습니다. 누군가가 phpMyAdmin이 설치된 주소를 추측하고 접속하여 phpMyAdmin 패널을 건드릴 수 있습니다. %"
"sauthentication type%s을 [kbd]cookie[/kbd]나 [kbd]http[/kbd]로 설정하세요."
#: setup/lib/index.lib.php:284
#, php-format
@ -12785,7 +12803,7 @@ msgstr "%sZip 압축%s을 하기 위한 함수 %s가 현재 시스템에서 사
msgid ""
"%sZip decompression%s requires functions (%s) which are unavailable on this "
"system."
msgstr ""
msgstr "%sZip decompression%s 기능은 (%s) 기능이 필요한데, 현재 시스템에서 사용할수 없습니다."
#: setup/lib/index.lib.php:324
msgid "You should use SSL connections if your database server supports it."
@ -14040,6 +14058,12 @@ msgid ""
"\"http://www.mysqlperformanceblog.com/2007/11/03/choosing-"
"innodb_buffer_pool_size/\">this article</a>"
msgstr ""
"InnoDB 버퍼 풀은 InnoDB 테이블의 성능에 심각한 영향을 줍니다. 남은 메모리 전체를 이 버퍼에 할당하십시오. 이 서버에 "
"InnoDB를 스토리지 엔진으로만 사용하고, 다른 서비스(예: 웹 서버)가 없다면, 이 값을 사용가능한 메모리의 80%% 정도로 높게 "
"설정하는 것도 괜찮습니다. 그런 상황이 아니라면, 다른 서비스 및 InnoDB가 아닌 테이블들의 메모리 사용량을 신중히 가늠하여 이 값을 "
"설정하세요. 만약 이 값을 너무 높게 설정하면, 시스템은 스와핑을 하게 되고, 성능이 급격하게 떨어집니다. <a href=\""
"http://www.mysqlperformanceblog.com/2007/11/03/choosing-"
"innodb_buffer_pool_size/\">이 글</a> 또한 참고하세요"
#: libraries/advisory_rules.txt:455
#, php-format
@ -14049,6 +14073,8 @@ msgid ""
"perfectly adequate for your system if you don't have much InnoDB tables or "
"other services running on the same machine."
msgstr ""
"현재, InnoDB 버퍼 풀에 할당된 메모리의 %s%%를 사용하고 있습니다. 60%%이하를 할당했다면 이 규칙이 실행됩니다. 단, "
"InnoDB 테이블이 많이 없거나, 다른 서비스가 현재 서버에 실행중일 경우에는 이 값이 매우 적절할 수 있습니다."
#: libraries/advisory_rules.txt:459
msgid "MyISAM concurrent inserts"

5
po/ta.po
View File

@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.1.13-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2014-03-27 13:53+0100\n"
"PO-Revision-Date: 2014-04-21 00:00+0200\n"
"PO-Revision-Date: 2014-04-21 09:04+0200\n"
"Last-Translator: ganeshkumar <GANESHTHEONE@gmail.com>\n"
"Language-Team: Tamil <https://l10n.cihar.com/projects/phpmyadmin/4-1/ta/>\n"
"Language: ta\n"
@ -1300,10 +1300,9 @@ msgid "The database name is not known for this query in the server's logs."
msgstr ""
#: js/messages.php:164
#, fuzzy
#| msgid "Loading logs"
msgid "Analysing logs"
msgstr "பதிகைகள் ஏற்றப்படுகின்றது"
msgstr "பதிகைகளை பகுத்தாராய்கிறது"
#: js/messages.php:165
msgid "Analysing & loading logs. This may take a while."

6
themes/pmahomme/css/common.css.php
View File

@ -796,6 +796,12 @@ form.login label {
font-weight: bolder;
}
form.login input[type=text],
form.login input[type=password],
form.login select {
width: 14em;
}
.commented_column {
border-bottom: 1px dashed #000;
}