- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_5, created. RELEASE_3_4_4-34-g15f887a
by Marc Delisle 02 Sep '11

02 Sep '11

The branch, MAINT_3_4_5 has been created at 15f887a979a1a6323b9a7d50f0462c63f489e954 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-18356-g77e5cc3
by Piotr Przybylski 02 Sep '11

02 Sep '11

The branch, master has been updated via 77e5cc3e8a6082dbc300080fedc14b581df59f4d (commit) from 9611e049c331fd6caa03e2b481b527bd9f7c22af (commit) - Log ----------------------------------------------------------------- commit 77e5cc3e8a6082dbc300080fedc14b581df59f4d Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Sep 2 17:02:21 2011 +0200 Changed slider to use fixed-size 'blind' animation instead of 'slide' ----------------------------------------------------------------------- Summary of changes: js/functions.js | 46 +++++++++++++++++++++++++++++----------------- 1 files changed, 29 insertions(+), 17 deletions(-) diff --git a/js/functions.js b/js/functions.js index cae7ed4..c63a3d0 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2774,13 +2774,12 @@ function PMA_getRowNumber(classlist) /** * Changes status of slider */ -function PMA_set_status_label(id) +function PMA_set_status_label($element) { - if ($('#' + id).css('display') == 'none') { - $('#anchor_status_' + id).text('+ '); - } else { - $('#anchor_status_' + id).text('- '); - } + var text = $element.css('display') == 'none' + ? '+ ' + : '- '; + $element.closest('.slide-wrapper').prev().find('span').text(text); } /** @@ -2788,21 +2787,34 @@ function PMA_set_status_label(id) */ function PMA_init_slider() { - $('.pma_auto_slider').each(function(idx, e) { - if ($(e).hasClass('slider_init_done')) return; - $(e).addClass('slider_init_done'); - $('<span id="anchor_status_' + e.id + '"></span>') - .insertBefore(e); - PMA_set_status_label(e.id); - - $('<a href="#' + e.id + '" id="anchor_' + e.id + '">' + e.title + '</a>') - .insertBefore(e) + $('.pma_auto_slider').each(function() { + var $this = $(this); + + if ($this.hasClass('slider_init_done')) { + return; + } + $this.addClass('slider_init_done'); + + var $wrapper = $('<div>', {'class': 'slide-wrapper'}).css('height', $this.outerHeight(true)); + $wrapper.toggle($this.is(':visible')); + $('<a>', {href: '#'+this.id}) + .text(this.title) + .prepend($('<span>')) + .insertBefore($this) .click(function() { - $('#' + e.id).toggle('clip', function() { - PMA_set_status_label(e.id); + var $wrapper = $this.closest('.slide-wrapper'); + var visible = $this.is(':visible'); + if (!visible) { + $wrapper.show(); + } + $this[visible ? 'hide' : 'show']('blind', function() { + $wrapper.toggle(!visible); + PMA_set_status_label($this); }); return false; }); + $this.wrap($wrapper); + PMA_set_status_label($this); }); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-18355-g9611e04
by Dieter Adriaenssens 02 Sep '11

02 Sep '11

The branch, master has been updated via 9611e049c331fd6caa03e2b481b527bd9f7c22af (commit) from f4f3d46989cc18f1ccfbca193788bd4de0018305 (commit) - Log ----------------------------------------------------------------- commit 9611e049c331fd6caa03e2b481b527bd9f7c22af Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Fri Sep 2 15:48:15 2011 +0200 typos ----------------------------------------------------------------------- Summary of changes: libraries/database_interface.lib.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index c346111..37103f9 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -1063,7 +1063,7 @@ function PMA_DBI_get_columns($database, $table, $column = null, $full = false, $ } /** -* Returns SQL for fetching informatin on table indexes (SHOW INDEXES) +* Returns SQL for fetching information on table indexes (SHOW INDEXES) * * @param string $database name of database * @param string $table name of the table whose indexes are to be retreived @@ -1104,10 +1104,10 @@ function PMA_DBI_get_table_indexes_sql($database, $table, $where = null) } /** -* Returns indexes od a table +* Returns indexes of a table * * @param string $database name of database -* @param string $table name of the table whose indexes are to be retreived +* @param string $table name of the table whose indexes are to be retrieved * @param mixed $link mysql link resource * @return array $indexes */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-18354-gf4f3d46
by Piotr Przybylski 02 Sep '11

02 Sep '11

The branch, master has been updated via f4f3d46989cc18f1ccfbca193788bd4de0018305 (commit) from f6da9031f9ac6545c87422cb6dd5fd271be6419d (commit) - Log ----------------------------------------------------------------- commit f4f3d46989cc18f1ccfbca193788bd4de0018305 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Sep 2 15:21:18 2011 +0200 length is unknown for geometry fields, make enough space to edit very simple WKTs (text fields were 4 characters wide) ----------------------------------------------------------------------- Summary of changes: tbl_change.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tbl_change.php b/tbl_change.php index 6024d80..5395dda 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -458,6 +458,10 @@ foreach ($rows as $row_id => $vrow) { if (-1 === $field['len']) { $field['len'] = PMA_DBI_field_len($vresult, $i); + // length is unknown for geometry fields, make enough space to edit very simple WKTs + if (-1 === $field['len']) { + $field['len'] = 30; + } } //Call validation when the form submited... $unnullify_trigger = $chg_evt_handler . "=\"return verificationsAfterFieldChange('". PMA_escapeJsString($field['Field_md5']) . "', '" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-18353-gf6da903
by Michal Čihař 01 Sep '11

01 Sep '11

The branch, master has been updated via f6da9031f9ac6545c87422cb6dd5fd271be6419d (commit) via dc6b7e7b68eb4ed5ad9a8d4aa5b6a4d24f221b9f (commit) via 30a3d9610233f3ea179781e18edb52e372d6fcdd (commit) via 1aee51de7dd73c6781b2fbacd3db936ae8c68218 (commit) from a2093e66e2189756057f152223b64aee8b495d71 (commit) - Log ----------------------------------------------------------------- commit f6da9031f9ac6545c87422cb6dd5fd271be6419d Merge: a2093e6 dc6b7e7 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Sep 1 14:45:43 2011 +0200 Merge remote-tracking branch 'pootle/master' commit dc6b7e7b68eb4ed5ad9a8d4aa5b6a4d24f221b9f Merge: 30a3d96 1b8b7a9 Author: Pootle server <pootle(a)cihar.com> Date: Thu Sep 1 14:40:25 2011 +0200 Merge remote-tracking branch 'origin/master' commit 30a3d9610233f3ea179781e18edb52e372d6fcdd Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Sep 1 11:59:42 2011 +0200 Translation update done using Pootle. commit 1aee51de7dd73c6781b2fbacd3db936ae8c68218 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Sep 1 11:54:10 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index 2c43ee1..aaf5ead 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-31 10:47+0200\n" -"PO-Revision-Date: 2011-08-26 15:17+0200\n" +"PO-Revision-Date: 2011-09-01 11:59+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -2200,10 +2200,10 @@ msgid "Remove \"./config\" directory before using phpMyAdmin!" msgstr "phpMyAdmin'den önce kullanılan \"./config\" dizinini kaldır!" #: libraries/Config.class.php:727 -#, fuzzy, php-format +#, php-format #| msgid "Existing configuration file (%d) is not readable." msgid "Existing configuration file (%s) is not readable." -msgstr "Mevcut yapılandırma dosyası (%d) okunabilir değil." +msgstr "Mevcut yapılandırma dosyası (%s) okunabilir değil." #: libraries/Config.class.php:752 msgid "Wrong permissions on configuration file, should not be world writable!" @@ -2427,6 +2427,9 @@ msgid "" "after you refresh this page. Please check if the table structure has been " "changed." msgstr "" +"KA özelliği \"%s\" kaydedilemiyor. Yapılan değişiklikler bu sayfayı " +"yenilemenizden sonra kalıcı olmayacaktır. Eğer tablo yapısı değiştirilmişse " +"lütfen kontrol edin." #: libraries/Theme.class.php:145 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-18349-ga2093e6
by Piotr Przybylski 01 Sep '11

01 Sep '11

The branch, master has been updated via a2093e66e2189756057f152223b64aee8b495d71 (commit) from 1b8b7a9b93ba889c23733e86225ce82d853c40b3 (commit) - Log ----------------------------------------------------------------- commit a2093e66e2189756057f152223b64aee8b495d71 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Sep 1 14:42:09 2011 +0200 bugfix: makegrid broke styling of rows with conditions in table search ----------------------------------------------------------------------- Summary of changes: js/makegrid.js | 28 ++++++++++++++++++---------- themes/original/css/theme_right.css.php | 4 +--- themes/pmahomme/css/theme_right.css.php | 26 ++++++++++++++++++++++---- 3 files changed, 41 insertions(+), 17 deletions(-) diff --git a/js/makegrid.js b/js/makegrid.js index f559677..c1b796a 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -246,11 +246,21 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi reposRsz: function() { $(g.cRsz).find('div').hide(); var $firstRowCols = $(g.t).find('tr:first th.draggable:visible'); + var $resizeHandles = $(g.cRsz).find('div').removeClass('condition'); + $('.pma_table').find('thead th:first').removeClass('before-condition'); for (var n = 0; n < $firstRowCols.length; n++) { var $col = $($firstRowCols[n]); - $cb = $(g.cRsz).find('div:eq(' + n + ')'); // column border - $cb.css('left', $col.position().left + $col.outerWidth(true)) + $($resizeHandles[n]).css('left', $col.position().left + $col.outerWidth(true)) .show(); + if ($($firstRowCols[n]).hasClass('condition')) { + $($resizeHandles[n]).addClass('condition'); + if (n > 0) { + $($resizeHandles[n-1]).addClass('condition'); + } + } + } + if ($($resizeHandles[0]).hasClass('condition')) { + $('.pma_table').find('thead th:first').addClass('before-condition'); } $(g.cRsz).css('height', $(g.t).height()); }, @@ -431,9 +441,10 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi } // hide the hint if no text and the event is mouseenter - g.qtip.disable(!text && e.type == 'mouseenter'); - - g.qtip.updateContent(text, false); + if (g.qtip) { + g.qtip.disable(!text && e.type == 'mouseenter'); + g.qtip.updateContent(text, false); + } } else { g.hideHint(); } @@ -531,7 +542,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi * Reposition the column visibility drop-down arrow. */ reposDrop: function() { - $th = $(t).find('th:not(.draggable)'); + var $th = $(t).find('th:not(.draggable)'); for (var i = 0; i < $th.length; i++) { var $cd = $(g.cDrop).find('div:eq(' + i + ')'); // column drop-down arrow var pos = $($th[i]).position(); @@ -1446,7 +1457,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi var $firstRowCols = $(g.t).find('tr:first th.draggable'); // initialize column visibility - $col_visib = $('#col_visib'); // check if column visibility is passed from PHP + var $col_visib = $('#col_visib'); // check if column visibility is passed from PHP if ($col_visib.length > 0) { g.colVisib = $col_visib.val().split(','); for (var i = 0; i < g.colVisib.length; i++) { @@ -1459,9 +1470,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi } } - // get data columns in the first row of the table - var $firstRowCols = $(t).find('tr:first th.draggable'); - // make sure we have more than one column if ($firstRowCols.length > 1) { var $colVisibTh = $(g.t).find('th:not(.draggable)'); diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 28c8d6c..260869b 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -388,8 +388,6 @@ table tr.hover th { /** * marks table rows/cells if the db field is in a where condition */ -tr.condition th, -tr.condition td, td.condition, th.condition { border: 1px solid <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>; @@ -2295,7 +2293,7 @@ span.CodeMirror-selected { border-right: solid 1px #FFFFFF; cursor: col-resize; height: 100%; - margin-left: -6px; + margin-left: -5px; position: absolute; width: 5px; } diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 53cde00..508e4f4 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -553,13 +553,31 @@ table tr.hover th { /** * marks table rows/cells if the db field is in a where condition */ -tr.condition th, -tr.condition td, -td.condition, +.condition { + border-color: <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?> !important; +} + th.condition { - border: 1px solid <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>; + border-width: 1px 1px 0 1px; + border-style: solid; } +td.condition { + border-width: 0 1px 0 1px; + border-style: solid; +} + +tr:last-child td.condition { + border-width: 0 1px 1px 1px; +} + +<?php if ($GLOBALS['text_dir'] === 'ltr') { ?> +/* for first th which must have right border set (ltr only) */ +.before-condition { + border-right: 1px solid <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>; +} +<?php } ?> + /** * cells with the value NULL */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-18348-g1b8b7a9
by Michal Čihař 01 Sep '11

01 Sep '11

The branch, master has been updated via 1b8b7a9b93ba889c23733e86225ce82d853c40b3 (commit) from 46c5bfc01d60d1ebb638b591a595a0a877d139b8 (commit) - Log ----------------------------------------------------------------- commit 1b8b7a9b93ba889c23733e86225ce82d853c40b3 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Sep 1 14:29:39 2011 +0200 This is not needed as well ----------------------------------------------------------------------- Summary of changes: libraries/core.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/core.lib.php b/libraries/core.lib.php index acedea4..cdf44ee 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -579,8 +579,8 @@ function PMA_download_header($filename, $mimetype, $length = 0, $no_cache = true } /* Replace all possibly dangerous chars in filename */ $filename = str_replace(array(';', '"', "\n", "\r"), '-', $filename); - header('Content-Description: File Transfer'); if (!empty($filename)) { + header('Content-Description: File Transfer'); header('Content-Disposition: attachment; filename="' . $filename . '"'); } header('Content-Type: ' . $mimetype); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-18347-g46c5bfc
by Michal Čihař 01 Sep '11

01 Sep '11

The branch, master has been updated via 46c5bfc01d60d1ebb638b591a595a0a877d139b8 (commit) via 91fb4888e2012582605329abdb31069472375d54 (commit) from e9dc6ff63e283ea5c20c36ed51fc8b33ec7f8a20 (commit) - Log ----------------------------------------------------------------- commit 46c5bfc01d60d1ebb638b591a595a0a877d139b8 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Sep 1 14:29:03 2011 +0200 Fix transformation without download commit 91fb4888e2012582605329abdb31069472375d54 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Sep 1 14:27:59 2011 +0200 Fix parameter order ----------------------------------------------------------------------- Summary of changes: libraries/core.lib.php | 7 +++++-- transformation_wrapper.php | 6 +----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libraries/core.lib.php b/libraries/core.lib.php index b4905c9..acedea4 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -564,7 +564,8 @@ function PMA_no_cache_header() /** * Sends header indicating file download. * - * @param string $filename Filename to include in headers. + * @param string $filename Filename to include in headers if empty, + * none Content-Disposition header will be sent. * @param string $mimetype MIME type to include in headers. * @param int $length Length of content (optional) * @param bool $no_cache Whether to include no-caching headers. @@ -579,7 +580,9 @@ function PMA_download_header($filename, $mimetype, $length = 0, $no_cache = true /* Replace all possibly dangerous chars in filename */ $filename = str_replace(array(';', '"', "\n", "\r"), '-', $filename); header('Content-Description: File Transfer'); - header('Content-Disposition: attachment; filename="' . $filename . '"'); + if (!empty($filename)) { + header('Content-Disposition: attachment; filename="' . $filename . '"'); + } header('Content-Type: ' . $mimetype); header('Content-Transfer-Encoding: binary'); if ($length > 0) { diff --git a/transformation_wrapper.php b/transformation_wrapper.php index 1c5e16a..5d94c37 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -65,11 +65,7 @@ if (isset($ct) && !empty($ct)) { $mime_type = (isset($mime_map[$transform_key]['mimetype']) ? str_replace('_', '/', $mime_map[$transform_key]['mimetype']) : $default_ct) . (isset($mime_options['charset']) ? $mime_options['charset'] : ''); } -if (empty($cn)) { - $cn = 'download.bin'; -} - -PMA_download_header($mime_type, $cn); +PMA_download_header($cn, $mime_type); if (! isset($resize)) { echo $row[$transform_key]; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-18345-ge9dc6ff
by Michal Čihař 01 Sep '11

01 Sep '11

The branch, master has been updated via e9dc6ff63e283ea5c20c36ed51fc8b33ec7f8a20 (commit) via 6851d29abf511b3ddf8fcf110077944b8a87f3d4 (commit) via 2f67ecdfd8d4bb27b06ec1500a6181b7ca1a62bb (commit) via 1d2f60871609711abd6821898b8025c68a7c7540 (commit) via 29951a706027068ad4d676e67c2463e72a4bccf2 (commit) via 6925d317c29b3650ddbf551d0170e1085984e949 (commit) via c6251ac117bad191e2a46c8fba477c7e92fe0883 (commit) via d6589baf08dee9287a915e51da7ae6e07a92129c (commit) via 1ed76871006cbce99134603c236d6497f356efd7 (commit) via ca04a6170b17ee80ab73437a13bc9c60603f93b5 (commit) via e130b38bc94b54634c131d745b5c7b589df04447 (commit) via 3d44788bb70e06b424c7f48adb3c6a2df9b51f4b (commit) via 2d83b023f62c849eb7974dcf5bd0d9642868f1b7 (commit) from 02e009cd9d9d333bd8dd71a0264c3b24fa7b861f (commit) - Log ----------------------------------------------------------------- commit e9dc6ff63e283ea5c20c36ed51fc8b33ec7f8a20 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Aug 31 22:33:42 2011 +0200 Translation update done using Pootle. commit 6851d29abf511b3ddf8fcf110077944b8a87f3d4 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Aug 31 22:32:38 2011 +0200 Translation update done using Pootle. commit 2f67ecdfd8d4bb27b06ec1500a6181b7ca1a62bb Author: stefan <stefan(a)inkopsforum.se> Date: Wed Aug 31 22:31:41 2011 +0200 Translation update done using Pootle. commit 1d2f60871609711abd6821898b8025c68a7c7540 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Aug 31 22:29:07 2011 +0200 Translation update done using Pootle. commit 29951a706027068ad4d676e67c2463e72a4bccf2 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Aug 31 22:27:22 2011 +0200 Translation update done using Pootle. commit 6925d317c29b3650ddbf551d0170e1085984e949 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Aug 31 22:26:02 2011 +0200 Translation update done using Pootle. commit c6251ac117bad191e2a46c8fba477c7e92fe0883 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Aug 31 22:24:33 2011 +0200 Translation update done using Pootle. commit d6589baf08dee9287a915e51da7ae6e07a92129c Author: stefan <stefan(a)inkopsforum.se> Date: Wed Aug 31 22:23:31 2011 +0200 Translation update done using Pootle. commit 1ed76871006cbce99134603c236d6497f356efd7 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Aug 31 22:22:40 2011 +0200 Translation update done using Pootle. commit ca04a6170b17ee80ab73437a13bc9c60603f93b5 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Aug 31 22:20:22 2011 +0200 Translation update done using Pootle. commit e130b38bc94b54634c131d745b5c7b589df04447 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Aug 31 22:19:13 2011 +0200 Translation update done using Pootle. commit 3d44788bb70e06b424c7f48adb3c6a2df9b51f4b Author: stefan <stefan(a)inkopsforum.se> Date: Wed Aug 31 22:16:52 2011 +0200 Translation update done using Pootle. commit 2d83b023f62c849eb7974dcf5bd0d9642868f1b7 Author: stefan <stefan(a)inkopsforum.se> Date: Wed Aug 31 22:13:06 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/sv.po | 34 ++++++++++++++++++++++------------ 1 files changed, 22 insertions(+), 12 deletions(-) diff --git a/po/sv.po b/po/sv.po index c2dd0ea..245d09f 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-31 10:47+0200\n" -"PO-Revision-Date: 2011-08-31 01:05+0200\n" +"PO-Revision-Date: 2011-08-31 22:33+0200\n" "Last-Translator: <stefan(a)inkopsforum.se>\n" "Language-Team: swedish <sv(a)li.org>\n" "Language: sv\n" @@ -2192,10 +2192,10 @@ msgid "Remove \"./config\" directory before using phpMyAdmin!" msgstr "Ta bort \"./config\" katalogen innan du använder phpMyAdmin!" #: libraries/Config.class.php:727 -#, fuzzy, php-format +#, php-format #| msgid "Existing configuration file (%d) is not readable." msgid "Existing configuration file (%s) is not readable." -msgstr "Befintlig konfigurationsfil (%d) kan inte läsas." +msgstr "Befintlig konfigurationsfil (%s) är inte läsbar." #: libraries/Config.class.php:752 msgid "Wrong permissions on configuration file, should not be world writable!" @@ -2422,6 +2422,9 @@ msgid "" "after you refresh this page. Please check if the table structure has been " "changed." msgstr "" +"Kan inte spara UI attribut \"%s\". Ändringarna kommer inte vara beständiga " +"efter att du uppdaterar denna sida. Kontrollera om tabellens struktur har " +"förändrats." #: libraries/Theme.class.php:145 #, php-format @@ -11816,28 +11819,31 @@ msgstr "Andel långsamma frågor" msgid "" "There is a lot of slow queries compared to the overall amount of Queries." msgstr "" +"Det är många långsamma frågor i förhållande till det totala antalet frågor." #: po/advisory_rules.php:17 po/advisory_rules.php:22 msgid "" "You might want to increase {long_query_time} or optimize the queries listed " "in the slow query log" msgstr "" +"Du kanske vill öka {long_query_time} eller optimera de frågor som anges i " +"den långsamma sökfrågeloggen" #: po/advisory_rules.php:18 #, php-format msgid "The slow query rate should be below 5%%, your value is %s%%." -msgstr "" +msgstr "Den långsamma frågeraten bör vara under 5%% ditt värde är %s%%." #: po/advisory_rules.php:20 -#, fuzzy #| msgid "Flush query cache" msgid "Slow query rate" -msgstr "Rensa frågecache" +msgstr "Långsam frågetakt" #: po/advisory_rules.php:21 msgid "" "There is a high percentage of slow queries compared to the server uptime." msgstr "" +"Det finns en stor andel av långsamma frågor jämfört med serverns upptid." #: po/advisory_rules.php:23 #, php-format @@ -11845,36 +11851,40 @@ msgid "" "You have a slow query rate of %s per hour, you should have less than 1%% per " "hour." msgstr "" +"Du har en långsam frågehastighet av %s per timme, du bör ha mindre än 1%% " +"per timme." #: po/advisory_rules.php:25 -#, fuzzy #| msgid "SQL queries" msgid "Long query time" -msgstr "SQL-frågor" +msgstr "Läng söktid" #: po/advisory_rules.php:26 msgid "" "long_query_time is set to 10 seconds or more, thus only slow queries that " "take above 10 seconds are logged." msgstr "" +"long_query_time är satt till 10 sekunder eller längre, alltså endast " +"långsamma frågor som tar över 10 sekunder blir loggade." #: po/advisory_rules.php:27 msgid "" "It is suggested to set {long_query_time} to a lower value, depending on your " "environment. Usually a value of 1-5 seconds is suggested." msgstr "" +"Det rekommendera att sätta {ong_query_time} till ett lägre värde, beroende " +"på din miljö. Ett värde på 1-5 sekunder är lämpligt." #: po/advisory_rules.php:28 -#, fuzzy, php-format +#, php-format #| msgid "long_query_time is set to %d second(s)." msgid "long_query_time is currently set to %ds." -msgstr "long_query_time är definerad till %d sekund(er)." +msgstr "long_query_time är för närvarande satt till %ds." #: po/advisory_rules.php:30 -#, fuzzy #| msgid "Show query box" msgid "Slow query logging" -msgstr "Visa frågerutan" +msgstr "Långsam frågeloggning" #: po/advisory_rules.php:31 #, fuzzy hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_4-34-g15f887a
by Marc Delisle 31 Aug '11

31 Aug '11

The branch, QA_3_4 has been updated via 15f887a979a1a6323b9a7d50f0462c63f489e954 (commit) from 7ed2f6f3624395193a8264183c8462e85c12b52c (commit) - Log ----------------------------------------------------------------- commit 15f887a979a1a6323b9a7d50f0462c63f489e954 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Aug 17 13:32:27 2011 +0200 Avoid loading themes from non directories, . and .. ----------------------------------------------------------------------- Summary of changes: libraries/Theme_Manager.class.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index 4ca8517..31163d1 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -231,6 +231,10 @@ class PMA_Theme_Manager if ($handleThemes = opendir($this->getThemesPath())) { // check for themes directory while (false !== ($PMA_Theme = readdir($handleThemes))) { + // Skip non dirs, . and .. + if ($PMA_Theme == '.' || $PMA_Theme == '..' || ! is_dir($this->getThemesPath() . '/' . $PMA_Theme)) { + continue; + } if (array_key_exists($PMA_Theme, $this->themes)) { // this does nothing! //$this->themes[$PMA_Theme] = $this->themes[$PMA_Theme]; hooks/post-receive -- phpMyAdmin

1 0