Git April 2010

git@phpmyadmin.net

6 participants
240 discussions

[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ř 26 Apr '10

26 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 24 Apr '10

24 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 24 Apr '10

24 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ř 24 Apr '10

24 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

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2074-g4f55bfd
by Michal Čihař 24 Apr '10

24 Apr '10

The branch, master has been updated via 4f55bfd945cf66f47382ebb7a3b9336e0e572c8e (commit) from d98f450e457faa0241b9a0a118d05a8ab71e253f (commit) - Log ----------------------------------------------------------------- commit 4f55bfd945cf66f47382ebb7a3b9336e0e572c8e Author: dbc334 <dbc334(a)gmail.com> Date: Fri Apr 23 16:48:47 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 8 ++++---- po/sl.po | 37 +++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/po/cs.po b/po/cs.po index cda9485..a04640b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5,13 +5,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-04-20 07:54+0200\n" -"PO-Revision-Date: 2010-04-20 07:56+0200\n" +"PO-Revision-Date: 2010-04-23 16:41+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" @@ -3549,8 +3549,8 @@ msgid "" "Only slaves started with the --report-host=host_name option are visible in " "this list." msgstr "" -"V tomto seznamu jsou zobrazeny jen podřízené servery spuštěné s parametrem --" -"report-host=host_name." +"V tomto seznamu jsou zobrazeny jen podřízené servery spuštěné s parametrem " +"--report-host=host_name." #: libraries/messages.inc.php:786 msgid "Show connected slaves" diff --git a/po/sl.po b/po/sl.po index 19c280f..06e024e 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-04-20 07:54+0200\n" -"PO-Revision-Date: 2010-04-22 23:40+0200\n" -"Last-Translator: <dbc334(a)gmail.com>\n" +"PO-Revision-Date: 2010-04-23 16:40+0200\n" +"Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" "Language: sl\n" "MIME-Version: 1.0\n" @@ -392,7 +392,7 @@ msgid "" "May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ " "3.11[/a]" msgstr "" -"Lahko je približno. Glej [a@./Documentation.html#faq3_11@Documentation]FAQ " +"Morda je približno. Glej [a@./Documentation.html#faq3_11@Documentation]FAQ " "3.11[/a]" #: libraries/messages.inc.php:74 @@ -570,9 +570,8 @@ msgid "Browse" msgstr "Prebrskaj" #: libraries/messages.inc.php:117 -#, fuzzy msgid "Browse distinct values" -msgstr "Prebrskaj tuje vrednosti" +msgstr "Prebrskaj različne vrednosti" #: libraries/messages.inc.php:118 msgid "Browse foreign values" @@ -2509,7 +2508,6 @@ msgid "No change" msgstr "Brez sprememb" #: libraries/messages.inc.php:565 -#, fuzzy msgctxt "$strNoneDefault" msgid "None" msgstr "Brez" @@ -2671,9 +2669,8 @@ msgid "Page number:" msgstr "Številka strani:" #: libraries/messages.inc.php:606 -#, fuzzy msgid "Pages to be flushed" -msgstr "Tabela %s je osvežena" +msgstr "" #: libraries/messages.inc.php:607 msgid "Paper size" @@ -3161,9 +3158,8 @@ msgstr "" "globalnih spremenljivk in ukinjanje procesov drugih uporabnikov." #: libraries/messages.inc.php:714 -#, fuzzy msgid "Allows creating and dropping triggers" -msgstr "Omogoča ustvarjanje in brisanje indeksov." +msgstr "Omogoča ustvarjanje in brisanje sprožilcev" #: libraries/messages.inc.php:715 msgid "Allows changing data." @@ -5341,7 +5337,7 @@ msgstr "" #: libraries/messages.inc.php:1187 msgid "Triggers" -msgstr "" +msgstr "Sprožilci" #: libraries/messages.inc.php:1188 msgid "Truncate Shown Queries" @@ -5636,32 +5632,31 @@ msgstr "" #: libraries/messages.inc.php:1257 msgid "Export contents" -msgstr "" +msgstr "Izvozi vsebine" #: libraries/messages.inc.php:1258 msgid "Export functions" -msgstr "" +msgstr "Izvozi funkcije" #: libraries/messages.inc.php:1259 msgid "Export procedures" -msgstr "" +msgstr "Izvozi procedure" #: libraries/messages.inc.php:1260 msgid "Export Structure Schemas (recommended)" -msgstr "" +msgstr "Izvozi sheme struktur (priporočeno)" #: libraries/messages.inc.php:1261 msgid "Export tables" msgstr "Izvozi tabele" #: libraries/messages.inc.php:1262 -#, fuzzy msgid "Export triggers" -msgstr "Vrsta izvoza" +msgstr "Izvozi sprožilce" #: libraries/messages.inc.php:1263 msgid "Export views" -msgstr "" +msgstr "Izvozi poglede" #: libraries/messages.inc.php:1264 msgid "XML" @@ -5682,7 +5677,7 @@ msgstr "\"zipano\"" #: navigation.php:318 msgid "Filter" -msgstr "" +msgstr "Filtriranje" #: navigation.php:319 setup/lib/messages.inc.php:42 msgid "Clear" @@ -5691,6 +5686,8 @@ msgstr "Počisti" #: server_privileges.php:1904 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" +"Pred nadomestna znaka % in _ je potrebno postaviti \\, če ju želite uporabiti " +"dobesedno." #: server_synchronize.php:1129 msgid "Enter manually" @@ -5708,7 +5705,7 @@ msgstr "Konfiguracija: %s" #: setup/lib/messages.inc.php:16 msgid "Allow character set conversion" -msgstr "" +msgstr "Omogoča pretvarjanje nabora znakov" #: setup/lib/messages.inc.php:17 msgid "" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2073-gd98f450
by Michal Čihař 23 Apr '10

23 Apr '10

The branch, master has been updated via d98f450e457faa0241b9a0a118d05a8ab71e253f (commit) from dfa712179b024896ea06cfc7b853e80829fef76f (commit) - Log ----------------------------------------------------------------- commit d98f450e457faa0241b9a0a118d05a8ab71e253f Author: dbc334 <dbc334(a)gmail.com> Date: Fri Apr 23 13:02:01 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/sl.po | 223 ++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 117 insertions(+), 106 deletions(-) diff --git a/po/sl.po b/po/sl.po index 8def6c2..19c280f 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-04-20 07:54+0200\n" -"PO-Revision-Date: 2010-04-21 21:31+0200\n" +"PO-Revision-Date: 2010-04-22 23:40+0200\n" "Last-Translator: <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" "Language: sl\n" @@ -67,22 +67,28 @@ msgstr "V vrstici" #, php-format msgid "%1$d row affected." msgid_plural "%1$d rows affected." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Spremenjena je %1$d vrstica." +msgstr[1] "Spremenjeni sta %1$d vrstici." +msgstr[2] "Spremenjene so %1$d vrstice." +msgstr[3] "Spremenjenih je %1$d vrstic." #: libraries/Message.class.php:301 #, php-format msgid "%1$d row deleted." msgid_plural "%1$d rows deleted." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Izbrisana je %1$d vrstica." +msgstr[1] "Izbrisani sta %1$d vrstici." +msgstr[2] "Izbrisane so %1$d vrstice." +msgstr[3] "Izbrisanih je %1$d vrstic." #: libraries/Message.class.php:320 #, php-format msgid "%1$d row inserted." msgid_plural "%1$d rows inserted." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Vstavljena je %1$d vrstica." +msgstr[1] "Vstavljeni sta %1$d vrstici." +msgstr[2] "Vstavljene so %1$d vrstice." +msgstr[3] "Vstavljenih je %1$d vrstic." #. l10n: Text direction, use either ltr or rtl #: libraries/messages.inc.php:19 @@ -386,6 +392,8 @@ msgid "" "May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ " "3.11[/a]" msgstr "" +"Lahko je približno. Glej [a@./Documentation.html#faq3_11@Documentation]FAQ " +"3.11[/a]" #: libraries/messages.inc.php:74 #, php-format @@ -539,11 +547,11 @@ msgstr "Zaznamek je odstranjen." #: libraries/messages.inc.php:111 msgid "Label" -msgstr "Nalepka" +msgstr "Oznaka" #: libraries/messages.inc.php:112 msgid "Bookmarked SQL query" -msgstr "Označena SQL-poizvedba" +msgstr "Označena poizvedba SQL" #: libraries/messages.inc.php:113 msgid "Replace existing bookmark of same name" @@ -551,7 +559,7 @@ msgstr "Zamenjaj obstoječ zaznamek z istim imenom" #: libraries/messages.inc.php:114 msgid "Bookmark this SQL query" -msgstr "Označi to SQL-poizvedbo" +msgstr "Označi to poizvedbo SQL" #: libraries/messages.inc.php:115 msgid "View only" @@ -810,7 +818,7 @@ msgstr "Stiskanje" #: libraries/messages.inc.php:175 #, php-format msgid "Imported file compression will be automatically detected from: %s" -msgstr "" +msgstr "Stiskanje uvožene datoteke bo samodejno zaznano iz: %s" #: libraries/messages.inc.php:176 #, php-format @@ -876,7 +884,7 @@ msgstr "Zbirka podatkov %s je kopirana v %s" #: libraries/messages.inc.php:187 msgid "Copy table to (database<b>.</b>table):" -msgstr "Kopiraj tabelo v (podatkovna_baza<b>.</b>tabela):" +msgstr "Kopiraj tabelo v (podatkovna_zbirka<b>.</b>tabela):" #: libraries/messages.inc.php:188 #, php-format @@ -920,7 +928,7 @@ msgstr "Ustvari nov indeks" #: libraries/messages.inc.php:197 msgid "Create new database" -msgstr "Ustvari novo zbirko podatkovno" +msgstr "Ustvari novo zbirko podatkov" #: libraries/messages.inc.php:198 #, php-format @@ -1081,7 +1089,7 @@ msgstr "Podatki" #: libraries/messages.inc.php:235 msgid "Data Dictionary" -msgstr "Podatkovni slovar" +msgstr "Slovar podatkov" #: libraries/messages.inc.php:236 msgid "Data Difference" @@ -1195,7 +1203,7 @@ msgstr "Opis" #: libraries/messages.inc.php:261 msgid "Designer" -msgstr "" +msgstr "Oblikovalnik" #: libraries/messages.inc.php:262 msgid "" @@ -1371,7 +1379,7 @@ msgstr "Angleško" #: libraries/messages.inc.php:304 msgid " Note: MySQL privilege names are expressed in English " -msgstr " Opomba: Imena MySQL privilegijev so zapisana v angleščini " +msgstr " Opomba: Imena privilegijev MySQL so zapisana v angleščini " #: libraries/messages.inc.php:305 msgid "Error" @@ -1396,7 +1404,7 @@ msgstr "Napaka pri preimenovanju tabele %1$s v %2$s" #: libraries/messages.inc.php:310 msgid "Error saving coordinates for Designer." -msgstr "" +msgstr "Napaka pri shranjevanju koordinat Oblikovalnika." #: libraries/messages.inc.php:311 msgid "Esperanto" @@ -1512,6 +1520,9 @@ msgid "" "formatting strings. Additionally the following transformations will happen: %" "3$s. Other text will be kept as is." msgstr "" +"Vrednost je prevedena z uporabo %1$sstrftime%2$s, tako da lahko uporabljate " +"nize za zapis časa. Dodatno bo prišlo še do naslednjih pretvorb: %3$s. " +"Ostalo besedilo bo ostalo takšno, kot je." #: libraries/messages.inc.php:338 msgid "File name template" @@ -1673,7 +1684,7 @@ msgstr "" #: libraries/messages.inc.php:378 msgid "Selected target tables have been synchronized with source tables." -msgstr "" +msgstr "Izbrane ciljne tabele so bile sinhronizirane z izvornimi tabelami." #: libraries/messages.inc.php:379 msgid "You have to choose at least one column to display" @@ -1812,7 +1823,7 @@ msgstr "Uvozi denarne enote ($5.00 v 5.00)" #: libraries/messages.inc.php:412 libraries/messages.inc.php:592 msgid "Open Document Spreadsheet" -msgstr "" +msgstr "Preglednica Open Document" #: libraries/messages.inc.php:413 msgid "Import percentages as proper decimals (12.00% to .12)" @@ -2168,7 +2179,7 @@ msgstr "Lokalno" #: libraries/messages.inc.php:494 msgid "Location of the text file" -msgstr "Lokacija datoteke z besedilom" +msgstr "Mesto datoteke z besedilom" #: libraries/messages.inc.php:495 msgid "Login Information" @@ -2241,7 +2252,7 @@ msgstr "Tabela MediaWiki" #: libraries/messages.inc.php:511 msgid "Available MIME types" -msgstr "Razpoložljive MIME-vrste" +msgstr "Razpoložljive vrste MIME" #: libraries/messages.inc.php:512 msgid "Available transformations" @@ -2254,7 +2265,7 @@ msgstr "Opis" #: libraries/messages.inc.php:514 msgid "MIME type" -msgstr "MIME-vrsta" +msgstr "Vrsta MIME" #: libraries/messages.inc.php:515 #, php-format @@ -2275,7 +2286,7 @@ msgid "" "For a list of available transformation options and their MIME type " "transformations, click on %stransformation descriptions%s" msgstr "" -"Seznam razpoložljivih možnosti pretvorbe in pretvorbe MIME-vrst boste " +"Seznam razpoložljivih možnosti pretvorbe in pretvorbe vrst MIME boste " "videli, če kliknete na %sopise transformacij%s" #: libraries/messages.inc.php:518 @@ -2301,7 +2312,7 @@ msgstr "VRSTE MIME ZA TABELO" #: libraries/messages.inc.php:521 msgid "" "MIME types printed in italics do not have a separate transformation function" -msgstr "MIME-vrste, ki so napisano ležeče, nimajo lastne pretvorbene funkcije" +msgstr "Vrste MIME, ki so napisane ležeče, nimajo lastne pretvorbene funkcije" #: libraries/messages.inc.php:522 msgid "Modifications have been saved" @@ -2321,7 +2332,7 @@ msgstr "" #: libraries/messages.inc.php:526 msgid "Move table to (database<b>.</b>table):" -msgstr "Premakni tabelo v (podatkovna_baza<b>.</b>tabela):" +msgstr "Premakni tabelo v (podatkovna_zbirka<b>.</b>tabela):" #: libraries/messages.inc.php:527 #, php-format @@ -2408,7 +2419,7 @@ msgstr "Različica odjemalca MySQL" #: libraries/messages.inc.php:544 msgid "MySQL connection collation" -msgstr "" +msgstr "Razvrščanje znakov povezave MySQL" #: libraries/messages.inc.php:545 #, php-format @@ -2442,7 +2453,7 @@ msgstr "Naslednji" #: libraries/messages.inc.php:552 #, php-format msgid "No activity within %s seconds; please log in again" -msgstr "Brez delovanja v %s sekundah; prosimo, ponovno se prijavite" +msgstr "Brez aktivnosti v zadnjih %s sekundah; prosimo, prijavite se znova" #: libraries/messages.inc.php:553 msgid "No databases" @@ -2467,6 +2478,7 @@ msgstr "brez opisa" msgid "" "There is no detailed status information available for this storage engine." msgstr "" +"Za ta skladiščni pogon ni na voljo nobenih podrobnejših informacij o stanju." #: libraries/messages.inc.php:558 msgid "\"DROP DATABASE\" statements are disabled." @@ -2474,7 +2486,7 @@ msgstr "Poizvedbe \"DROP DATABASE\" so izključene." #: libraries/messages.inc.php:559 msgid "Skip Explain SQL" -msgstr "Preskoči razlago SQL-stavka" +msgstr "Preskoči razlago stavka SQL" #: libraries/messages.inc.php:560 msgid "No files found inside ZIP archive!" @@ -2940,7 +2952,7 @@ msgstr "" #: libraries/messages.inc.php:667 msgid "phpMyAdmin documentation" -msgstr "phpMyAdmin dokumentacija" +msgstr "Dokumentacija phpMyAdmin" #: libraries/messages.inc.php:668 msgid "" @@ -2997,7 +3009,7 @@ msgstr "Pogled za tiskanje (s polnimi besedili)" #: libraries/messages.inc.php:680 msgid "Print view" -msgstr "Pogled postavitve tiskanja" +msgstr "Pogled za tiskanje" #: libraries/messages.inc.php:681 msgid "Includes all privileges except GRANT." @@ -3212,7 +3224,7 @@ msgstr "Vrsta poizvedbe" #: libraries/messages.inc.php:730 setup/lib/messages.inc.php:122 msgid "Query window" -msgstr "Okno za iskanje" +msgstr "Okno za poizvedbe" #: libraries/messages.inc.php:731 #, php-format @@ -3221,7 +3233,7 @@ msgstr "Poizvedba SQL na zbirki podatkov <b>%s</b>:" #: libraries/messages.inc.php:732 msgid "Query results operations" -msgstr "" +msgstr "Dejanja rezultatov poizvedbe" #: libraries/messages.inc.php:733 msgid "SQL history" @@ -3435,9 +3447,8 @@ msgid "Master replication" msgstr "" #: libraries/messages.inc.php:781 -#, fuzzy msgid "Replication" -msgstr "Relacije" +msgstr "Podvojevanje" #: libraries/messages.inc.php:782 msgid "" @@ -3621,7 +3632,7 @@ msgstr "Dolžina vrstice" #: libraries/messages.inc.php:822 msgid "row(s) starting from record #" -msgstr "vrstice naprej od zapisa #" +msgstr "vrstic naprej od zapisa #" #: libraries/messages.inc.php:823 msgid " Row size " @@ -3822,7 +3833,7 @@ msgid "" "this MySQL server since its startup." msgstr "" "<b>Promet na strežniku</b>: V teh tabelah je prikazana statistika " -"obremenitve omrežja za ta MySQL strežnik, odkar je bil zagnan." +"obremenitve omrežja za ta strežnik MySQL, odkar je bil zagnan." #: libraries/messages.inc.php:871 msgid "Server variables and settings" @@ -3920,7 +3931,7 @@ msgstr "Prikazovanje poizvedbe SQL" #: libraries/messages.inc.php:891 msgid "Show insert query" -msgstr "" +msgstr "Prikaži poizvedbo insert" #: libraries/messages.inc.php:892 msgid "Only show keys" @@ -4583,15 +4594,15 @@ msgid "" "please reduce your SQL query input to the single query that causes problems, " "and submit a bug report with the data chunk in the CUT section below:" msgstr "" -"Obstaja možnost, da ste v SQL razčlenjevalniku naleteli na hrošča. Temeljito " -"preglejte poizvedbo in preverite, če so citati pravilni in če se ujemajo. " -"Možno je tudi, da prenašate binarno datoteko, ki je izven področja besedila " -"citata. Poizvedbo lahko preizkusite tudi na vmesniku ukazne vrstice MySQL. " -"Če je strežnik MySQL izpisal napako, vam le-ta lahko pomaga pri ugotavljanju " -"težav. Če se bodo težave nadaljevale, ali če razčlenjevalniku ne uspe tam, " -"kjer vmesniku ukazne vrstice uspe, potem zmanjšajte vnešeno SQL poizvedbo na " -"tisto poizvedbo, ki povzroča težave in pošljite poročilo o napaki skupaj s " -"podatki iz spodnjega odseka IZREZA." +"Obstaja možnost, da ste v razčlenjevalniku SQL naleteli na hrošča. Temeljito " +"preglejte poizvedbo in preverite, če so narekovaji pravilni in če se " +"ujemajo. Možno je tudi, da prenašate binarno datoteko, ki je izven področja " +"besedila citata. Poizvedbo lahko preizkusite tudi na vmesniku ukazne vrstice " +"MySQL. Če je strežnik MySQL izpisal napako, vam le-ta lahko pomaga pri " +"ugotavljanju težav. Če se bodo težave nadaljevale, ali če razčlenjevalniku " +"ne uspe tam, kjer vmesniku ukazne vrstice uspe, potem zmanjšajte vnešeno " +"poizvedbo SQL na tisto poizvedbo, ki povzroča težave in pošljite poročilo o " +"napaki skupaj s podatki iz spodnjega odseka IZREZA:" #: libraries/messages.inc.php:1030 msgid "" @@ -4603,7 +4614,7 @@ msgstr "" #: libraries/messages.inc.php:1031 msgid "SQL query" -msgstr "SQL-poizvedba" +msgstr "Poizvedba SQL" #: libraries/messages.inc.php:1032 msgid "SQL result" @@ -4714,7 +4725,7 @@ msgstr "Struktura" #: libraries/messages.inc.php:1058 msgid "Structure Synchronization" -msgstr "" +msgstr "Sinhronizacija strukture" #: libraries/messages.inc.php:1059 msgid "Submit" @@ -4722,7 +4733,7 @@ msgstr "Pošlji" #: libraries/messages.inc.php:1060 msgid "Your SQL query has been executed successfully" -msgstr "SQL-poizvedba je bila uspešno izvedena" +msgstr "Poizvedba SQL je bila uspešno izvedena" #: libraries/messages.inc.php:1061 #, php-format @@ -4769,14 +4780,16 @@ msgid "" "Target database will be completely synchronized with source database. Source " "database will remain unchanged." msgstr "" +"Ciljna podatkovna zbirka bo popolnoma sinhronizirana z izvorno podatkovno " +"zbirko. Izvorna podatkovna zbirka bo ostala nespremenjena." #: libraries/messages.inc.php:1071 msgid "Synchronize Databases" -msgstr "" +msgstr "Sinhroniziraj zbirke podatkov" #: libraries/messages.inc.php:1072 msgid "Synchronize" -msgstr "" +msgstr "Sinhroniziraj" #: libraries/messages.inc.php:1074 msgid "Add column(s)" @@ -4834,11 +4847,11 @@ msgstr "Tabela %s je osvežena" #: libraries/messages.inc.php:1086 msgid "Insert row(s)" -msgstr "" +msgstr "Vstavi vrstico(-e)" #: libraries/messages.inc.php:1087 msgid "Table seems to be empty!" -msgstr "" +msgstr "Tabela je prazna!" #: libraries/messages.inc.php:1088 msgid "Table maintenance" @@ -4846,7 +4859,7 @@ msgstr "Vzdrževanje tabele" #: libraries/messages.inc.php:1089 msgid "Table name" -msgstr "" +msgstr "Ime tabele" #: libraries/messages.inc.php:1090 msgid "Table of contents" @@ -4858,7 +4871,7 @@ msgstr "Možnosti tabele" #: libraries/messages.inc.php:1092 msgid "Remove column(s)" -msgstr "" +msgstr "Odstrani stolpec(-ce)" #: libraries/messages.inc.php:1093 msgid "Remove index(s)" @@ -4879,7 +4892,7 @@ msgstr "Tabela" #: libraries/messages.inc.php:1097 msgid "Update row(s)" -msgstr "" +msgstr "Posodobi vrstico(-e)" #: libraries/messages.inc.php:1098 msgid "take it" @@ -4887,7 +4900,7 @@ msgstr "" #: libraries/messages.inc.php:1099 msgid "Target database has been synchronized with source database" -msgstr "" +msgstr "Ciljna zbirka podatkov je bila sinhronizirana z izvorno zbirko podatkov" #: libraries/messages.inc.php:1100 msgid "Table-specific privileges" @@ -4895,15 +4908,15 @@ msgstr "Privilegiji tipični za tabelo" #: libraries/messages.inc.php:1101 msgid "Temporary data" -msgstr "" +msgstr "Začasni podatki" #: libraries/messages.inc.php:1102 msgid " Because of its length,<br /> this field might not be editable " -msgstr " Zaradi njegove dolžine<br /> polja ne bo mogoče urejati " +msgstr " Zaradi njegove dolžine<br /> polja morda ne bo mogoče urejati " #: libraries/messages.inc.php:1103 msgid "Texy! text" -msgstr "" +msgstr "Besedilo Texy!" #: libraries/messages.inc.php:1104 msgid "Thai" @@ -4912,30 +4925,30 @@ msgstr "Tajsko" #: libraries/messages.inc.php:1105 #, php-format msgid "Default theme %s not found!" -msgstr "" +msgstr "Privzeta tema %s ni bila najdena!" #: libraries/messages.inc.php:1106 msgid "No preview available." -msgstr "" +msgstr "Predogled ni na voljo." #: libraries/messages.inc.php:1107 #, php-format msgid "Theme %s not found!" -msgstr "" +msgstr "Tema %s ni bila najdena!" #: libraries/messages.inc.php:1108 #, php-format msgid "No valid image path for theme %s found!" -msgstr "" +msgstr "Za temo %s ni bila najdena veljavna pot slik!" #: libraries/messages.inc.php:1109 #, php-format msgid "Theme path not found for theme %s!" -msgstr "" +msgstr "Pot teme ni bila najdena za temo %s!" #: libraries/messages.inc.php:1110 msgid "Theme / Style" -msgstr "" +msgstr "Tema / Slog" #: libraries/messages.inc.php:1111 msgid "This Host" @@ -5015,14 +5028,13 @@ msgid "Comment out these two lines if you do not need them." msgstr "" #: libraries/messages.inc.php:1128 -#, fuzzy msgid "Create version" -msgstr "Različica strežnika" +msgstr "Ustvari različico" #: libraries/messages.inc.php:1129 #, php-format msgid "Create version %s of %s.%s" -msgstr "" +msgstr "Ustvari različico %s tabele %s.%s" #: libraries/messages.inc.php:1130 msgid "Database Log" @@ -5042,47 +5054,47 @@ msgstr "Datum" #: libraries/messages.inc.php:1134 msgid "Deactivate now" -msgstr "" +msgstr "Dezaktiviraj zdaj" #: libraries/messages.inc.php:1135 #, php-format msgid "Deactivate tracking for %s.%s" -msgstr "" +msgstr "Dezaktiviraj sledenje za %s.%s" #: libraries/messages.inc.php:1136 #, php-format msgid "Export as %s" -msgstr "" +msgstr "Izvozi kot %s" #: libraries/messages.inc.php:1137 msgid "Tracking is active." -msgstr "" +msgstr "Sledenje je aktivno." #: libraries/messages.inc.php:1138 msgid "Tracking is not active." -msgstr "" +msgstr "Sledenje ni aktivno." #: libraries/messages.inc.php:1139 msgid "Close" -msgstr "" +msgstr "Zapri" #: libraries/messages.inc.php:1140 #, php-format msgid "Tracking report for table `%s`" -msgstr "" +msgstr "Poročilo sledenja za tabelo `%s`" #: libraries/messages.inc.php:1141 msgid "Tracking report" -msgstr "" +msgstr "Poročilo sledenja" #: libraries/messages.inc.php:1142 #, php-format msgid "Show %s with dates from %s to %s by user %s %s" -msgstr "" +msgstr "Prikaži %s z datumi od %s do %s uporabnika %s %s" #: libraries/messages.inc.php:1143 msgid "Show versions" -msgstr "" +msgstr "Prikaži različice" #: libraries/messages.inc.php:1144 msgid "SQL dump (file download)" @@ -5094,7 +5106,7 @@ msgstr "" #: libraries/messages.inc.php:1146 msgid "SQL statements executed." -msgstr "" +msgstr "Stavki SQL so izvedeni." #: libraries/messages.inc.php:1147 msgid "This option will replace your table and contained data." @@ -5110,20 +5122,19 @@ msgstr "" #: libraries/messages.inc.php:1150 msgid "Tracking statements" -msgstr "" +msgstr "Sledenje stavkom" #: libraries/messages.inc.php:1151 msgid "active" -msgstr "" +msgstr "aktivno" #: libraries/messages.inc.php:1152 msgid "not active" -msgstr "" +msgstr "ni aktivno" #: libraries/messages.inc.php:1153 -#, fuzzy msgid "Structure snapshot" -msgstr "Samo struktura" +msgstr "Posnetek strukture" #: libraries/messages.inc.php:1154 msgid "Created" @@ -5131,11 +5142,11 @@ msgstr "Ustvarjeno" #: libraries/messages.inc.php:1155 msgid "Last version" -msgstr "" +msgstr "Zadnja različica" #: libraries/messages.inc.php:1156 msgid "Updated" -msgstr "" +msgstr "Posodobljeno" #: libraries/messages.inc.php:1157 msgid "Version" @@ -5143,28 +5154,27 @@ msgstr "Različica" #: libraries/messages.inc.php:1158 msgid "Track these data definition statements:" -msgstr "" +msgstr "Sledi tem stavkom opredeljevanja podatkov:" #: libraries/messages.inc.php:1159 msgid "Track these data manipulation statements:" -msgstr "" +msgstr "Sledi tem stavkom upravljanja s podatki:" #: libraries/messages.inc.php:1160 msgid "Tracked tables" -msgstr "" +msgstr "Sledene tabele" #: libraries/messages.inc.php:1161 msgid "Tracking" -msgstr "" +msgstr "Sledenje" #: libraries/messages.inc.php:1162 -#, fuzzy msgid "Track table" -msgstr "Preveri tabelo" +msgstr "Sledi tabeli" #: libraries/messages.inc.php:1163 msgid "Untracked tables" -msgstr "" +msgstr "Nesledene tabele" #: libraries/messages.inc.php:1164 msgid "Username" @@ -5173,17 +5183,17 @@ msgstr "Uporabniško ime" #: libraries/messages.inc.php:1165 #, php-format msgid "Tracking for %s.%s , version %s is activated." -msgstr "" +msgstr "Sledenje %s.%s, različice %s je aktivirano." #: libraries/messages.inc.php:1166 #, php-format msgid "Version %s is created, tracking for %s.%s is activated." -msgstr "" +msgstr "Različica %s je ustvarjena, sledenje %s.%s je aktivirano." #: libraries/messages.inc.php:1167 #, php-format msgid "Tracking for %s.%s , version %s is deactivated." -msgstr "" +msgstr "Sledenje %s.%s, različice %s je dezaktivirano." #: libraries/messages.inc.php:1168 #, php-format @@ -5284,7 +5294,7 @@ msgstr "" "nastavite na 1, bo s pomočjo htmlspecialchars() pretvoril izhod (Privzeto: " "1). Če nastavite četrti parameter na 1, bo v celico z vsebino (content cell) " "vnesel NOWRAP in tako prikazal celoten izhod brez preoblikovanja (Privzeto: " -"1)" +"1)." #: libraries/messages.inc.php:1182 msgid "" @@ -5578,7 +5588,7 @@ msgstr "imenik za nalaganje datotek" #: libraries/messages.inc.php:1246 msgid "Web server" -msgstr "" +msgstr "Spletni strežnik" #: libraries/messages.inc.php:1247 #, php-format @@ -5772,7 +5782,7 @@ msgstr "" #: setup/lib/messages.inc.php:31 msgid "Bzip2" -msgstr "" +msgstr "Bzip2" #: setup/lib/messages.inc.php:32 #, php-format @@ -6224,16 +6234,15 @@ msgstr "" #: setup/lib/messages.inc.php:144 msgid "SQL queries" -msgstr "SQL-poizvedbe" +msgstr "Poizvedbe SQL" #: setup/lib/messages.inc.php:145 msgid "Customize startup page" -msgstr "" +msgstr "Prilagodi začetno stran" #: setup/lib/messages.inc.php:146 -#, fuzzy msgid "Startup" -msgstr "Stanje" +msgstr "Zagon" #: setup/lib/messages.inc.php:147 msgid "Choose how you want tabs to work" @@ -6768,10 +6777,12 @@ msgid "" "Leave blank for no Designer support, suggested: [kbd]pma_designer_coords[/" "kbd]" msgstr "" +"Pustite prazno, če ne želite podpore Oblikovalnika, predlagano: " +"[kbd]pma_designer_coords[/kbd]" #: setup/lib/messages.inc.php:268 msgid "Designer table" -msgstr "" +msgstr "Tabela Oblikovalnika" #: setup/lib/messages.inc.php:269 msgid "" @@ -6957,7 +6968,7 @@ msgstr "" #: setup/lib/messages.inc.php:308 msgid "Add DROP VIEW" -msgstr "" +msgstr "Dodaj DROP VIEW" #: setup/lib/messages.inc.php:309 msgid "" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2072-gdfa7121
by Michal Čihař 23 Apr '10

23 Apr '10

The branch, master has been updated via dfa712179b024896ea06cfc7b853e80829fef76f (commit) from ae63490dd98695bfc04b0ffff2027fae61b8414f (commit) - Log ----------------------------------------------------------------- commit dfa712179b024896ea06cfc7b853e80829fef76f Author: Michal Čihař <michal(a)cihar.com> Date: Thu Apr 22 20:40:47 2010 +0200 Also this one is used later. ----------------------------------------------------------------------- Summary of changes: tbl_replace.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tbl_replace.php b/tbl_replace.php index 3758811..ffa1574 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -325,7 +325,7 @@ if ($is_insert && count($value_sets) > 0) { . ' (' . implode(', ', $query_fields) . ') VALUES (' . implode('), (', $value_sets) . ')'; unset($insert_command); - unset($query_fields, $value_sets); + unset($query_fields); } elseif (empty($query)) { // No change -> move back to the calling script $message = PMA_Message::success('strNoModification'); hooks/post-receive -- phpMyAdmin

1 0

← Newer
1
2
3
4
5
6
7
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git April 2010