- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2083-g5cb5afe
by Michal Čihař 26 Apr '10

26 Apr '10

The branch, master has been updated via 5cb5afedbb580fd5e13c018a63e71be076e5ca16 (commit) via f97fafea3dc55ba9a98a10fba1787c3cea4b953e (commit) from a9bfc2cd5b14561477689003c47d6972d4d49f4f (commit) - Log ----------------------------------------------------------------- commit 5cb5afedbb580fd5e13c018a63e71be076e5ca16 Merge: a9bfc2cd5b14561477689003c47d6972d4d49f4f f97fafea3dc55ba9a98a10fba1787c3cea4b953e Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Apr 26 14:20:51 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: scripts/create_tables.sql | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql index 27c3e4d..bcb8b35 100644 --- a/scripts/create_tables.sql +++ b/scripts/create_tables.sql @@ -1,8 +1,8 @@ -- -------------------------------------------------------- -- SQL Commands to set up the pmadb as described in Documentation.html. --- +-- -- This file is meant for use with MySQL 5 and above! --- +-- -- 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. @@ -173,9 +173,11 @@ CREATE TABLE IF NOT EXISTS `pma_designer_coords` ( ENGINE=MyISAM COMMENT='Table coordinates for Designer' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; --- +-- -------------------------------------------------------- + +-- -- Table structure for table `pma_tracking` --- +-- CREATE TABLE IF NOT EXISTS `pma_tracking` ( `db_name` varchar(64) collate utf8_bin NOT NULL, hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2-24-gf97fafe
by Michal Čihař 26 Apr '10

26 Apr '10

The branch, QA_3_3 has been updated via f97fafea3dc55ba9a98a10fba1787c3cea4b953e (commit) from 6393fff59dfe8fdc7d43f434fe282378c91c10c9 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: scripts/create_tables.sql | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql index 27c3e4d..bcb8b35 100644 --- a/scripts/create_tables.sql +++ b/scripts/create_tables.sql @@ -1,8 +1,8 @@ -- -------------------------------------------------------- -- SQL Commands to set up the pmadb as described in Documentation.html. --- +-- -- This file is meant for use with MySQL 5 and above! --- +-- -- 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. @@ -173,9 +173,11 @@ CREATE TABLE IF NOT EXISTS `pma_designer_coords` ( ENGINE=MyISAM COMMENT='Table coordinates for Designer' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; --- +-- -------------------------------------------------------- + +-- -- Table structure for table `pma_tracking` --- +-- CREATE TABLE IF NOT EXISTS `pma_tracking` ( `db_name` varchar(64) collate utf8_bin NOT NULL, hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2081-ga9bfc2c
by Marc Delisle 26 Apr '10

26 Apr '10

The branch, master has been updated via a9bfc2cd5b14561477689003c47d6972d4d49f4f (commit) via 6393fff59dfe8fdc7d43f434fe282378c91c10c9 (commit) from 2154120e3a3e3eb111772c69ddc1eec72c0345f1 (commit) - Log ----------------------------------------------------------------- commit a9bfc2cd5b14561477689003c47d6972d4d49f4f Merge: 2154120e3a3e3eb111772c69ddc1eec72c0345f1 6393fff59dfe8fdc7d43f434fe282378c91c10c9 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Apr 26 07:42:25 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + scripts/create_tables.sql | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 40fa43b..c5fbcc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -99,6 +99,7 @@ $Id$ engine to Maria, thanks to Madhura Jayaratne. - bug #2974067 [display] non-binary fields shown as hex - bug #2983065 [operations] Error when changing from Maria to MyISAM engine +- bug #2975408 [tracking] Data too long for column data_sql 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql index de225ee..27c3e4d 100644 --- a/scripts/create_tables.sql +++ b/scripts/create_tables.sql @@ -185,7 +185,7 @@ CREATE TABLE IF NOT EXISTS `pma_tracking` ( `date_updated` datetime NOT NULL, `schema_snapshot` text collate utf8_bin NOT NULL, `schema_sql` text collate utf8_bin, - `data_sql` text collate utf8_bin, + `data_sql` longtext collate utf8_bin, `tracking` set('UPDATE','REPLACE','INSERT','DELETE','TRUNCATE','CREATE DATABASE','ALTER DATABASE','DROP DATABASE','CREATE TABLE','ALTER TABLE','RENAME TABLE','DROP TABLE','CREATE INDEX','DROP INDEX','CREATE VIEW','ALTER VIEW','DROP VIEW') collate utf8_bin default NULL, `tracking_active` int(1) unsigned NOT NULL default '1', PRIMARY KEY (`db_name`,`table_name`,`version`) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2-23-g6393fff
by Marc Delisle 26 Apr '10

26 Apr '10

The branch, QA_3_3 has been updated via 6393fff59dfe8fdc7d43f434fe282378c91c10c9 (commit) from e9ee6cf1d12332d99095ce2a1b81d2bc3f0fa064 (commit) - Log ----------------------------------------------------------------- commit 6393fff59dfe8fdc7d43f434fe282378c91c10c9 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Apr 26 07:41:36 2010 -0400 bug #2975408 Data too long for column data_sql ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + scripts/create_tables.sql | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0679157..f39c01f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA engine to Maria, thanks to Madhura Jayaratne. - bug #2974067 [display] non-binary fields shown as hex - bug #2983065 [operations] Error when changing from Maria to MyISAM engine +- bug #2975408 [tracking] Data too long for column data_sql 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql index de225ee..27c3e4d 100644 --- a/scripts/create_tables.sql +++ b/scripts/create_tables.sql @@ -185,7 +185,7 @@ CREATE TABLE IF NOT EXISTS `pma_tracking` ( `date_updated` datetime NOT NULL, `schema_snapshot` text collate utf8_bin NOT NULL, `schema_sql` text collate utf8_bin, - `data_sql` text collate utf8_bin, + `data_sql` longtext collate utf8_bin, `tracking` set('UPDATE','REPLACE','INSERT','DELETE','TRUNCATE','CREATE DATABASE','ALTER DATABASE','DROP DATABASE','CREATE TABLE','ALTER TABLE','RENAME TABLE','DROP TABLE','CREATE INDEX','DROP INDEX','CREATE VIEW','ALTER VIEW','DROP VIEW') collate utf8_bin default NULL, `tracking_active` int(1) unsigned NOT NULL default '1', PRIMARY KEY (`db_name`,`table_name`,`version`) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2079-g2154120
by Michal Čihař 25 Apr '10

25 Apr '10

The branch, master has been updated via 2154120e3a3e3eb111772c69ddc1eec72c0345f1 (commit) from ec263b9170f89b033374ae8a1281d779693d8200 (commit) - Log ----------------------------------------------------------------- commit 2154120e3a3e3eb111772c69ddc1eec72c0345f1 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Apr 25 16:51:53 2010 +0200 [core] Include Content Security Policy HTTP headers. See <https://wiki.mozilla.org/Security/CSP/Specification> for more details. I hope current rule is flexible enough to avoid impact on existing functionality. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/header_http.inc.php | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 06d98cb..40fa43b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -80,6 +80,7 @@ $Id$ + rfe #2983207, patch #2988715 [interface] Use jQuery calendar dialog, thanks to Muhammad Adnan. + [doc] Incorporate synchronisation docs into main document. ++ [core] Include Content Security Policy HTTP headers. 3.3.3.0 (not yet released) - patch #2982480 [navi] Do not group if there would be one table in group, diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php index 2a1c445..46f8017 100644 --- a/libraries/header_http.inc.php +++ b/libraries/header_http.inc.php @@ -23,6 +23,7 @@ $GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT'; /* Prevent against ClickJacking by allowing frames only from same origin */ if (!$GLOBALS['cfg']['AllowThirdPartyFraming']) { header('X-Frame-Options: SAMEORIGIN'); + header('X-Content-Security-Policy: allow \'self\'; options inline-script eval-script; frame-ancestors \'self\''); } header('Expires: ' . $GLOBALS['now']); // rfc2616 - Section 14.21 header('Last-Modified: ' . $GLOBALS['now']); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2078-gec263b9
by Marc Delisle 25 Apr '10

25 Apr '10

The branch, master has been updated via ec263b9170f89b033374ae8a1281d779693d8200 (commit) via e9ee6cf1d12332d99095ce2a1b81d2bc3f0fa064 (commit) from bd90d40defef2384145517c75cf1b185656327c9 (commit) - Log ----------------------------------------------------------------- commit ec263b9170f89b033374ae8a1281d779693d8200 Merge: bd90d40defef2384145517c75cf1b185656327c9 e9ee6cf1d12332d99095ce2a1b81d2bc3f0fa064 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Apr 25 07:10:20 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + tbl_operations.php | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b1906e..06d98cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,7 @@ $Id$ - bug #2983062, patch #2989408 [engines] Fix warnings when changing table engine to Maria, thanks to Madhura Jayaratne. - bug #2974067 [display] non-binary fields shown as hex +- bug #2983065 [operations] Error when changing from Maria to MyISAM engine 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/tbl_operations.php b/tbl_operations.php index 87ccce9..04fd618 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -157,8 +157,16 @@ if (isset($_REQUEST['submitoptions'])) { $reread_info = true; unset($table_alters); foreach (PMA_DBI_get_warnings() as $warning) { - $warning_messages[] = $warning['Level'] . ': #' . $warning['Code'] - . ' ' . $warning['Message']; + // In MariaDB 5.1.44, when altering a table from Maria to MyISAM + // and if TRANSACTIONAL was set, the system reports an error; + // I discussed with a Maria developer and he agrees that this + // should not be reported with a Level of Error, so here + // I just ignore it. But there are other 1478 messages + // that it's better to show. + if (! ($_REQUEST['new_tbl_type'] == 'MyISAM' && $warning['Code'] == '1478' && $warning['Level'] == 'Error')) { + $warning_messages[] = $warning['Level'] . ': #' . $warning['Code'] + . ' ' . $warning['Message']; + } } } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2-22-ge9ee6cf
by Marc Delisle 25 Apr '10

25 Apr '10

The branch, QA_3_3 has been updated via e9ee6cf1d12332d99095ce2a1b81d2bc3f0fa064 (commit) from acdf39e95b355bc656409b66174afe6b7e0f39c6 (commit) - Log ----------------------------------------------------------------- commit e9ee6cf1d12332d99095ce2a1b81d2bc3f0fa064 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Apr 25 07:09:39 2010 -0400 bug #2983065 Error when changing from Maria to MyISAM engine ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + tbl_operations.php | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4bda4f7..0679157 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #2983062, patch #2989408 [engines] Fix warnings when changing table engine to Maria, thanks to Madhura Jayaratne. - bug #2974067 [display] non-binary fields shown as hex +- bug #2983065 [operations] Error when changing from Maria to MyISAM engine 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/tbl_operations.php b/tbl_operations.php index e859b3c..98e5f1b 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -157,8 +157,16 @@ if (isset($_REQUEST['submitoptions'])) { $reread_info = true; unset($table_alters); foreach (PMA_DBI_get_warnings() as $warning) { - $warning_messages[] = $warning['Level'] . ': #' . $warning['Code'] - . ' ' . $warning['Message']; + // In MariaDB 5.1.44, when altering a table from Maria to MyISAM + // and if TRANSACTIONAL was set, the system reports an error; + // I discussed with a Maria developer and he agrees that this + // should not be reported with a Level of Error, so here + // I just ignore it. But there are other 1478 messages + // that it's better to show. + if (! ($_REQUEST['new_tbl_type'] == 'MyISAM' && $warning['Code'] == '1478' && $warning['Level'] == 'Error')) { + $warning_messages[] = $warning['Level'] . ': #' . $warning['Code'] + . ' ' . $warning['Message']; + } } } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2076-gbd90d40
by Marc Delisle 23 Apr '10

23 Apr '10

The branch, master has been updated via bd90d40defef2384145517c75cf1b185656327c9 (commit) via acdf39e95b355bc656409b66174afe6b7e0f39c6 (commit) from 4f55bfd945cf66f47382ebb7a3b9336e0e572c8e (commit) - Log ----------------------------------------------------------------- commit bd90d40defef2384145517c75cf1b185656327c9 Merge: 4f55bfd945cf66f47382ebb7a3b9336e0e572c8e acdf39e95b355bc656409b66174afe6b7e0f39c6 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Apr 23 14:07:03 2010 -0400 bug #2974067 non-binary fields shown as hex ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/common.lib.php | 15 +++++++++++++-- libraries/display_tbl.lib.php | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b76217..8b1906e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,6 +96,7 @@ $Id$ designer, thanks to Sutharshan Balachandren. - bug #2983062, patch #2989408 [engines] Fix warnings when changing table engine to Maria, thanks to Madhura Jayaratne. +- bug #2974067 [display] non-binary fields shown as hex 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/libraries/common.lib.php b/libraries/common.lib.php index f8dcc60..76ebb06 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2600,8 +2600,19 @@ function PMA_printable_bit_value($value, $length) { } /** - * Converts a BIT type default value - * for example, b'010' becomes 010 + * Verifies whether the value contains a non-printable character + * + * @uses preg_match() + * @param string $value + * @return boolean + */ +function PMA_contains_nonprintable_ascii($value) { + return preg_match('@[^[:print:]]@', $value); +} + +/** + * Converts a BIT type default value + * for example, b'010' becomes 010 * * @uses strtr() * @param string $bit_default_value diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index e99b97c..82ab6fb 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1378,7 +1378,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { if ($_SESSION['tmp_user_values']['display_binary']) { // user asked to see the real contents of BINARY // fields - if ($_SESSION['tmp_user_values']['display_binary_as_hex']) { + if ($_SESSION['tmp_user_values']['display_binary_as_hex'] && PMA_contains_nonprintable_ascii($row[$i])) { $row[$i] = bin2hex($row[$i]); } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2-21-gacdf39e
by Marc Delisle 23 Apr '10

23 Apr '10

The branch, QA_3_3 has been updated via acdf39e95b355bc656409b66174afe6b7e0f39c6 (commit) from 769aec95effaa407fc62778a23549b902fd586d9 (commit) - Log ----------------------------------------------------------------- commit acdf39e95b355bc656409b66174afe6b7e0f39c6 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Apr 23 14:00:53 2010 -0400 bug #2974067 non-binary fields shown as hex ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/common.lib.php | 11 +++++++++++ libraries/display_tbl.lib.php | 2 +- 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4010dda..4bda4f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA designer, thanks to Sutharshan Balachandren. - bug #2983062, patch #2989408 [engines] Fix warnings when changing table engine to Maria, thanks to Madhura Jayaratne. +- bug #2974067 [display] non-binary fields shown as hex 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/libraries/common.lib.php b/libraries/common.lib.php index f072233..2e18474 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2596,6 +2596,17 @@ function PMA_printable_bit_value($value, $length) { } /** + * Verifies whether the value contains a non-printable character + * + * @uses preg_match() + * @param string $value + * @return boolean + */ +function PMA_contains_nonprintable_ascii($value) { + return preg_match('@[^[:print:]]@', $value); +} + +/** * Converts a BIT type default value * for example, b'010' becomes 010 * diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 41bb987..05feefb 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1368,7 +1368,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { if ($_SESSION['tmp_user_values']['display_binary']) { // user asked to see the real contents of BINARY // fields - if ($_SESSION['tmp_user_values']['display_binary_as_hex']) { + if ($_SESSION['tmp_user_values']['display_binary_as_hex'] && PMA_contains_nonprintable_ascii($row[$i])) { $row[$i] = bin2hex($row[$i]); } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 24eea6f4412af99ddf0f2777c849e337b136b61a
by Michal Čihař 23 Apr '10

23 Apr '10

The branch, master has been updated via 24eea6f4412af99ddf0f2777c849e337b136b61a (commit) via 247e5b927564f86841a0b67b9877c760f6cc7116 (commit) from f92820065def94bed18b62a6ccfcfbac0291f1d7 (commit) - Log ----------------------------------------------------------------- commit 24eea6f4412af99ddf0f2777c849e337b136b61a Author: Michal Čihař <michal(a)cihar.com> Date: Fri Apr 23 16:48:16 2010 +0200 Translation update done using Pootle. commit 247e5b927564f86841a0b67b9877c760f6cc7116 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Apr 23 16:47:20 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/po/cs.po b/po/cs.po index f64a716..45d100d 100644 --- a/po/cs.po +++ b/po/cs.po @@ -10,13 +10,13 @@ msgstr "" "Project-Id-Version: po 4a\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-04-22 20:27+0300\n" -"PO-Revision-Date: 2010-04-12 14:04+0200\n" +"PO-Revision-Date: 2010-04-23 16:48+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: Czech <cs(a)li.org>\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.0.1\n" @@ -662,7 +662,7 @@ msgstr "" #. type: Content of: <html><body><div><ol><li><ul><li> #: ../phpmyadmin/Documentation.html:262 msgid "And to edit an existing configuration, copy it over first:" -msgstr "" +msgstr "Pro úpravu aktuální konfigurace ji nejdříve zkopírujte:" #. type: Content of: <html><body><div><ol><li><ul><li><pre> #: ../phpmyadmin/Documentation.html:264 @@ -1052,6 +1052,8 @@ msgstr "" msgid "" "'<abbr title=\"HyperText Transfer Protocol\">HTTP</abbr>' authentication mode" msgstr "" +"Přihlašování pomocí '<abbr title=\"HyperText Transfer Protocol\">HTTP</abbr>' " +"autentizace" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:466 @@ -1084,7 +1086,7 @@ msgstr "" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:484 msgid "'cookie' authentication mode" -msgstr "" +msgstr "Přihlašování pomocí 'cookies'" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:486 @@ -9719,6 +9721,7 @@ msgid "" "in order to synchronize the target database. The tables whose names are not " "preceded by a ‘+’ sign are already present in the target database." msgstr "" + #~ msgid "" #~ "You need to fill in the host name of the server, the username and password " #~ "of an user account already there in MySQL. Port is by default populated with " hooks/post-receive -- phpMyAdmin localized documentation

1 0