- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_0, updated. RELEASE_3_4_0ALPHA1-1436-g9256a63
by Michal Čihař 30 Nov '10

30 Nov '10

The branch, MAINT_3_4_0 has been updated via 9256a63801569093b60b56d01bf219583f228d3b (commit) via 84b725fc7cbb6ba5464ba2af671f939f2a617a24 (commit) via e098ff878a9cfa26e61725c8fb83e4e1a8ddde9b (commit) via fd203f7ee28c5c6212d2abf6df053e0b4cbc2a04 (commit) via 5d0a9df77ad816c50e5cae6c14bc05f604d64445 (commit) via de62babcd17824f3379bf903d79a8e7a70b75f38 (commit) via ca87c56b4f705bf570fdb2ea11a0479625734a08 (commit) via 30d3f575c9eaaa78fe436d34325409d948fbfdaa (commit) via 03e7980b61e25bfb5b78f7ecc1ee8799a5255103 (commit) via 99b433c4069cd72753bc15f2c632ad96e9df2037 (commit) via 3a8d947b4e127c8f377214e749b57afe2c305831 (commit) via 272f25c4c013884a6c30bb2a2b899e9e453bfebb (commit) via 60261775a17b897f4209227f0c9044506adfec53 (commit) via 8a1e0f0a1c0d15a77c23e282472903fe25d153cc (commit) via b1d119bcdb81acc4cba0b147133c85af40b3c5c0 (commit) via 5a757add178597783ae3456ec9ca937faf7c27d3 (commit) via b02a60f359b81eabe049fb44788a97fd68f35fd1 (commit) via 720d398980b5a097d6a1843902c6459fdaa8b13f (commit) via a69c7ecde39b0a19f382defde3298aad1f5fb8ba (commit) via 56f233eb34425795ae6b520ad56b6dee41be12ba (commit) via 09d6ea35c7250f02b6ac35443920055deeb5ae63 (commit) via 19c487c59cbfa75431b9a4cbdc6a2bb9d8e14098 (commit) via 967d1b28934094f6e4da64f61a947dfaaf264133 (commit) via 4f57326289d79ccb71fc1e256d52bf51ad85c6ef (commit) via bb57ff23a4e057d20e00609cb0477c2520377e80 (commit) via 36275ba290a34fc04550cc1c9780f6e713a92cbe (commit) via 4b002920d21bb79db8ff94b433e6156d8f53eb49 (commit) via 98d6db18bc79bd200d178d2de67896b09573fb22 (commit) via 4b90a5f1026a11dc82e5d2a2fa9b3cf55669fb93 (commit) via 6bd29d56d7bd23415eae8564e12380606b04db45 (commit) via e42f97e3470bf45a1c2c4ea8564dfff730bbb213 (commit) via 1a6529fbd7cd52d4aa64bd81c1460312e7919569 (commit) via 7ef02a7b365ba2555a49c1e0d6d979cf2cf96bd7 (commit) via 2658092530ab5b13e88a75b4cd7a6e8eb70f40ec (commit) via 37bed87be15826aaa2df7a56634bec11f43d094e (commit) via c55b990d92fbc50cf97630e6245c1fb67b86ae58 (commit) via 3f392e6694adf4b42e7b41661519417c04fd08b4 (commit) via 9582d5b983c147b0ee8eea613a4eceb22938e063 (commit) via def864faf19434ff032f67166667d7b06b39eebf (commit) via 9a73ff6a86729433a542d7bd1395e56306434baf (commit) via 0f43323ab48a1c0d131f916cc40892758b0b633f (commit) via e9cf0d549928207584803f84c35988e228791d52 (commit) via 421eddda759285bb0e62dcefd5c91af0cc5a490b (commit) via 6782ab01ff9a3a0c36c7d9f82cf6200037fce762 (commit) via 9fcf41bae1a769068209a43a86a3b19fba80b10b (commit) via 6aaaaeb8b3988e6b5537205d1a23f8a8ccc18959 (commit) via 941a1f5c2859258eb3586c42c3d26202d42c5c9f (commit) via 11eb36d66279bd538397c7bbb64824a0168cc253 (commit) via a9b0b51c0e306a1ca5c1d0f811929efcc014adc2 (commit) via 7b680158bd33f81771c015188311871f9a6ce355 (commit) via 94fb21a48be3c8b798bb4f90d1b5129cca4e541d (commit) via 55a1720964bc39e8742f58af8c4e1c328c8ae8f3 (commit) via d36d0b8b230cde25a66a9f3c38d2a044703bc9b8 (commit) from dff18d6af8c8bbc8ed13cd4032d5cfe4640811ea (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: po/te.po | 139 +++++++++++++++++++++---------------------------------------- 1 files changed, 48 insertions(+), 91 deletions(-) diff --git a/po/te.po b/po/te.po index a3443a3..8226c9a 100644 --- a/po/te.po +++ b/po/te.po @@ -7,15 +7,15 @@ 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-11-20 07:34-0500\n" -"PO-Revision-Date: 2010-05-26 14:20+0200\n" +"PO-Revision-Date: 2010-11-29 17:44+0200\n" "Last-Translator: <veeven(a)gmail.com>\n" "Language-Team: Telugu <te(a)li.org>\n" +"Language: te\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: te\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.1\n" +"X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:36 browse_foreigners.php:57 #: libraries/display_tbl.lib.php:415 server_privileges.php:1594 @@ -171,7 +171,7 @@ msgstr "" #: libraries/tbl_properties.inc.php:105 tbl_printview.php:143 #: tbl_structure.php:202 tbl_tracking.php:271 msgid "Default" -msgstr "" +msgstr "అప్రమేయం" #: db_datadict.php:177 libraries/export/htmlword.php:252 #: libraries/export/latex.php:376 libraries/export/odt.php:314 @@ -969,7 +969,7 @@ msgstr "" #: js/messages.php:45 msgid "This is not a number!" -msgstr "" +msgstr "ఇది సంఖ్య కాదు!" #: js/messages.php:48 msgid "The host name is empty!" @@ -1147,10 +1147,9 @@ msgid "Change Password" msgstr "సంకేతపదం" #: js/messages.php:106 -#, fuzzy #| msgid "Mon" msgid "More" -msgstr "సోమ" +msgstr "మరిన్ని" #. l10n: Display text for calendar close link #: js/messages.php:116 @@ -1176,72 +1175,64 @@ msgstr "తదుపరి" #. l10n: Display text for current month link in calendar #: js/messages.php:122 -#, fuzzy #| msgid "Total" msgid "Today" -msgstr "మొత్తం" +msgstr "ఈరోజు" #: js/messages.php:125 -#, fuzzy #| msgid "Jan" msgid "January" -msgstr "జన" +msgstr "జనవరి" #: js/messages.php:126 msgid "February" -msgstr "" +msgstr "ఫిబ్రవరి" #: js/messages.php:127 -#, fuzzy #| msgid "Mar" msgid "March" msgstr "మార్చి" #: js/messages.php:128 -#, fuzzy #| msgid "Apr" msgid "April" -msgstr "ఏప్రి" +msgstr "ఏప్రిల్" #: js/messages.php:129 msgid "May" msgstr "మే" #: js/messages.php:130 -#, fuzzy #| msgid "Jun" msgid "June" msgstr "జూన్" #: js/messages.php:131 -#, fuzzy #| msgid "Jul" msgid "July" msgstr "జూలై" #: js/messages.php:132 -#, fuzzy #| msgid "Aug" msgid "August" -msgstr "ఆగ" +msgstr "ఆగస్ట్" #: js/messages.php:133 msgid "September" -msgstr "" +msgstr "సెప్టెంబర్" #: js/messages.php:134 -#, fuzzy #| msgid "Oct" msgid "October" -msgstr "అక్టో" +msgstr "అక్టోబర్" #: js/messages.php:135 msgid "November" -msgstr "" +msgstr "నవంబర్" #: js/messages.php:136 msgid "December" -msgstr "" +msgstr "డిసెంబర్" #. l10n: Short month name #: js/messages.php:140 libraries/common.lib.php:1545 @@ -1265,7 +1256,6 @@ msgstr "ఏప్రి" #. l10n: Short month name #: js/messages.php:148 libraries/common.lib.php:1553 -#, fuzzy #| msgid "May" msgctxt "Short month name" msgid "May" @@ -1307,40 +1297,36 @@ msgid "Dec" msgstr "డిసెం" #: js/messages.php:165 -#, fuzzy #| msgid "Sun" msgid "Sunday" -msgstr "ఆది" +msgstr "ఆదివారం" #: js/messages.php:166 -#, fuzzy #| msgid "Mon" msgid "Monday" -msgstr "సోమ" +msgstr "సోమవారం" #: js/messages.php:167 -#, fuzzy #| msgid "Tue" msgid "Tuesday" -msgstr "మంగళ" +msgstr "మంగళవారం" #: js/messages.php:168 msgid "Wednesday" -msgstr "" +msgstr "బుధవారం" #: js/messages.php:169 msgid "Thursday" -msgstr "" +msgstr "గురువారం" #: js/messages.php:170 -#, fuzzy #| msgid "Fri" msgid "Friday" -msgstr "శుక్ర" +msgstr "శుక్రవారం" #: js/messages.php:171 msgid "Saturday" -msgstr "" +msgstr "శనివారం" #. l10n: Short week day name #: js/messages.php:175 libraries/common.lib.php:1570 @@ -1435,20 +1421,18 @@ msgstr "వికీ" #: js/messages.php:207 msgid "Hour" -msgstr "" +msgstr "గంట" # మొదటి అనువాదము #: js/messages.php:208 -#, fuzzy #| msgid "in use" msgid "Minute" -msgstr "వాడుకలో ఉన్నది" +msgstr "నిమిషం" #: js/messages.php:209 -#, fuzzy #| msgid "per second" msgid "Second" -msgstr "క్షణానికి" +msgstr "క్షణం" #: libraries/Config.class.php:1190 tbl_chart.php:159 msgid "Font size" @@ -1553,7 +1537,7 @@ msgstr "" #: libraries/core.lib.php:232 libraries/import.lib.php:136 tbl_change.php:924 #: tbl_operations.php:210 tbl_relation.php:287 view_operations.php:60 msgid "Error" -msgstr "" +msgstr "పొరపాటు" #: libraries/Message.class.php:281 #, php-format @@ -2237,7 +2221,7 @@ msgstr "" #: libraries/config/FormDisplay.class.php:772 #, php-format msgid "maximum %s" -msgstr "" +msgstr "గరిష్ఠం %s" #: libraries/config/FormDisplay.tpl.php:173 msgid "This setting is disabled, it will not be applied to your configuration" @@ -2668,7 +2652,6 @@ msgid "Maximal length of created query" msgstr "" #: libraries/config/messages.inc.php:133 -#, fuzzy #| msgid "Export type" msgid "Export type" msgstr "ఎగుమతి రకం" @@ -2760,10 +2743,9 @@ msgid "Features" msgstr "" #: libraries/config/messages.inc.php:163 -#, fuzzy #| msgid "German" msgid "General" -msgstr "జర్మన్" +msgstr "సాధారణ" #: libraries/config/messages.inc.php:164 msgid "Set some commonly used options" @@ -2827,7 +2809,7 @@ msgstr "" #: libraries/config/messages.inc.php:181 msgid "Microsoft Office" -msgstr "" +msgstr "మైక్రోసాఫ్ట్ ఆఫీస్" #: libraries/config/messages.inc.php:183 msgid "Open Document" @@ -2842,10 +2824,9 @@ msgid "Settings that didn't fit enywhere else" msgstr "" #: libraries/config/messages.inc.php:187 -#, fuzzy #| msgid "Page number:" msgid "Page titles" -msgstr "పుట సంఖ్య:" +msgstr "పుట శీర్షికలు" #: libraries/config/messages.inc.php:188 msgid "" @@ -2880,14 +2861,13 @@ msgid "Basic settings" msgstr "ప్రాధమిక అమరికలు" #: libraries/config/messages.inc.php:194 -#, fuzzy #| msgid "Action" msgid "Authentication" -msgstr "చర్య" +msgstr "అధీకరణ" #: libraries/config/messages.inc.php:195 msgid "Authentication settings" -msgstr "" +msgstr "అధీకరణ అమరికలు" #: libraries/config/messages.inc.php:196 msgid "Server configuration" @@ -3005,10 +2985,9 @@ msgid "Texy! text" msgstr "" #: libraries/config/messages.inc.php:225 -#, fuzzy #| msgid "Warning" msgid "Warnings" -msgstr "హెచ్చరిక" +msgstr "హెచ్చరికలు" #: libraries/config/messages.inc.php:226 msgid "Disable some of the warnings shown by phpMyAdmin" @@ -3353,7 +3332,7 @@ msgstr "" #: libraries/config/messages.inc.php:315 msgid "Natural order" -msgstr "" +msgstr "సహజ క్రమం" #: libraries/config/messages.inc.php:316 libraries/config/messages.inc.php:326 msgid "Use only icons, only text or both" @@ -4207,7 +4186,7 @@ msgstr "" #: libraries/config/user_preferences.forms.php:251 #: libraries/export/htmlword.php:17 msgid "Microsoft Word 2000" -msgstr "" +msgstr "మైక్రోసాఫ్ట్ వర్డ్ 2000" #: libraries/config/setup.forms.php:358 #: libraries/config/user_preferences.forms.php:260 libraries/export/odt.php:21 @@ -4381,10 +4360,9 @@ msgid "Exporting rows in the table \"%s\"" msgstr "" #: libraries/display_export.lib.php:97 -#, fuzzy #| msgid "Export type" msgid "Export Method:" -msgstr "ఎగుమతి రకం" +msgstr "ఎగుమతి పద్ధతి:" # మొదటి అనువాదము #: libraries/display_export.lib.php:137 @@ -4394,10 +4372,9 @@ msgid "Database(s):" msgstr "డేటాబేస్" #: libraries/display_export.lib.php:139 -#, fuzzy #| msgid "Table" msgid "Table(s):" -msgstr "పట్టిక" +msgstr "పట్టిక(లు):" #: libraries/display_export.lib.php:149 msgid "Rows:" @@ -4551,10 +4528,9 @@ msgid "File uploads are not allowed on this server." msgstr "" #: libraries/display_import.lib.php:208 -#, fuzzy #| msgid "Partial Texts" msgid "Partial Import:" -msgstr "పాక్షిక పాఠ్యాలు" +msgstr "పాక్షిక దిగుమతి:" #: libraries/display_import.lib.php:214 #, php-format @@ -4624,17 +4600,16 @@ msgstr "" #: libraries/import/xlsx.php:27 libraries/import/xml.php:25 tbl_select.php:263 #: tbl_structure.php:845 msgid "Options" -msgstr "" +msgstr "ఎంపికలు" #: libraries/display_tbl.lib.php:558 libraries/display_tbl.lib.php:568 -#, fuzzy #| msgid "Partial Texts" msgid "Partial texts" msgstr "పాక్షిక పాఠ్యాలు" #: libraries/display_tbl.lib.php:559 libraries/display_tbl.lib.php:572 msgid "Full texts" -msgstr "" +msgstr "పూర్తి పాఠ్యాలు" #: libraries/display_tbl.lib.php:585 msgid "Relational key" @@ -5614,7 +5589,7 @@ msgstr "" # మొదటి అనువాదము #: libraries/mysql_charsets.lib.php:270 libraries/mysql_charsets.lib.php:360 msgid "Japanese" -msgstr "జాపనీస్" +msgstr "జపనీ" #: libraries/mysql_charsets.lib.php:273 msgid "Latvian" @@ -5793,7 +5768,7 @@ msgstr "SQL చరిత్ర" #: libraries/relation.lib.php:141 msgid "User preferences" -msgstr "" +msgstr "వాడుకరి అభిరుచులు" #: libraries/relation.lib.php:145 msgid "Quick steps to setup advanced features:" @@ -6106,7 +6081,6 @@ msgid "Synchronize" msgstr "" #: libraries/server_links.inc.php:99 -#, fuzzy #| msgid "settings" msgid "Settings" msgstr "అమరికలు" @@ -6477,10 +6451,9 @@ msgid "Error in ZIP archive:" msgstr "" #: main.php:67 -#, fuzzy #| msgid "Basic settings" msgid "General Settings" -msgstr "ప్రాధమిక అమరికలు" +msgstr "సాధారణ అమరికలు" #: main.php:99 msgid "MySQL connection collation" @@ -6501,10 +6474,9 @@ msgid "Choose..." msgstr "" #: main.php:153 prefs_manage.php:274 -#, fuzzy #| msgid "settings" msgid "More settings" -msgstr "అమరికలు" +msgstr "మరిన్ని అమరికలు" #: main.php:170 msgid "Protocol version" @@ -6747,10 +6719,9 @@ msgid "Rename to" msgstr "" #: pmd_general.php:484 pmd_general.php:583 -#, fuzzy #| msgid "User name" msgid "New name" -msgstr "వాడుకరి పేరు" +msgstr "కొత్త పేరు" # మొదటి అనువాదము #: pmd_general.php:487 pmd_general.php:702 @@ -8811,15 +8782,15 @@ msgstr "" #: tbl_chart.php:90 msgid "Width" -msgstr "" +msgstr "వెడల్పు" #: tbl_chart.php:94 msgid "Height" -msgstr "" +msgstr "ఎత్తు" #: tbl_chart.php:98 msgid "Title" -msgstr "" +msgstr "శీర్షిక" #: tbl_chart.php:103 msgid "X Axis label" @@ -9370,7 +9341,6 @@ msgid "Available transformations" msgstr "" #: transformation_overview.php:47 -#, fuzzy #| msgid "Description" msgctxt "for MIME transformation" msgid "Description" @@ -9398,16 +9368,3 @@ msgstr "" #~ msgid "yes" #~ msgstr "అవును" - -#, fuzzy -#~| msgid "End" -#~ msgctxt "BLOB repository" -#~ msgid "Enabled" -#~ msgstr "ముగింపు" - -#~ msgid "and" -#~ msgstr "మరియు" - -#~ msgctxt "$strMIME_description" -#~ msgid "Description" -#~ msgstr "వివరణ" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA1-2842-gad1468c
by Marc Delisle 29 Nov '10

29 Nov '10

The branch, master has been updated via ad1468c8a2a04efa8b144ac8b4da638052a6e868 (commit) via 05931126744134ff1aa13e7104c87d428a756daf (commit) via dff18d6af8c8bbc8ed13cd4032d5cfe4640811ea (commit) from 46b1276052ef6fd88dce0184c3e880b4d695359b (commit) - Log ----------------------------------------------------------------- commit ad1468c8a2a04efa8b144ac8b4da638052a6e868 Merge: 46b1276052ef6fd88dce0184c3e880b4d695359b 05931126744134ff1aa13e7104c87d428a756daf Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 29 13:03:29 2010 -0500 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e63850..b9e81a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -135,8 +135,8 @@ - patch #3117535 [replication] Add quotes to database in initial statement, thanks to Craig Duncan - duncan3dc -3.3.8.1 (2010-10-26) -- bug #3115519 (private) [security] XSS on db search +3.3.8.1 (2010-11-29) +- bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_0ALPHA1-1408-g0593112
by Marc Delisle 29 Nov '10

29 Nov '10

The branch, QA_3_4 has been updated via 05931126744134ff1aa13e7104c87d428a756daf (commit) via dff18d6af8c8bbc8ed13cd4032d5cfe4640811ea (commit) from 1b309ed30a8707f370fa0069dd2286c5eceadc3b (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 637f3b8..ea60343 100644 --- a/ChangeLog +++ b/ChangeLog @@ -135,8 +135,8 @@ - patch #3117535 [replication] Add quotes to database in initial statement, thanks to Craig Duncan - duncan3dc -3.3.8.1 (2010-10-26) -- bug #3115519 (private) [security] XSS on db search +3.3.8.1 (2010-11-29) +- bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_8-20-gbc0b9fa
by Marc Delisle 29 Nov '10

29 Nov '10

The branch, QA_3_3 has been updated via bc0b9fa744bd1b1a7ff460f728248e581ee106f0 (commit) from b1103e2db99405d032a230ed50f0b88b799605a3 (commit) - Log ----------------------------------------------------------------- commit bc0b9fa744bd1b1a7ff460f728248e581ee106f0 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 29 13:01:59 2010 -0500 3.3.8.1 correct release date and PMASA ref ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 41c784f..f25d225 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,8 +14,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - patch #3117535 [replication] Add quotes to database in initial statement, thanks to Craig Duncan - duncan3dc -3.3.8.1 (2010-10-26) -- bug #3115519 (private) [security] XSS on db search +3.3.8.1 (2010-11-29) +- bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_0, updated. RELEASE_3_4_0ALPHA1-1383-gdff18d6
by Marc Delisle 29 Nov '10

29 Nov '10

The branch, MAINT_3_4_0 has been updated via dff18d6af8c8bbc8ed13cd4032d5cfe4640811ea (commit) from 75411c999bb771f8fb71f4b2e92d9adb186c0f52 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5895330..2c791ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -133,8 +133,8 @@ - patch #3117535 [replication] Add quotes to database in initial statement, thanks to Craig Duncan - duncan3dc -3.3.8.1 (2010-10-26) -- bug #3115519 (private) [security] XSS on db search +3.3.8.1 (2010-11-29) +- bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. eba8989fad267c75cf0921aab77bbb038dca3fc2
by Marc Delisle 29 Nov '10

29 Nov '10

The branch, master has been updated via eba8989fad267c75cf0921aab77bbb038dca3fc2 (commit) from 1dba678617085aed739e65fad249327c4290680e (commit) - Log ----------------------------------------------------------------- commit eba8989fad267c75cf0921aab77bbb038dca3fc2 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 29 12:53:44 2010 -0500 PMASA-2010-8 ----------------------------------------------------------------------- Summary of changes: templates/security/{PMASA-2010-7 => PMASA-2010-8} | 23 +++++++++----------- 1 files changed, 10 insertions(+), 13 deletions(-) copy templates/security/{PMASA-2010-7 => PMASA-2010-8} (54%) diff --git a/templates/security/PMASA-2010-7 b/templates/security/PMASA-2010-8 similarity index 54% copy from templates/security/PMASA-2010-7 copy to templates/security/PMASA-2010-8 index 105dcf5..29bd1a1 100644 --- a/templates/security/PMASA-2010-7 +++ b/templates/security/PMASA-2010-8 @@ -1,19 +1,19 @@ <html xmlns:py="http://genshi.edgewall.org/" xmlns:xi="http://www.w3.org/2001/XInclude" py:strip=""> <py:def function="announcement_id"> -PMASA-2010-7 +PMASA-2010-8 </py:def> <py:def function="announcement_date"> -2010-09-08 +2010-11-29 </py:def> <py:def function="announcement_summary"> -XSS attack on setup script. +XSS attack in database search. </py:def> <py:def function="announcement_description"> -It was possible to conduct a XSS attack using spoofed request to setup script. +It was possible to conduct a XSS attack using spoofed request on the db search script. </py:def> <py:def function="announcement_severity"> @@ -21,25 +21,22 @@ We consider this vulnerability to be non critical. </py:def> <py:def function="announcement_affected"> -For 3.x: versions before 3.3.7 are affected. -</py:def> - -<py:def function="announcement_unaffected"> -Branch 2.11.x is not affected by this. +For 3.x: versions before 3.3.8.1 are affected. For 2.11.x: versions before 2.11.11.1 are affected. </py:def> <py:def function="announcement_solution"> -Upgrade to phpMyAdmin 3.3.7 or newer or apply patch listed below. +Upgrade to phpMyAdmin 3.3.8.1 or newer, or 2.11.11.1 if using the 2.11.x family. You can also apply the patch listed below. </py:def> <py:def function="announcement_references"> -Thanks to <a href="http://tenable.com/">Tenable Network Security</a> for reporting this issue. +Thanks to Alexander Opitz for reporting this issue. </py:def> -<py:def function="announcement_cve">CVE-2010-3263</py:def> +<py:def function="announcement_cve">CVE-2010-4329</py:def> <py:def function="announcement_commits"> -73ce5705bd1e0b62060f75702d62f88247ce09dd +4341818d73d454451f024950a4ce0141608ac7f8 +e1f4901ffc400b6d2df15eac0ba5015fe48a27c4 </py:def> <xi:include href="_page.tpl" /> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, updated. RELEASE_3_4_0ALPHA1-22-g3a8a0bb
by Marc Delisle 29 Nov '10

29 Nov '10

The branch, TESTING has been updated via 3a8a0bb72980135e1138ab75b7db49b4f76108a1 (commit) via 150798965d85ee7aee19076a8cd9f8f71770acc7 (commit) via fcc04991533333d18c86b3005967da2d75a56fb9 (commit) via 38547bea51e3ee1b84564dc111c64cc476d2e73c (commit) via 4341818d73d454451f024950a4ce0141608ac7f8 (commit) from c00efbe9888588c5b44cdc429fa59cc8b8157e38 (commit) - Log ----------------------------------------------------------------- commit 3a8a0bb72980135e1138ab75b7db49b4f76108a1 Merge: c00efbe9888588c5b44cdc429fa59cc8b8157e38 150798965d85ee7aee19076a8cd9f8f71770acc7 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 29 12:28:46 2010 -0500 Merge branch 'MAINT_3_3_8' into TESTING ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 +++--- Documentation.html | 4 ++-- README | 7 +++---- libraries/Config.class.php | 2 +- libraries/common.lib.php | 2 +- translators.html | 4 ++-- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a10389..b7274b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -128,6 +128,9 @@ - bug #3077463 [core] Events were not copied when copying/renaming database - bug #1762306 [core] Copy database with view of a view +3.3.8.1 (2010-11-29) +- bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 + 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis - [core] Update library PHPExcel to version 1.7.4 @@ -141,9 +144,6 @@ 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after a page size increase, thanks to Martin Schönberger - mad05 -- bug #3054458 [core] Fixed displaying number of rows. -- bug #3035300 [parser] Fixed wrong definition of keywords. -- [setup] Fixed escaping of server name. 3.3.6.0 (2010-08-28) - bug #3033063 [core] Navi gets wrong db name diff --git a/Documentation.html b/Documentation.html index 848c19e..58538ce 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.0-alpha1 - Documentation</title> + <title>phpMyAdmin 3.3.8.1 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.0-alpha1 + 3.3.8.1 Documentation </h1> </div> diff --git a/README b/README index f08e7b0..74276f7 100644 --- a/README +++ b/README @@ -25,10 +25,9 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2, as published by the Free Software Foundation. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + Version 3.3.8.1 + --------------- + http://www.phpmyadmin.net/ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software diff --git a/libraries/Config.class.php b/libraries/Config.class.php index ae584da..743a729 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.0-alpha1'); + $this->set('PMA_VERSION', '3.3.8.1'); /** * @deprecated */ diff --git a/libraries/common.lib.php b/libraries/common.lib.php index ec5100f..4b194de 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1769,7 +1769,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), $tmp = $tag_params; $tag_params = array(); if (!empty($tmp)) { - $tag_params['onclick'] = 'return confirmLink(this, \'' . $tmp . '\')'; + $tag_params['onclick'] = 'return confirmLink(this, \'' . PMA_escapeJsString($tmp) . '\')'; } unset($tmp); } diff --git a/translators.html b/translators.html index 89bb761..2094e3f 100644 --- a/translators.html +++ b/translators.html @@ -10,7 +10,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.0-alpha1 - Official translators</title> + <title>phpMyAdmin 3.3.8.1 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.0-alpha1 + 3.3.8.1 official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, STABLE, updated. RELEASE_3_3_8_1-9-g19e56ea
by Marc Delisle 29 Nov '10

29 Nov '10

The branch, STABLE has been updated via 19e56eacec926545507d9805b49b34c682e17d0a (commit) via 150798965d85ee7aee19076a8cd9f8f71770acc7 (commit) via fcc04991533333d18c86b3005967da2d75a56fb9 (commit) via 38547bea51e3ee1b84564dc111c64cc476d2e73c (commit) via 4341818d73d454451f024950a4ce0141608ac7f8 (commit) from 8291c2069dd503155f59a6ea4c480fceed998e61 (commit) - Log ----------------------------------------------------------------- commit 19e56eacec926545507d9805b49b34c682e17d0a Merge: 8291c2069dd503155f59a6ea4c480fceed998e61 150798965d85ee7aee19076a8cd9f8f71770acc7 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 29 12:28:46 2010 -0500 Merge branch 'MAINT_3_3_8' into STABLE ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 +++--- Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- libraries/common.lib.php | 2 +- translators.html | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4827fb6..8fad918 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ +3.3.8.1 (2010-11-29) +- bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 + 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis - [core] Update library PHPExcel to version 1.7.4 @@ -18,9 +21,6 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after a page size increase, thanks to Martin Schönberger - mad05 -- bug #3054458 [core] Fixed displaying number of rows. -- bug #3035300 [parser] Fixed wrong definition of keywords. -- [setup] Fixed escaping of server name. 3.3.6.0 (2010-08-28) - bug #3033063 [core] Navi gets wrong db name diff --git a/Documentation.html b/Documentation.html index a233ccd..bf30068 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.8 - Documentation</title> + <title>phpMyAdmin 3.3.8.1 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.8 + 3.3.8.1 Documentation </h1> </div> diff --git a/README b/README index 967acde..d84e8d7 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.8 - ------------- + Version 3.3.8.1 + --------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 6594e3a..8f5c43d 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.8'); + $this->set('PMA_VERSION', '3.3.8.1'); /** * @deprecated */ diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 610438c..b926e92 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1634,7 +1634,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), $tmp = $tag_params; $tag_params = array(); if (!empty($tmp)) { - $tag_params['onclick'] = 'return confirmLink(this, \'' . $tmp . '\')'; + $tag_params['onclick'] = 'return confirmLink(this, \'' . PMA_escapeJsString($tmp) . '\')'; } unset($tmp); } diff --git a/translators.html b/translators.html index 598e218..f390397 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.8 - Official translators</title> + <title>phpMyAdmin 3.3.8.1 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.8 + 3.3.8.1 official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_3_3_8_1, created. RELEASE_3_3_8_1
by Marc Delisle 29 Nov '10

29 Nov '10

The annotated tag, RELEASE_3_3_8_1 has been created at 9e8536cca8c7a97dc29c96ac838b7fa8400606a5 (tag) tagging 150798965d85ee7aee19076a8cd9f8f71770acc7 (commit) replaces RELEASE_3_3_8 tagged by Marc Delisle on Mon Nov 29 12:28:45 2010 -0500 - Log ----------------------------------------------------------------- Released 3.3.8.1 Herman van Rink (1): bug #3115519: fixed XSS on search Marc Delisle (3): ChangeLog for XSS fix 3.3.8.1 release 3.3.8.1 release date and PMASA ref ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_2_11_11_1, created. RELEASE_2_11_11_1
by Marc Delisle 29 Nov '10

29 Nov '10

The annotated tag, RELEASE_2_11_11_1 has been created at 14af0f77e983a3ebce39749b0dfc6f780888dd4e (tag) tagging 61d9e561580ccb4a07d6d0c5695c839a22cc3b78 (commit) replaces RELEASE_2_11_11 tagged by Marc Delisle on Mon Nov 29 12:18:56 2010 -0500 - Log ----------------------------------------------------------------- Released 2.11.11.1 Herman van Rink (1): bug #3115519: fixed XSS on search Marc Delisle (3): ChangeLog for XSS search 2.11.11.1 release 2.11.11.1 release date and PMASA ref ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0