- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11421-g4925260
by Marc Delisle 21 Jul '11

21 Jul '11

The branch, master has been updated via 4925260d959d8bd7194b912ddd1317c71f7cc42b (commit) from e62d62fa124328df9d22f4d1e794148325e8d207 (commit) - Log ----------------------------------------------------------------- commit 4925260d959d8bd7194b912ddd1317c71f7cc42b Author: Tyron Madlener <tyronx(a)gmail.com> Date: Thu Jul 21 13:15:12 2011 -0400 Call to a renamed function ----------------------------------------------------------------------- Summary of changes: js/server_status.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/server_status.js b/js/server_status.js index ac4071c..4a61bfe 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -368,7 +368,7 @@ $(function() { switch(tab.attr('id')) { case 'statustabs_traffic': if(data != null) tab.find('.tabInnerContent').html(data); - initTooltips(); + PMA_convertFootnotesToTooltips(); break; case 'statustabs_queries': if(data != null) { @@ -1677,4 +1677,4 @@ $(function() { $(this).hide(); }); -}); \ No newline at end of file +}); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11420-ge62d62f
by Madhura Jayaratne 21 Jul '11

21 Jul '11

The branch, master has been updated via e62d62fa124328df9d22f4d1e794148325e8d207 (commit) via 498d53f17787fe37c8adf121fb071712c5c4e587 (commit) via de5c41d5372146803e0b97fcbb20d983c38d6459 (commit) via 96140680eeed6858d708d51532f9aec8bdd0d195 (commit) from c7c532e1f335079fe65cac3f30adae1b1ddb8e34 (commit) - Log ----------------------------------------------------------------- commit e62d62fa124328df9d22f4d1e794148325e8d207 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Jul 21 21:50:55 2011 +0530 Add package name commit 498d53f17787fe37c8adf121fb071712c5c4e587 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Jul 21 21:45:27 2011 +0530 Keep 1 space after the longest variable name commit de5c41d5372146803e0b97fcbb20d983c38d6459 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Jul 21 21:44:30 2011 +0530 Line length commit 96140680eeed6858d708d51532f9aec8bdd0d195 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Jul 21 21:29:14 2011 +0530 Indicate that these methods returns nothing ----------------------------------------------------------------------- Summary of changes: libraries/gis/pma_gis_factory.php | 2 +- libraries/gis/pma_gis_geometry.php | 33 +++++++++++++++---------- libraries/gis/pma_gis_geometrycollection.php | 5 ++- libraries/gis/pma_gis_linestring.php | 10 ++++--- libraries/gis/pma_gis_multilinestring.php | 10 ++++--- libraries/gis/pma_gis_multipoint.php | 10 ++++--- libraries/gis/pma_gis_multipolygon.php | 8 ++++-- libraries/gis/pma_gis_point.php | 12 +++++---- libraries/gis/pma_gis_polygon.php | 5 ++- libraries/gis/pma_gis_visualization.php | 19 +++++++++++++- 10 files changed, 74 insertions(+), 40 deletions(-) diff --git a/libraries/gis/pma_gis_factory.php b/libraries/gis/pma_gis_factory.php index 7dd1dae..73e6c4c 100644 --- a/libraries/gis/pma_gis_factory.php +++ b/libraries/gis/pma_gis_factory.php @@ -2,7 +2,7 @@ /** * Factory class that handles the creation of geometric objects. * - * @package phpMyAdmin + * @package phpMyAdmin-GIS */ class PMA_GIS_Factory { diff --git a/libraries/gis/pma_gis_geometry.php b/libraries/gis/pma_gis_geometry.php index 8decdcc..787eaf3 100644 --- a/libraries/gis/pma_gis_geometry.php +++ b/libraries/gis/pma_gis_geometry.php @@ -2,7 +2,7 @@ /** * Base class for all GIS data type classes. * - * @package phpMyAdmin + * @package phpMyAdmin-GIS */ abstract class PMA_GIS_Geometry { @@ -45,13 +45,14 @@ abstract class PMA_GIS_Geometry public abstract function prepareRowAsPdf($spatial, $label, $color, $scale_data, $pdf); /** - * Prepares the JavaScript related to a row in the GIS dataset to visualize it with OpenLayers. + * Prepares the JavaScript related to a row in the GIS dataset + * to visualize it with OpenLayers. * - * @param string $spatial GIS data object - * @param int $srid Spatial reference ID - * @param string $label Label for the GIS data object - * @param string $color Color for the GIS data object - * @param array $scale_data Array containing data related to scaling + * @param string $spatial GIS data object + * @param int $srid Spatial reference ID + * @param string $label Label for the GIS data object + * @param string $color Color for the GIS data object + * @param array $scale_data Array containing data related to scaling * * @return the JavaScript related to a row in the GIS dataset */ @@ -77,9 +78,11 @@ abstract class PMA_GIS_Geometry protected function getBoundsForOl($srid, $scale_data) { return 'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.LonLat(' - . $scale_data['minX'] . ', ' . $scale_data['minY'] . ').transform(new OpenLayers.Projection("EPSG:' + . $scale_data['minX'] . ', ' . $scale_data['minY'] + . ').transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject())); bound.extend(new OpenLayers.LonLat(' - . $scale_data['maxX'] . ', ' . $scale_data['maxY'] . ').transform(new OpenLayers.Projection("EPSG:' + . $scale_data['maxX'] . ', ' . $scale_data['maxY'] + . ').transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()));'; } @@ -173,8 +176,10 @@ abstract class PMA_GIS_Geometry $points_arr = $this->extractPoints($polygon, null); $row .= 'new OpenLayers.Geometry.LinearRing(new Array('; foreach ($points_arr as $point) { - $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] . '))' - . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()), '; + $row .= '(new OpenLayers.Geometry.Point(' + . $point[0] . ', ' . $point[1] . '))' + . '.transform(new OpenLayers.Projection("EPSG:' + . $srid . '"), map.getProjectionObject()), '; } $row = substr($row, 0, strlen($row) - 2); $row .= '))'; @@ -185,8 +190,10 @@ abstract class PMA_GIS_Geometry $points_arr = $this->extractPoints($ring, null); $row .= 'new OpenLayers.Geometry.LinearRing(new Array('; foreach ($points_arr as $point) { - $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] . '))' - . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()), '; + $row .= '(new OpenLayers.Geometry.Point(' + . $point[0] . ', ' . $point[1] . '))' + . '.transform(new OpenLayers.Projection("EPSG:' + . $srid . '"), map.getProjectionObject()), '; } $row = substr($row, 0, strlen($row) - 2); $row .= ')), '; diff --git a/libraries/gis/pma_gis_geometrycollection.php b/libraries/gis/pma_gis_geometrycollection.php index ca48f08..a3da6bf 100644 --- a/libraries/gis/pma_gis_geometrycollection.php +++ b/libraries/gis/pma_gis_geometrycollection.php @@ -2,7 +2,7 @@ /** * Handles the visualization of GIS GEOMETRYCOLLECTION objects. * - * @package phpMyAdmin + * @package phpMyAdmin-GIS */ class PMA_GIS_Geometrycollection extends PMA_GIS_Geometry { @@ -165,7 +165,8 @@ class PMA_GIS_Geometrycollection extends PMA_GIS_Geometry } /** - * Prepares JavaScript related to a row in the GIS dataset to visualize it with OpenLayers. + * Prepares JavaScript related to a row in the GIS dataset + * to visualize it with OpenLayers. * * @param string $spatial GIS GEOMETRYCOLLECTION object * @param int $srid Spatial reference ID diff --git a/libraries/gis/pma_gis_linestring.php b/libraries/gis/pma_gis_linestring.php index dad4f9b..97113b7 100644 --- a/libraries/gis/pma_gis_linestring.php +++ b/libraries/gis/pma_gis_linestring.php @@ -2,7 +2,7 @@ /** * Handles the visualization of GIS LINESTRING objects. * - * @package phpMyAdmin + * @package phpMyAdmin-GIS */ class PMA_GIS_Linestring extends PMA_GIS_Geometry { @@ -154,7 +154,8 @@ class PMA_GIS_Linestring extends PMA_GIS_Geometry } /** - * Prepares JavaScript related to a row in the GIS dataset to visualize it with OpenLayers. + * Prepares JavaScript related to a row in the GIS dataset + * to visualize it with OpenLayers. * * @param string $spatial GIS LINESTRING object * @param int $srid Spatial reference ID @@ -183,8 +184,9 @@ class PMA_GIS_Linestring extends PMA_GIS_Geometry $row = 'new Array('; foreach ($points_arr as $point) { - $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] . '))' - . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()), '; + $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' + . $point[1] . ')).transform(new OpenLayers.Projection("EPSG:' + . $srid . '"), map.getProjectionObject()), '; } $row = substr($row, 0, strlen($row) - 2); $row .= ')'; diff --git a/libraries/gis/pma_gis_multilinestring.php b/libraries/gis/pma_gis_multilinestring.php index 1289a93..733cc84 100644 --- a/libraries/gis/pma_gis_multilinestring.php +++ b/libraries/gis/pma_gis_multilinestring.php @@ -2,7 +2,7 @@ /** * Handles the visualization of GIS MULTILINESTRING objects. * - * @package phpMyAdmin + * @package phpMyAdmin-GIS */ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry { @@ -179,7 +179,8 @@ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry } /** - * Prepares JavaScript related to a row in the GIS dataset to visualize it with OpenLayers. + * Prepares JavaScript related to a row in the GIS dataset + * to visualize it with OpenLayers. * * @param string $spatial GIS MULTILINESTRING object * @param int $srid Spatial reference ID @@ -213,8 +214,9 @@ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry $points_arr = $this->extractPoints($linestring, null); $row .= 'new OpenLayers.Geometry.LineString(new Array('; foreach ($points_arr as $point) { - $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] . '))' - . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()), '; + $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' + . $point[1] . ')).transform(new OpenLayers.Projection("EPSG:' + . $srid . '"), map.getProjectionObject()), '; } $row = substr($row, 0, strlen($row) - 2); $row .= ')), '; diff --git a/libraries/gis/pma_gis_multipoint.php b/libraries/gis/pma_gis_multipoint.php index 48e9099..ce20f92 100644 --- a/libraries/gis/pma_gis_multipoint.php +++ b/libraries/gis/pma_gis_multipoint.php @@ -2,7 +2,7 @@ /** * Handles the visualization of GIS MULTIPOINT objects. * - * @package phpMyAdmin + * @package phpMyAdmin-GIS */ class PMA_GIS_Multipoint extends PMA_GIS_Geometry { @@ -143,7 +143,8 @@ class PMA_GIS_Multipoint extends PMA_GIS_Geometry } /** - * Prepares JavaScript related to a row in the GIS dataset to visualize it with OpenLayers. + * Prepares JavaScript related to a row in the GIS dataset + * to visualize it with OpenLayers. * * @param string $spatial GIS MULTIPOINT object * @param int $srid Spatial reference ID @@ -175,8 +176,9 @@ class PMA_GIS_Multipoint extends PMA_GIS_Geometry $row = 'new Array('; foreach ($points_arr as $point) { - $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] . '))' - . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()), '; + $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] + . ')).transform(new OpenLayers.Projection("EPSG:' . $srid + . '"), map.getProjectionObject()), '; } $row = substr($row, 0, strlen($row) - 2); $row .= ')'; diff --git a/libraries/gis/pma_gis_multipolygon.php b/libraries/gis/pma_gis_multipolygon.php index db6f6cb..431fc88 100644 --- a/libraries/gis/pma_gis_multipolygon.php +++ b/libraries/gis/pma_gis_multipolygon.php @@ -2,7 +2,7 @@ /** * Handles the visualization of GIS MULTIPOLYGON objects. * - * @package phpMyAdmin + * @package phpMyAdmin-GIS */ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry { @@ -154,7 +154,8 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry foreach ($inner as $inner_poly) { $points_arr = array_merge( - $points_arr, $this->extractPoints($inner_poly, $scale_data, true) + $points_arr, + $this->extractPoints($inner_poly, $scale_data, true) ); } } @@ -223,7 +224,8 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry } /** - * Prepares JavaScript related to a row in the GIS dataset to visualize it with OpenLayers. + * Prepares JavaScript related to a row in the GIS dataset + * to visualize it with OpenLayers. * * @param string $spatial GIS MULTIPOLYGON object * @param int $srid Spatial reference ID diff --git a/libraries/gis/pma_gis_point.php b/libraries/gis/pma_gis_point.php index 4318572..31531f3 100644 --- a/libraries/gis/pma_gis_point.php +++ b/libraries/gis/pma_gis_point.php @@ -2,7 +2,7 @@ /** * Handles the visualization of GIS POINT objects. * - * @package phpMyAdmin + * @package phpMyAdmin-GIS */ class PMA_GIS_Point extends PMA_GIS_Geometry { @@ -136,7 +136,8 @@ class PMA_GIS_Point extends PMA_GIS_Geometry } /** - * Prepares JavaScript related to a row in the GIS dataset to visualize it with OpenLayers. + * Prepares JavaScript related to a row in the GIS dataset + * to visualize it with OpenLayers. * * @param string $spatial GIS POINT object * @param int $srid Spatial reference ID @@ -167,9 +168,10 @@ class PMA_GIS_Point extends PMA_GIS_Geometry $points_arr = $this->extractPoints($point, null); $result .= 'vectorLayer.addFeatures(new OpenLayers.Feature.Vector((' - . 'new OpenLayers.Geometry.Point(' . $points_arr[0][0] . ', ' . $points_arr[0][1] . ')' - . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject())),' - . ' null, ' . json_encode($style_options) . '));'; + . 'new OpenLayers.Geometry.Point(' . $points_arr[0][0] . ', ' + . $points_arr[0][1] . ').transform(new OpenLayers.Projection("EPSG:' + . $srid . '"), map.getProjectionObject())), null, ' + . json_encode($style_options) . '));'; return $result; } } diff --git a/libraries/gis/pma_gis_polygon.php b/libraries/gis/pma_gis_polygon.php index ce8ffa8..02f0173 100644 --- a/libraries/gis/pma_gis_polygon.php +++ b/libraries/gis/pma_gis_polygon.php @@ -2,7 +2,7 @@ /** * Handles the visualization of GIS POLYGON objects. * - * @package phpMyAdmin + * @package phpMyAdmin-GIS */ class PMA_GIS_Polygon extends PMA_GIS_Geometry { @@ -206,7 +206,8 @@ class PMA_GIS_Polygon extends PMA_GIS_Geometry } /** - * Prepares JavaScript related to a row in the GIS dataset to visualize it with OpenLayers. + * Prepares JavaScript related to a row in the GIS dataset + * to visualize it with OpenLayers. * * @param string $spatial GIS POLYGON object * @param int $srid Spatial reference ID diff --git a/libraries/gis/pma_gis_visualization.php b/libraries/gis/pma_gis_visualization.php index 7c36857..d8da0d7 100644 --- a/libraries/gis/pma_gis_visualization.php +++ b/libraries/gis/pma_gis_visualization.php @@ -2,7 +2,7 @@ /** * Generates the JavaScripts needed to visualize GIS data. * - * @package phpMyAdmin + * @package phpMyAdmin-GIS */ class PMA_GIS_Visualization { @@ -74,6 +74,8 @@ class PMA_GIS_Visualization /** * All the variable initialization, options handling has to be done here. + * + * @return nothing */ protected function init() { @@ -83,6 +85,8 @@ class PMA_GIS_Visualization /** * A function which handles passed parameters. Useful if desired * chart needs to be a little bit different from the default one. + * + * @return nothing */ private function _handleOptions() { @@ -121,6 +125,8 @@ class PMA_GIS_Visualization * @param string $file_name file name * @param string $type mime type * @param string $ext extension of the file + * + * @return nothing */ private function _toFile($file_name, $type, $ext) { @@ -179,6 +185,8 @@ class PMA_GIS_Visualization * Saves as a SVG image to a file. * * @param string $file_name File name + * + * @return nothing */ public function toFileAsSvg($file_name) { @@ -201,7 +209,10 @@ class PMA_GIS_Visualization // fill the background $bg = imagecolorallocate($image, 229, 229, 229); - imagefilledrectangle($image, 0, 0, $this->_settings['width'] - 1, $this->_settings['height'] - 1, $bg); + imagefilledrectangle( + $image, 0, 0, $this->_settings['width'] - 1, + $this->_settings['height'] - 1, $bg + ); $scale_data = $this->_scaleDataSet($this->_data); $image = $this->_prepareDataSet($this->_data, 0, $scale_data, 'png', $image); @@ -234,6 +245,8 @@ class PMA_GIS_Visualization * Saves as a PNG image to a file. * * @param string $file_name File name + * + * @return nothing */ public function toFileAsPng($file_name) { @@ -260,6 +273,8 @@ class PMA_GIS_Visualization * Saves as a PDF to a file. * * @param string $file_name File name + * + * @return nothing */ public function toFileAsPdf($file_name) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11416-gc7c532e
by Madhura Jayaratne 21 Jul '11

21 Jul '11

The branch, master has been updated via c7c532e1f335079fe65cac3f30adae1b1ddb8e34 (commit) via c01b63d01a20fab8fb96897304834ed0357ee580 (commit) via 1e8914fe508d06774f8bf4159587db35cb24b3ef (commit) via 338756306b9b795fb9e320aeca994f5993120f5d (commit) via dc9312cae327017ef623619940c7eb99d10aeb81 (commit) via ffa28f0f7cb5b901702e943b69e3dfcfbcd05a66 (commit) via 24b28f1017a555e06023eac4a9868d655de378e7 (commit) from 6cb1bdc030e1d50aa11fa50e83649ad77eb6fadf (commit) - Log ----------------------------------------------------------------- commit c7c532e1f335079fe65cac3f30adae1b1ddb8e34 Merge: c01b63d01a20fab8fb96897304834ed0357ee580 6cb1bdc030e1d50aa11fa50e83649ad77eb6fadf Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Jul 21 20:37:38 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit c01b63d01a20fab8fb96897304834ed0357ee580 Merge: 1e8914fe508d06774f8bf4159587db35cb24b3ef 147ba5e5cb1155ff71252cd4ad1ed4f97510567a Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Jul 21 20:31:48 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 1e8914fe508d06774f8bf4159587db35cb24b3ef Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Jul 21 20:19:24 2011 +0530 Avoid code duplication commit 338756306b9b795fb9e320aeca994f5993120f5d Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Jul 21 19:35:03 2011 +0530 Better variable naming commit dc9312cae327017ef623619940c7eb99d10aeb81 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Jul 21 18:35:53 2011 +0530 Return assigned to wrong variable commit ffa28f0f7cb5b901702e943b69e3dfcfbcd05a66 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Jul 21 18:33:45 2011 +0530 Avoid variables with short names commit 24b28f1017a555e06023eac4a9868d655de378e7 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Jul 21 18:29:51 2011 +0530 Unused variable ----------------------------------------------------------------------- Summary of changes: libraries/gis/pma_gis_geometry.php | 49 ++++++++++++++++++++++--- libraries/gis/pma_gis_geometrycollection.php | 6 ++-- libraries/gis/pma_gis_linestring.php | 20 +++++----- libraries/gis/pma_gis_multilinestring.php | 20 +++++----- libraries/gis/pma_gis_multipoint.php | 44 +++++++++++----------- libraries/gis/pma_gis_multipolygon.php | 48 ++++++------------------- libraries/gis/pma_gis_point.php | 44 +++++++++++----------- libraries/gis/pma_gis_polygon.php | 51 +++++++------------------- 8 files changed, 135 insertions(+), 147 deletions(-) diff --git a/libraries/gis/pma_gis_geometry.php b/libraries/gis/pma_gis_geometry.php index 9ff2c2c..8decdcc 100644 --- a/libraries/gis/pma_gis_geometry.php +++ b/libraries/gis/pma_gis_geometry.php @@ -36,13 +36,13 @@ abstract class PMA_GIS_Geometry * * @param string $spatial GIS data object * @param string $label Label for the GIS data object - * @param string $line_color Color for the GIS data object + * @param string $color Color for the GIS data object * @param array $scale_data Array containing data related to scaling * @param image $pdf TCPDF instance * * @return the modified TCPDF instance */ - public abstract function prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf); + public abstract function prepareRowAsPdf($spatial, $label, $color, $scale_data, $pdf); /** * Prepares the JavaScript related to a row in the GIS dataset to visualize it with OpenLayers. @@ -50,12 +50,12 @@ abstract class PMA_GIS_Geometry * @param string $spatial GIS data object * @param int $srid Spatial reference ID * @param string $label Label for the GIS data object - * @param string $point_color Color for the GIS data object + * @param string $color Color for the GIS data object * @param array $scale_data Array containing data related to scaling * * @return the JavaScript related to a row in the GIS dataset */ - public abstract function prepareRowAsOl($spatial, $srid, $label, $point_color, $scale_data); + public abstract function prepareRowAsOl($spatial, $srid, $label, $color, $scale_data); /** * Scales each row. @@ -152,10 +152,49 @@ abstract class PMA_GIS_Geometry $points_arr[] = $x; $points_arr[] = $y; } - unset($cordinate_arr); } return $points_arr; } + + /** + * Generates JavaScriipt for adding points for OpenLayers polygon. + * + * @param string $polygon points of a polygon in WKT form + * @param string $srid spatial reference id + * + * @return JavaScriipt for adding points for OpenLayers polygon + */ + protected function addPointsForOpenLayersPolygon($polygon, $srid) + { + $row = 'new OpenLayers.Geometry.Polygon(new Array('; + // If the polygon doesnt have an inner polygon + if (strpos($polygon, "),(") === false) { + $points_arr = $this->extractPoints($polygon, null); + $row .= 'new OpenLayers.Geometry.LinearRing(new Array('; + foreach ($points_arr as $point) { + $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] . '))' + . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()), '; + } + $row = substr($row, 0, strlen($row) - 2); + $row .= '))'; + } else { + // Seperate outer and inner polygons + $parts = explode("),(", $polygon); + foreach ($parts as $ring) { + $points_arr = $this->extractPoints($ring, null); + $row .= 'new OpenLayers.Geometry.LinearRing(new Array('; + foreach ($points_arr as $point) { + $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] . '))' + . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()), '; + } + $row = substr($row, 0, strlen($row) - 2); + $row .= ')), '; + } + $row = substr($row, 0, strlen($row) - 2); + } + $row .= ')), '; + return $row; + } } ?> diff --git a/libraries/gis/pma_gis_geometrycollection.php b/libraries/gis/pma_gis_geometrycollection.php index 43a7cf4..ca48f08 100644 --- a/libraries/gis/pma_gis_geometrycollection.php +++ b/libraries/gis/pma_gis_geometrycollection.php @@ -24,8 +24,8 @@ class PMA_GIS_Geometrycollection extends PMA_GIS_Geometry public static function singleton() { if (!isset(self::$_instance)) { - $c = __CLASS__; - self::$_instance = new $c; + $class = __CLASS__; + self::$_instance = new $class; } return self::$_instance; @@ -130,7 +130,7 @@ class PMA_GIS_Geometrycollection extends PMA_GIS_Geometry $type = substr($sub_part, 0, $type_pos); $gis_obj = PMA_GIS_Factory::factory($type); - $image = $gis_obj->prepareRowAsPdf($sub_part, $label, $color, $scale_data, $pdf); + $pdf = $gis_obj->prepareRowAsPdf($sub_part, $label, $color, $scale_data, $pdf); } return $pdf; } diff --git a/libraries/gis/pma_gis_linestring.php b/libraries/gis/pma_gis_linestring.php index 05483be..dad4f9b 100644 --- a/libraries/gis/pma_gis_linestring.php +++ b/libraries/gis/pma_gis_linestring.php @@ -24,8 +24,8 @@ class PMA_GIS_Linestring extends PMA_GIS_Geometry public static function singleton() { if (!isset(self::$_instance)) { - $c = __CLASS__; - self::$_instance = new $c; + $class = __CLASS__; + self::$_instance = new $class; } return self::$_instance; @@ -59,10 +59,10 @@ class PMA_GIS_Linestring extends PMA_GIS_Geometry public function prepareRowAsPng($spatial, $label, $line_color, $scale_data, $image) { // allocate colors - $r = hexdec(substr($line_color, 1, 2)); - $g = hexdec(substr($line_color, 3, 2)); - $b = hexdec(substr($line_color, 4, 2)); - $color = imagecolorallocate($image, $r, $g, $b); + $red = hexdec(substr($line_color, 1, 2)); + $green = hexdec(substr($line_color, 3, 2)); + $blue = hexdec(substr($line_color, 4, 2)); + $color = imagecolorallocate($image, $red, $green, $blue); // Trim to remove leading 'LINESTRING(' and trailing ')' $linesrting = substr($spatial, 11, (strlen($spatial) - 12)); @@ -94,10 +94,10 @@ class PMA_GIS_Linestring extends PMA_GIS_Geometry public function prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf) { // allocate colors - $r = hexdec(substr($line_color, 1, 2)); - $g = hexdec(substr($line_color, 3, 2)); - $b = hexdec(substr($line_color, 4, 2)); - $line = array('width' => 1.5, 'color' => array($r, $g, $b)); + $red = hexdec(substr($line_color, 1, 2)); + $green = hexdec(substr($line_color, 3, 2)); + $blue = hexdec(substr($line_color, 4, 2)); + $line = array('width' => 1.5, 'color' => array($red, $green, $blue)); // Trim to remove leading 'LINESTRING(' and trailing ')' $linesrting = substr($spatial, 11, (strlen($spatial) - 12)); diff --git a/libraries/gis/pma_gis_multilinestring.php b/libraries/gis/pma_gis_multilinestring.php index 9291202..1289a93 100644 --- a/libraries/gis/pma_gis_multilinestring.php +++ b/libraries/gis/pma_gis_multilinestring.php @@ -24,8 +24,8 @@ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry public static function singleton() { if (!isset(self::$_instance)) { - $c = __CLASS__; - self::$_instance = new $c; + $class = __CLASS__; + self::$_instance = new $class; } return self::$_instance; @@ -68,10 +68,10 @@ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry public function prepareRowAsPng($spatial, $label, $line_color, $scale_data, $image) { // allocate colors - $r = hexdec(substr($line_color, 1, 2)); - $g = hexdec(substr($line_color, 3, 2)); - $b = hexdec(substr($line_color, 4, 2)); - $color = imagecolorallocate($image, $r, $g, $b); + $red = hexdec(substr($line_color, 1, 2)); + $green = hexdec(substr($line_color, 3, 2)); + $blue = hexdec(substr($line_color, 4, 2)); + $color = imagecolorallocate($image, $red, $green, $blue); // Trim to remove leading 'MULTILINESTRING((' and trailing '))' $multilinestirng = substr($spatial, 17, (strlen($spatial) - 19)); @@ -108,10 +108,10 @@ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry public function prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf) { // allocate colors - $r = hexdec(substr($line_color, 1, 2)); - $g = hexdec(substr($line_color, 3, 2)); - $b = hexdec(substr($line_color, 4, 2)); - $line = array('width' => 1.5, 'color' => array($r, $g, $b)); + $red = hexdec(substr($line_color, 1, 2)); + $green = hexdec(substr($line_color, 3, 2)); + $blue = hexdec(substr($line_color, 4, 2)); + $line = array('width' => 1.5, 'color' => array($red, $green, $blue)); // Trim to remove leading 'MULTILINESTRING((' and trailing '))' $multilinestirng = substr($spatial, 17, (strlen($spatial) - 19)); diff --git a/libraries/gis/pma_gis_multipoint.php b/libraries/gis/pma_gis_multipoint.php index 8b66022..48e9099 100644 --- a/libraries/gis/pma_gis_multipoint.php +++ b/libraries/gis/pma_gis_multipoint.php @@ -24,8 +24,8 @@ class PMA_GIS_Multipoint extends PMA_GIS_Geometry public static function singleton() { if (!isset(self::$_instance)) { - $c = __CLASS__; - self::$_instance = new $c; + $class = __CLASS__; + self::$_instance = new $class; } return self::$_instance; @@ -48,21 +48,21 @@ class PMA_GIS_Multipoint extends PMA_GIS_Geometry /** * Adds to the PNG image object, the data related to a row in the GIS dataset. * - * @param string $spatial GIS MULTIPOINT object - * @param string $label Label for the GIS MULTIPOINT object - * @param string $line_color Color for the GIS MULTIPOINT object - * @param array $scale_data Array containing data related to scaling - * @param image $image Image object + * @param string $spatial GIS MULTIPOINT object + * @param string $label Label for the GIS MULTIPOINT object + * @param string $point_color Color for the GIS MULTIPOINT object + * @param array $scale_data Array containing data related to scaling + * @param image $image Image object * * @return the modified image object */ - public function prepareRowAsPng($spatial, $label, $line_color, $scale_data, $image) + public function prepareRowAsPng($spatial, $label, $point_color, $scale_data, $image) { // allocate colors - $r = hexdec(substr($line_color, 1, 2)); - $g = hexdec(substr($line_color, 3, 2)); - $b = hexdec(substr($line_color, 4, 2)); - $color = imagecolorallocate($image, $r, $g, $b); + $red = hexdec(substr($point_color, 1, 2)); + $green = hexdec(substr($point_color, 3, 2)); + $blue = hexdec(substr($point_color, 4, 2)); + $color = imagecolorallocate($image, $red, $green, $blue); // Trim to remove leading 'MULTIPOINT(' and trailing ')' $multipoint = substr($spatial, 11, (strlen($spatial) - 12)); @@ -78,21 +78,21 @@ class PMA_GIS_Multipoint extends PMA_GIS_Geometry /** * Adds to the TCPDF instance, the data related to a row in the GIS dataset. * - * @param string $spatial GIS MULTIPOINT object - * @param string $label Label for the GIS MULTIPOINT object - * @param string $line_color Color for the GIS MULTIPOINT object - * @param array $scale_data Array containing data related to scaling - * @param image $pdf TCPDF instance + * @param string $spatial GIS MULTIPOINT object + * @param string $label Label for the GIS MULTIPOINT object + * @param string $point_color Color for the GIS MULTIPOINT object + * @param array $scale_data Array containing data related to scaling + * @param image $pdf TCPDF instance * * @return the modified TCPDF instance */ - public function prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf) + public function prepareRowAsPdf($spatial, $label, $point_color, $scale_data, $pdf) { // allocate colors - $r = hexdec(substr($line_color, 1, 2)); - $g = hexdec(substr($line_color, 3, 2)); - $b = hexdec(substr($line_color, 4, 2)); - $line = array('width' => 1.25, 'color' => array($r, $g, $b)); + $red = hexdec(substr($point_color, 1, 2)); + $green = hexdec(substr($point_color, 3, 2)); + $blue = hexdec(substr($point_color, 4, 2)); + $line = array('width' => 1.25, 'color' => array($red, $green, $blue)); // Trim to remove leading 'MULTIPOINT(' and trailing ')' $multipoint = substr($spatial, 11, (strlen($spatial) - 12)); diff --git a/libraries/gis/pma_gis_multipolygon.php b/libraries/gis/pma_gis_multipolygon.php index c0adcd1..db6f6cb 100644 --- a/libraries/gis/pma_gis_multipolygon.php +++ b/libraries/gis/pma_gis_multipolygon.php @@ -24,8 +24,8 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry public static function singleton() { if (!isset(self::$_instance)) { - $c = __CLASS__; - self::$_instance = new $c; + $class = __CLASS__; + self::$_instance = new $class; } return self::$_instance; @@ -82,10 +82,10 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry public function prepareRowAsPng($spatial, $label, $fill_color, $scale_data, $image) { // allocate colors - $r = hexdec(substr($fill_color, 1, 2)); - $g = hexdec(substr($fill_color, 3, 2)); - $b = hexdec(substr($fill_color, 4, 2)); - $color = imagecolorallocate($image, $r, $g, $b); + $red = hexdec(substr($fill_color, 1, 2)); + $green = hexdec(substr($fill_color, 3, 2)); + $blue = hexdec(substr($fill_color, 4, 2)); + $color = imagecolorallocate($image, $red, $green, $blue); // Trim to remove leading 'MULTIPOLYGON(((' and trailing ')))' $multipolygon = substr($spatial, 15, (strlen($spatial) - 18)); @@ -130,10 +130,10 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry public function prepareRowAsPdf($spatial, $label, $fill_color, $scale_data, $pdf) { // allocate colors - $r = hexdec(substr($fill_color, 1, 2)); - $g = hexdec(substr($fill_color, 3, 2)); - $b = hexdec(substr($fill_color, 4, 2)); - $color = array($r, $g, $b); + $red = hexdec(substr($fill_color, 1, 2)); + $green = hexdec(substr($fill_color, 3, 2)); + $blue = hexdec(substr($fill_color, 4, 2)); + $color = array($red, $green, $blue); // Trim to remove leading 'MULTIPOLYGON(((' and trailing ')))' $multipolygon = substr($spatial, 15, (strlen($spatial) - 18)); @@ -257,33 +257,7 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry . 'new OpenLayers.Geometry.MultiPolygon(new Array('; foreach ($polygons as $polygon) { - $row .= 'new OpenLayers.Geometry.Polygon(new Array('; - // If the polygon doesnt have an inner polygon - if (strpos($polygon, "),(") === false) { - $points_arr = $this->extractPoints($polygon, null); - $row .= 'new OpenLayers.Geometry.LinearRing(new Array('; - foreach ($points_arr as $point) { - $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] . '))' - . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()), '; - } - $row = substr($row, 0, strlen($row) - 2); - $row .= '))'; - } else { - // Seperate outer and inner polygons - $parts = explode("),(", $polygon); - foreach ($parts as $ring) { - $points_arr = $this->extractPoints($ring, null); - $row .= 'new OpenLayers.Geometry.LinearRing(new Array('; - foreach ($points_arr as $point) { - $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] . '))' - . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()), '; - } - $row = substr($row, 0, strlen($row) - 2); - $row .= ')), '; - } - $row = substr($row, 0, strlen($row) - 2); - } - $row .= ')), '; + $row .= $this->addPointsForOpenLayersPolygon($polygon, $srid); } $row = substr($row, 0, strlen($row) - 2); $row .= ')), null, ' . json_encode($style_options) . '));'; diff --git a/libraries/gis/pma_gis_point.php b/libraries/gis/pma_gis_point.php index 365eae4..4318572 100644 --- a/libraries/gis/pma_gis_point.php +++ b/libraries/gis/pma_gis_point.php @@ -24,8 +24,8 @@ class PMA_GIS_Point extends PMA_GIS_Geometry public static function singleton() { if (!isset(self::$_instance)) { - $c = __CLASS__; - self::$_instance = new $c; + $class = __CLASS__; + self::$_instance = new $class; } return self::$_instance; @@ -48,21 +48,21 @@ class PMA_GIS_Point extends PMA_GIS_Geometry /** * Adds to the PNG image object, the data related to a row in the GIS dataset. * - * @param string $spatial GIS POINT object - * @param string $label Label for the GIS POINT object - * @param string $line_color Color for the GIS POINT object - * @param array $scale_data Array containing data related to scaling - * @param image $image Image object + * @param string $spatial GIS POINT object + * @param string $label Label for the GIS POINT object + * @param string $point_color Color for the GIS POINT object + * @param array $scale_data Array containing data related to scaling + * @param image $image Image object * * @return the modified image object */ - public function prepareRowAsPng($spatial, $label, $line_color, $scale_data, $image) + public function prepareRowAsPng($spatial, $label, $point_color, $scale_data, $image) { // allocate colors - $r = hexdec(substr($line_color, 1, 2)); - $g = hexdec(substr($line_color, 3, 2)); - $b = hexdec(substr($line_color, 4, 2)); - $color = imagecolorallocate($image, $r, $g, $b); + $red = hexdec(substr($point_color, 1, 2)); + $green = hexdec(substr($point_color, 3, 2)); + $blue = hexdec(substr($point_color, 4, 2)); + $color = imagecolorallocate($image, $red, $green, $blue); // Trim to remove leading 'POINT(' and trailing ')' $point = substr($spatial, 6, (strlen($spatial) - 7)); @@ -76,21 +76,21 @@ class PMA_GIS_Point extends PMA_GIS_Geometry /** * Adds to the TCPDF instance, the data related to a row in the GIS dataset. * - * @param string $spatial GIS POINT object - * @param string $label Label for the GIS POINT object - * @param string $line_color Color for the GIS POINT object - * @param array $scale_data Array containing data related to scaling - * @param image $pdf TCPDF instance + * @param string $spatial GIS POINT object + * @param string $label Label for the GIS POINT object + * @param string $point_color Color for the GIS POINT object + * @param array $scale_data Array containing data related to scaling + * @param image $pdf TCPDF instance * * @return the modified TCPDF instance */ - public function prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf) + public function prepareRowAsPdf($spatial, $label, $point_color, $scale_data, $pdf) { // allocate colors - $r = hexdec(substr($line_color, 1, 2)); - $g = hexdec(substr($line_color, 3, 2)); - $b = hexdec(substr($line_color, 4, 2)); - $line = array('width' => 1.25, 'color' => array($r, $g, $b)); + $red = hexdec(substr($point_color, 1, 2)); + $green = hexdec(substr($point_color, 3, 2)); + $blue = hexdec(substr($point_color, 4, 2)); + $line = array('width' => 1.25, 'color' => array($red, $green, $blue)); // Trim to remove leading 'POINT(' and trailing ')' $point = substr($spatial, 6, (strlen($spatial) - 7)); diff --git a/libraries/gis/pma_gis_polygon.php b/libraries/gis/pma_gis_polygon.php index 5da0d25..ce8ffa8 100644 --- a/libraries/gis/pma_gis_polygon.php +++ b/libraries/gis/pma_gis_polygon.php @@ -24,8 +24,8 @@ class PMA_GIS_Polygon extends PMA_GIS_Geometry public static function singleton() { if (!isset(self::$_instance)) { - $c = __CLASS__; - self::$_instance = new $c; + $class = __CLASS__; + self::$_instance = new $class; } return self::$_instance; @@ -77,10 +77,10 @@ class PMA_GIS_Polygon extends PMA_GIS_Geometry public function prepareRowAsPng($spatial, $label, $fill_color, $scale_data, $image) { // allocate colors - $r = hexdec(substr($fill_color, 1, 2)); - $g = hexdec(substr($fill_color, 3, 2)); - $b = hexdec(substr($fill_color, 4, 2)); - $color = imagecolorallocate($image, $r, $g, $b); + $red = hexdec(substr($fill_color, 1, 2)); + $green = hexdec(substr($fill_color, 3, 2)); + $blue = hexdec(substr($fill_color, 4, 2)); + $color = imagecolorallocate($image, $red, $green, $blue); // Trim to remove leading 'POLYGON((' and trailing '))' $polygon = substr($spatial, 9, (strlen($spatial) - 11)); @@ -122,10 +122,10 @@ class PMA_GIS_Polygon extends PMA_GIS_Geometry public function prepareRowAsPdf($spatial, $label, $fill_color, $scale_data, $pdf) { // allocate colors - $r = hexdec(substr($fill_color, 1, 2)); - $g = hexdec(substr($fill_color, 3, 2)); - $b = hexdec(substr($fill_color, 4, 2)); - $color = array($r, $g, $b); + $red = hexdec(substr($fill_color, 1, 2)); + $green = hexdec(substr($fill_color, 3, 2)); + $blue = hexdec(substr($fill_color, 4, 2)); + $color = array($red, $green, $blue); // Trim to remove leading 'POLYGON((' and trailing '))' $polygon = substr($spatial, 9, (strlen($spatial) - 11)); @@ -234,34 +234,9 @@ class PMA_GIS_Polygon extends PMA_GIS_Geometry // Trim to remove leading 'POLYGON((' and trailing '))' $polygon = substr($spatial, 9, (strlen($spatial) - 11)); - $row .= 'vectorLayer.addFeatures(new OpenLayers.Feature.Vector(' - . 'new OpenLayers.Geometry.Polygon(new Array('; - // If the polygon doesnt have an inner polygon - if (strpos($polygon, "),(") === false) { - $points_arr = $this->extractPoints($polygon, null); - $row .= 'new OpenLayers.Geometry.LinearRing(new Array('; - foreach ($points_arr as $point) { - $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] . '))' - . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()), '; - } - $row = substr($row, 0, strlen($row) - 2); - $row .= '))'; - } else { - // Seperate outer and inner polygons - $parts = explode("),(", $polygon); - foreach ($parts as $ring) { - $points_arr = $this->extractPoints($ring, null); - $row .= 'new OpenLayers.Geometry.LinearRing(new Array('; - foreach ($points_arr as $point) { - $row .= '(new OpenLayers.Geometry.Point(' . $point[0] . ', ' . $point[1] . '))' - . '.transform(new OpenLayers.Projection("EPSG:' . $srid . '"), map.getProjectionObject()), '; - } - $row = substr($row, 0, strlen($row) - 2); - $row .= ')), '; - } - $row = substr($row, 0, strlen($row) - 2); - } - $row .= ')), null, ' . json_encode($style_options) . '));'; + $row .= 'vectorLayer.addFeatures(new OpenLayers.Feature.Vector('; + $row .= $this->addPointsForOpenLayersPolygon($polygon, $srid); + $row .= 'null, ' . json_encode($style_options) . '));'; return $row; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11409-g6cb1bdc
by Marc Delisle 21 Jul '11

21 Jul '11

The branch, master has been updated via 6cb1bdc030e1d50aa11fa50e83649ad77eb6fadf (commit) via 36c0339eb00394d4c51ccbf82a20feae7b70fb18 (commit) from 147ba5e5cb1155ff71252cd4ad1ed4f97510567a (commit) - Log ----------------------------------------------------------------- commit 6cb1bdc030e1d50aa11fa50e83649ad77eb6fadf Merge: 147ba5e5cb1155ff71252cd4ad1ed4f97510567a 36c0339eb00394d4c51ccbf82a20feae7b70fb18 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jul 21 10:55:40 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + db_operations.php | 11 ----------- 2 files changed, 1 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 94861f5..dc2f709 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ phpMyAdmin - ChangeLog - bug #3367993 [usability] Missing "Generate Password" button - bug #3363221 [display] Missing Server Parameter on inline sql query - bug #3367986 [navi] Drop field -> lost active table +- remove misleading comment on the "Rename database" interface 3.4.3.1 (2011-07-02) - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 diff --git a/db_operations.php b/db_operations.php index 16630e3..e2d1e2b 100644 --- a/db_operations.php +++ b/db_operations.php @@ -404,17 +404,6 @@ if ($db != 'mysql') { ?> </legend> <input id="new_db_name" type="text" name="newname" size="30" class="textfield" value="" /> - <?php - echo '(' . __('Command') . ': '; - /** - * @todo (see explanations above in a previous todo) - */ - //if (PMA_MYSQL_INT_VERSION >= XYYZZ) { - // echo 'RENAME DATABASE'; - //} else { - echo 'INSERT INTO ... SELECT'; - //} - echo ')'; ?> </fieldset> <fieldset class="tblFooters"> <input id="rename_db_input" type="submit" value="<?php echo __('Go'); ?>" /> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-35-g36c0339
by Marc Delisle 21 Jul '11

21 Jul '11

The branch, QA_3_4 has been updated via 36c0339eb00394d4c51ccbf82a20feae7b70fb18 (commit) from 58b48a3d4555d0469ee6fed361a9cf8820fb8c9d (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + db_operations.php | 11 ----------- 2 files changed, 1 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 95bb4fe..250bd1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ phpMyAdmin - ChangeLog - bug #3367993 [usability] Missing "Generate Password" button - bug #3363221 [display] Missing Server Parameter on inline sql query - bug #3367986 [navi] Drop field -> lost active table +- remove misleading comment on the "Rename database" interface 3.4.3.1 (2011-07-02) - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 diff --git a/db_operations.php b/db_operations.php index f48ba27..ebd9333 100644 --- a/db_operations.php +++ b/db_operations.php @@ -405,17 +405,6 @@ if ($db != 'mysql') { ?> </legend> <input id="new_db_name" type="text" name="newname" size="30" class="textfield" value="" /> - <?php - echo '(' . __('Command') . ': '; - /** - * @todo (see explanations above in a previous todo) - */ - //if (PMA_MYSQL_INT_VERSION >= XYYZZ) { - // echo 'RENAME DATABASE'; - //} else { - echo 'INSERT INTO ... SELECT'; - //} - echo ')'; ?> </fieldset> <fieldset class="tblFooters"> <input id="rename_db_input" type="submit" value="<?php echo __('Go'); ?>" /> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11407-g147ba5e
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 147ba5e5cb1155ff71252cd4ad1ed4f97510567a (commit) via e797d5a1ff71608da5ef21eb594b1014022ec252 (commit) via 1e338c50eb069e6cc8a4b0ecf401a7cab7a8d80c (commit) via f06f257e4602b5c02842d54c3e7087860e87799e (commit) via 0249797e7d23d5d1aa04517be628be75923ec390 (commit) via e793e456e994d3b150eb2bb1271cac2aa9b69d88 (commit) via 516b2dfe2f76542db825e09d6c39123aef734872 (commit) via e6bb5a1c77cad2debeb4b0fa2f58ef0c6a459b83 (commit) via 6ae91b47cee97a3d28c7f87aa2201d41b29cc0d7 (commit) via 89cd23b60d6cf2bdfa26b388a5f4591f1448e7c7 (commit) via 8a3f33380d223a8dedab9e98b4eefc2412626631 (commit) via ec5367506ce599053dbf546c1b23661fd766a95b (commit) via 2e7fc8a37caf473d3a2e9db1b2c6e97d1d29cf09 (commit) via 9ba10c2b7eff8e51f1c32fc716ab31b1be9bfd10 (commit) via c345b81ac7f635db18b5e3852734e5b6a6b271e3 (commit) from 41b23ebf4ad737ac894c09f09aa7f9507c8c587f (commit) - Log ----------------------------------------------------------------- commit 147ba5e5cb1155ff71252cd4ad1ed4f97510567a Merge: 41b23ebf4ad737ac894c09f09aa7f9507c8c587f e797d5a1ff71608da5ef21eb594b1014022ec252 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 16:51:40 2011 +0200 Merge remote-tracking branch 'pootle/master' commit e797d5a1ff71608da5ef21eb594b1014022ec252 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:47:30 2011 +0200 Translation update done using Pootle. commit 1e338c50eb069e6cc8a4b0ecf401a7cab7a8d80c Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:47:15 2011 +0200 Translation update done using Pootle. commit f06f257e4602b5c02842d54c3e7087860e87799e Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:46:47 2011 +0200 Translation update done using Pootle. commit 0249797e7d23d5d1aa04517be628be75923ec390 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:46:34 2011 +0200 Translation update done using Pootle. commit e793e456e994d3b150eb2bb1271cac2aa9b69d88 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:45:55 2011 +0200 Translation update done using Pootle. commit 516b2dfe2f76542db825e09d6c39123aef734872 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:45:25 2011 +0200 Translation update done using Pootle. commit e6bb5a1c77cad2debeb4b0fa2f58ef0c6a459b83 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:44:33 2011 +0200 Translation update done using Pootle. commit 6ae91b47cee97a3d28c7f87aa2201d41b29cc0d7 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:44:16 2011 +0200 Translation update done using Pootle. commit 89cd23b60d6cf2bdfa26b388a5f4591f1448e7c7 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:43:28 2011 +0200 Translation update done using Pootle. commit 8a3f33380d223a8dedab9e98b4eefc2412626631 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:40:49 2011 +0200 Translation update done using Pootle. commit ec5367506ce599053dbf546c1b23661fd766a95b Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:40:42 2011 +0200 Translation update done using Pootle. commit 2e7fc8a37caf473d3a2e9db1b2c6e97d1d29cf09 Merge: 9ba10c2b7eff8e51f1c32fc716ab31b1be9bfd10 ca92366d91e8f3336aee09285a806673ee3ae1a2 Author: Pootle server <pootle(a)cihar.com> Date: Thu Jul 21 16:40:15 2011 +0200 Merge remote-tracking branch 'origin/master' commit 9ba10c2b7eff8e51f1c32fc716ab31b1be9bfd10 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:40:09 2011 +0200 Translation update done using Pootle. commit c345b81ac7f635db18b5e3852734e5b6a6b271e3 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:39:47 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/it.po | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/po/it.po b/po/it.po index 99536a7..e127f2a 100644 --- a/po/it.po +++ b/po/it.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-07-21 14:00+0200\n" -"PO-Revision-Date: 2011-07-21 16:39+0200\n" +"PO-Revision-Date: 2011-07-21 16:47+0200\n" "Last-Translator: Rouslan Placella <rouslan(a)placella.com>\n" "Language-Team: italian <it(a)li.org>\n" "Language: it\n" @@ -1391,6 +1391,8 @@ msgstr "Vai alla tabella di Log" #: js/messages.php:151 msgid "Log analysed, but not data found in this time span." msgstr "" +"Il log é stato analizzato, nessun dato é stato trovato per questo intervallo " +"di tempo." #: js/messages.php:155 libraries/tbl_properties.inc.php:780 #: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545 @@ -1457,16 +1459,14 @@ msgid "Insert Table" msgstr "Utilizza tabelle" #: js/messages.php:177 -#, fuzzy #| msgid "Add index" msgid "Hide indexes" -msgstr "Aggiungi indice" +msgstr "Nascondi gli indici" #: js/messages.php:178 -#, fuzzy #| msgid "Show grid" msgid "Show indexes" -msgstr "Mostra la griglia" +msgstr "Mostra gli indici" #: js/messages.php:181 msgid "Searching" @@ -1491,6 +1491,8 @@ msgstr "Cancellazione" #: js/messages.php:188 msgid "The definition of a stored function must contain a RETURN statement!" msgstr "" +"La definizione delle funzioni memorizzate deve contenere un istruzione " +"RETURN." #: js/messages.php:191 msgid "" @@ -1862,13 +1864,12 @@ msgstr "Dimensione font" #: libraries/File.class.php:220 msgid "File was not an uploaded file." -msgstr "" +msgstr "Il file non era un file caricato." #: libraries/File.class.php:259 libraries/File.class.php:388 -#, fuzzy #| msgid "Unknown error in file upload." msgid "Unknown error while uploading." -msgstr "Errore sconosciuto nel caricamento del file." +msgstr "Errore sconosciuto durante il caricamento del file." #: libraries/File.class.php:277 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." @@ -1899,7 +1900,7 @@ msgstr "Caricamento del file interrotto per estensione errata." #: libraries/File.class.php:295 msgid "Unknown error in file upload." -msgstr "Errore sconosciuto nel caricamento del file." +msgstr "Si é verificato un errore sconosciuto durante il caricamento del file." #: libraries/File.class.php:495 msgid "" @@ -1911,7 +1912,7 @@ msgstr "" #: libraries/File.class.php:507 msgid "Error while moving uploaded file." -msgstr "" +msgstr "Si é verificato un errore durante lo spostamento del file." #: libraries/File.class.php:515 msgid "Cannot read (moved) upload file." @@ -1999,20 +2000,18 @@ msgstr[0] "%1$d riga inserita." msgstr[1] "%1$d righe inserite." #: libraries/RecentTable.class.php:107 -#, fuzzy #| msgid "Could not save configuration" msgid "Could not save recent table" -msgstr "Impossibile salvare la configurazione" +msgstr "Impossibile salvare la tabella recente" #: libraries/RecentTable.class.php:142 msgid "Recent tables" -msgstr "Conta tabelle" +msgstr "Tabelle recenti" #: libraries/RecentTable.class.php:148 -#, fuzzy #| msgid "There are no configured servers" msgid "There are no recent tables" -msgstr "Non ci sono server configurati" +msgstr "Non ci sono tabelle recenti" #: libraries/StorageEngine.class.php:180 msgid "" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11392-g41b23eb
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 41b23ebf4ad737ac894c09f09aa7f9507c8c587f (commit) via 08d83ae4d5a014afd786c7a7869de88eb3f85d04 (commit) from ca92366d91e8f3336aee09285a806673ee3ae1a2 (commit) - Log ----------------------------------------------------------------- commit 41b23ebf4ad737ac894c09f09aa7f9507c8c587f Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 16:50:12 2011 +0200 Wrap long lines commit 08d83ae4d5a014afd786c7a7869de88eb3f85d04 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 16:47:11 2011 +0200 Coding style ----------------------------------------------------------------------- Summary of changes: test/libraries/common/PMA_getIcon_test.php | 36 +++++++++++++++-------- test/libraries/common/PMA_showPHPDocu_test.php | 7 +++- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/test/libraries/common/PMA_getIcon_test.php b/test/libraries/common/PMA_getIcon_test.php index 1feba0c..ab21651 100644 --- a/test/libraries/common/PMA_getIcon_test.php +++ b/test/libraries/common/PMA_getIcon_test.php @@ -19,16 +19,20 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{ $GLOBALS['cfg']['PropertiesIconic'] = false; - $this->assertEquals('', - PMA_getIcon('b_comment.png') ); + $this->assertEquals( + '', + PMA_getIcon('b_comment.png') + ); } function testGetIconWithPropertiesIconic(){ $GLOBALS['cfg']['PropertiesIconic'] = true; - $this->assertEquals('<img src="themes/dot.gif" title="" alt="" class="icon ic_b_comment" />', - PMA_getIcon('b_comment.png') ); + $this->assertEquals( + '<img src="themes/dot.gif" title="" alt="" class="icon ic_b_comment" />', + PMA_getIcon('b_comment.png') + ); } function testGetIconAlternate(){ @@ -36,9 +40,11 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{ $GLOBALS['cfg']['PropertiesIconic'] = true; $alternate_text = 'alt_str'; - $this->assertEquals('<img src="themes/dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text - . '" class="icon ic_b_comment" />', - PMA_getIcon('b_comment.png',$alternate_text) ); + $this->assertEquals( + '<img src="themes/dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text + . '" class="icon ic_b_comment" />', + PMA_getIcon('b_comment.png', $alternate_text) + ); } function testGetIconWithContainer(){ @@ -46,9 +52,11 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{ $GLOBALS['cfg']['PropertiesIconic'] = true; $alternate_text = 'alt_str'; - $this->assertEquals('<img src="themes/dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text - . '" class="icon ic_b_comment" />', - PMA_getIcon('b_comment.png',$alternate_text, true) ); + $this->assertEquals( + '<img src="themes/dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text + . '" class="icon ic_b_comment" />', + PMA_getIcon('b_comment.png', $alternate_text, true) + ); } @@ -57,9 +65,11 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{ $GLOBALS['cfg']['PropertiesIconic'] = true; $alternate_text = 'alt_str'; - $this->assertEquals('<img src="themes/dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text - . '" class="icon ic_b_comment" /> ' . $alternate_text . '', - PMA_getIcon('b_comment.png',$alternate_text, true, true) ); + $this->assertEquals( + '<img src="themes/dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text + . '" class="icon ic_b_comment" /> ' . $alternate_text . '', + PMA_getIcon('b_comment.png', $alternate_text, true, true) + ); } } diff --git a/test/libraries/common/PMA_showPHPDocu_test.php b/test/libraries/common/PMA_showPHPDocu_test.php index a66601d..e2364d2 100644 --- a/test/libraries/common/PMA_showPHPDocu_test.php +++ b/test/libraries/common/PMA_showPHPDocu_test.php @@ -21,7 +21,9 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase $target = "docu"; $lang = _pgettext('PHP documentation language', 'en'); - $expected = '<a href="http://php.net/manual/' . $lang . '/' . $target . '" target="documentation"><img class="icon ic_b_help_s" src="themes/dot.gif" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>'; + $expected = '<a href="http://php.net/manual/' . $lang . '/' . $target + . '" target="documentation"><img class="icon ic_b_help_s" src="themes/dot.gif" alt="' + . __('Documentation') . '" title="' . __('Documentation') . '" /></a>'; $this->assertEquals($expected, PMA_showPHPDocu($target)); } @@ -32,7 +34,8 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase $target = "docu"; $lang = _pgettext('PHP documentation language', 'en'); - $expected = '[<a href="http://php.net/manual/' . $lang . '/' . $target . '" target="documentation">' . __('Documentation') . '</a>]'; + $expected = '[<a href="http://php.net/manual/' . $lang . '/' . $target + . '" target="documentation">' . __('Documentation') . '</a>]'; $this->assertEquals($expected, PMA_showPHPDocu($target)); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11390-gca92366
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via ca92366d91e8f3336aee09285a806673ee3ae1a2 (commit) via 1287fda3c036020f56a7745c46051058d0583875 (commit) via 6c69c5d6122883c292d7877005e0b7099a3d0b70 (commit) via 8458c4e5d6b965d1a4f19bd9e0f9364fbb417d7e (commit) via eb915117075d94a473186c17fc4d9bd16c2befc2 (commit) via b5f36ece64338060b9f937e518b9b90604a81bb9 (commit) via 8aeee24a6fc67d3dcf63a18354bafecc4fbf1b56 (commit) via 0eef13499f953e6b2bce9f131681f0625e7758ea (commit) via 62481122fa213d5417b0923bdb6238a926b097bf (commit) via f71f05d2ee44bbf756b6c462156e1b35a7078d88 (commit) via aa42f9e157e3edb46bd2c7b3fd0ac290ba09bb36 (commit) via 03cd1d3719141e7769559bc0607de21707ebdf9e (commit) via 791cf6089371abe6acb8f96d6cb2c57b7f1bfff4 (commit) via 07582eea42a62acfc5ef1425157336932529cb94 (commit) via db4cac61e01c2c09cec4f3d284b4736bbd06007a (commit) via fc8901f997609200de946445f4a0ee58eaedb8ef (commit) via c9f47dbb1627d3a889966ddda4cbe0718ca4219a (commit) via 7a376adfb9e272ddcba05b27a7ec4fec31d55485 (commit) via 6774a7f4153a875ad59ed5aa77b243ca745e1ac2 (commit) via d194e9e250589bc15cf53e01985cc0aa7b35114f (commit) from 5187db73438c3795e9036ddb03ed9dbc18b8151d (commit) - Log ----------------------------------------------------------------- commit ca92366d91e8f3336aee09285a806673ee3ae1a2 Merge: 5187db73438c3795e9036ddb03ed9dbc18b8151d 1287fda3c036020f56a7745c46051058d0583875 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 16:40:09 2011 +0200 Merge remote-tracking branch 'pootle/master' commit 1287fda3c036020f56a7745c46051058d0583875 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:39:07 2011 +0200 Translation update done using Pootle. commit 6c69c5d6122883c292d7877005e0b7099a3d0b70 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:38:49 2011 +0200 Translation update done using Pootle. commit 8458c4e5d6b965d1a4f19bd9e0f9364fbb417d7e Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:37:56 2011 +0200 Translation update done using Pootle. commit eb915117075d94a473186c17fc4d9bd16c2befc2 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:36:33 2011 +0200 Translation update done using Pootle. commit b5f36ece64338060b9f937e518b9b90604a81bb9 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:36:27 2011 +0200 Translation update done using Pootle. commit 8aeee24a6fc67d3dcf63a18354bafecc4fbf1b56 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:36:13 2011 +0200 Translation update done using Pootle. commit 0eef13499f953e6b2bce9f131681f0625e7758ea Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:32:59 2011 +0200 Translation update done using Pootle. commit 62481122fa213d5417b0923bdb6238a926b097bf Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:32:24 2011 +0200 Translation update done using Pootle. commit f71f05d2ee44bbf756b6c462156e1b35a7078d88 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:32:18 2011 +0200 Translation update done using Pootle. commit aa42f9e157e3edb46bd2c7b3fd0ac290ba09bb36 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:31:51 2011 +0200 Translation update done using Pootle. commit 03cd1d3719141e7769559bc0607de21707ebdf9e Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:31:29 2011 +0200 Translation update done using Pootle. commit 791cf6089371abe6acb8f96d6cb2c57b7f1bfff4 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:31:16 2011 +0200 Translation update done using Pootle. commit 07582eea42a62acfc5ef1425157336932529cb94 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:30:56 2011 +0200 Translation update done using Pootle. commit db4cac61e01c2c09cec4f3d284b4736bbd06007a Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:30:45 2011 +0200 Translation update done using Pootle. commit fc8901f997609200de946445f4a0ee58eaedb8ef Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:29:14 2011 +0200 Translation update done using Pootle. commit c9f47dbb1627d3a889966ddda4cbe0718ca4219a Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:28:42 2011 +0200 Translation update done using Pootle. commit 7a376adfb9e272ddcba05b27a7ec4fec31d55485 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:28:36 2011 +0200 Translation update done using Pootle. commit 6774a7f4153a875ad59ed5aa77b243ca745e1ac2 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:28:10 2011 +0200 Translation update done using Pootle. commit d194e9e250589bc15cf53e01985cc0aa7b35114f Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:27:56 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/it.po | 52 ++++++++++++++++++++++++++++------------------------ 1 files changed, 28 insertions(+), 24 deletions(-) diff --git a/po/it.po b/po/it.po index 5b91285..99536a7 100644 --- a/po/it.po +++ b/po/it.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-07-21 14:00+0200\n" -"PO-Revision-Date: 2011-07-21 16:26+0200\n" +"PO-Revision-Date: 2011-07-21 16:39+0200\n" "Last-Translator: Rouslan Placella <rouslan(a)placella.com>\n" "Language-Team: italian <it(a)li.org>\n" "Language: it\n" @@ -1268,97 +1268,102 @@ msgid "" "Following settings will be applied globally and reset to default on server " "restart:" msgstr "" +"Le seguenti impostazioni verranno applicate globalmente e reimpostate ai " +"valori predefiniti durante il riavvio del server:" #. l10n: %s is FILE or TABLE #: js/messages.php:124 -#, fuzzy, php-format +#, php-format #| msgid "Save output to a file" msgid "Set log_output to %s" -msgstr "Salva l'output in un file" +msgstr "Imposta log_output a %s" #. l10n: Enable in this context means setting a status variable to ON #: js/messages.php:126 -#, fuzzy, php-format +#, php-format #| msgid "Enabled" msgid "Enable %s" -msgstr "Abilitata" +msgstr "Abilita %s" #. l10n: Disable in this context means setting a status variable to OFF #: js/messages.php:128 -#, fuzzy, php-format +#, php-format #| msgid "Disabled" msgid "Disable %s" -msgstr "Disabilitata" +msgstr "Disabilita %s" #. l10n: %d seconds #: js/messages.php:130 #, php-format msgid "Set long_query_time to %ds" -msgstr "" +msgstr "Imposta long_query_time a %ds" #: js/messages.php:131 msgid "" "You can't change these variables. Please log in as root or contact your " "database administrator." msgstr "" +"Non puoi cambiare i valori di queste variabili. Prega effettua il login come " +"root o contatta l'amministratore del database." #: js/messages.php:132 -#, fuzzy #| msgid "Manage your settings" msgid "Change settings" -msgstr "Gestisci le tue impostazioni" +msgstr "Modifica impostazioni" #: js/messages.php:133 -#, fuzzy #| msgid "More settings" msgid "Current settings" -msgstr "Ulteriori impostazioni" +msgstr "Impostazioni attuali" #: js/messages.php:135 server_status.php:1358 -#, fuzzy #| msgid "Report title:" msgid "Chart Title" -msgstr "Titolo del report:" +msgstr "Titolo del diagramma" #. l10n: As in differential values #: js/messages.php:137 -#, fuzzy #| msgid "Difference" msgid "Differential" -msgstr "Differenza" +msgstr "Differenziali" #: js/messages.php:138 #, php-format msgid "Divided by %s:" -msgstr "" +msgstr "Diviso per %s:" #: js/messages.php:140 -#, fuzzy #| msgid "Select page" msgid "Selected time range:" -msgstr "Seleziona pagina" +msgstr "Intervallo di tempo selezionato:" #: js/messages.php:141 msgid "Group together INSERTs into same table" msgstr "" #: js/messages.php:142 +#, fuzzy msgid "" "Choose from which log you want the statistics to be generated from. " "Results are grouped by query text." msgstr "" +"Scegli il log dal quale generare le statistiche. Results are grouped " +"by query text." #: js/messages.php:143 msgid "From slow log" -msgstr "" +msgstr "Dal slow log" #: js/messages.php:144 msgid "From general log" -msgstr "" +msgstr "Dal general log" #: js/messages.php:145 +#, fuzzy msgid "Analysing & loading logs. This may take a while." msgstr "" +"L'analisi e il caricamento dei log in corso. Questa operazione potrebbe " +"richiedere del tempo." #: js/messages.php:146 msgid "" @@ -1376,13 +1381,12 @@ msgstr "" #: js/messages.php:148 msgid "Log data loaded. Queries executed in this time span:" -msgstr "" +msgstr "Dati di log caricati. Le query eseguite in questo intervallo di tempo:" #: js/messages.php:150 -#, fuzzy #| msgid "Jump to database" msgid "Jump to Log table" -msgstr "Vai al database" +msgstr "Vai alla tabella di Log" #: js/messages.php:151 msgid "Log analysed, but not data found in this time span." hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11370-g5187db7
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 5187db73438c3795e9036ddb03ed9dbc18b8151d (commit) via 8a3aa86f36df4994c8193f74c019427200a2b873 (commit) from 82453acc8f4200b66bd4b915cf2064a2f912c0de (commit) - Log ----------------------------------------------------------------- commit 5187db73438c3795e9036ddb03ed9dbc18b8151d Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 16:37:32 2011 +0200 The themes path is no longer used here commit 8a3aa86f36df4994c8193f74c019427200a2b873 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 16:37:06 2011 +0200 The themes path is no longer used here ----------------------------------------------------------------------- Summary of changes: test/libraries/common/PMA_getIcon_test.php | 17 ++++------------- test/libraries/common/PMA_showDocu_test.php | 7 +------ test/libraries/common/PMA_showPHPDocu_test.php | 3 +-- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/test/libraries/common/PMA_getIcon_test.php b/test/libraries/common/PMA_getIcon_test.php index b64ef53..1feba0c 100644 --- a/test/libraries/common/PMA_getIcon_test.php +++ b/test/libraries/common/PMA_getIcon_test.php @@ -18,7 +18,6 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{ function testGetIconWithoutPropertiesIconic(){ $GLOBALS['cfg']['PropertiesIconic'] = false; - $GLOBALS['pmaThemeImage'] = 'theme/'; $this->assertEquals('', PMA_getIcon('b_comment.png') ); @@ -27,21 +26,17 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{ function testGetIconWithPropertiesIconic(){ $GLOBALS['cfg']['PropertiesIconic'] = true; - $GLOBALS['pmaThemeImage'] = 'theme/'; - $this->assertEquals('<img src="'.$GLOBALS['pmaThemeImage'] - . 'dot.gif" title="" alt="" class="icon ic_b_comment" />', + $this->assertEquals('<img src="themes/dot.gif" title="" alt="" class="icon ic_b_comment" />', PMA_getIcon('b_comment.png') ); } function testGetIconAlternate(){ $GLOBALS['cfg']['PropertiesIconic'] = true; - $GLOBALS['pmaThemeImage'] = 'theme/'; $alternate_text = 'alt_str'; - $this->assertEquals('<img src="'.$GLOBALS['pmaThemeImage'] - .'dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text + $this->assertEquals('<img src="themes/dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text . '" class="icon ic_b_comment" />', PMA_getIcon('b_comment.png',$alternate_text) ); } @@ -49,11 +44,9 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{ function testGetIconWithContainer(){ $GLOBALS['cfg']['PropertiesIconic'] = true; - $GLOBALS['pmaThemeImage'] = 'theme/'; $alternate_text = 'alt_str'; - $this->assertEquals('<img src="'.$GLOBALS['pmaThemeImage'] - .'dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text + $this->assertEquals('<img src="themes/dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text . '" class="icon ic_b_comment" />', PMA_getIcon('b_comment.png',$alternate_text, true) ); @@ -62,11 +55,9 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{ function testGetIconWithContainerAndForceText(){ $GLOBALS['cfg']['PropertiesIconic'] = true; - $GLOBALS['pmaThemeImage'] = 'theme/'; $alternate_text = 'alt_str'; - $this->assertEquals('<img src="'.$GLOBALS['pmaThemeImage'] - .'dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text + $this->assertEquals('<img src="themes/dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text . '" class="icon ic_b_comment" /> ' . $alternate_text . '', PMA_getIcon('b_comment.png',$alternate_text, true, true) ); diff --git a/test/libraries/common/PMA_showDocu_test.php b/test/libraries/common/PMA_showDocu_test.php index edf7c46..9941c15 100644 --- a/test/libraries/common/PMA_showDocu_test.php +++ b/test/libraries/common/PMA_showDocu_test.php @@ -15,17 +15,12 @@ require_once 'libraries/common.lib.php'; class PMA_showDocu_test extends PHPUnit_Framework_TestCase { - function setup() - { - $GLOBALS['pmaThemeImage'] = 'theme/'; - } - function testShowDocuReplaceHelpImg() { $GLOBALS['cfg']['ReplaceHelpImg'] = true; $anchor = "relation"; - $expected = '<a href="Documentation.html#' . $anchor . '" target="documentation"><img class="icon ic_b_help_s" src="' . $GLOBALS['pmaThemeImage'] . 'dot.gif" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>'; + $expected = '<a href="Documentation.html#' . $anchor . '" target="documentation"><img class="icon ic_b_help_s" src="themes/dot.gif" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>'; $this->assertEquals($expected, PMA_showDocu($anchor)); diff --git a/test/libraries/common/PMA_showPHPDocu_test.php b/test/libraries/common/PMA_showPHPDocu_test.php index d47269d..a66601d 100644 --- a/test/libraries/common/PMA_showPHPDocu_test.php +++ b/test/libraries/common/PMA_showPHPDocu_test.php @@ -21,8 +21,7 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase $target = "docu"; $lang = _pgettext('PHP documentation language', 'en'); - $expected = '<a href="http://php.net/manual/' . $lang . '/' . $target . '" target="documentation"><img class="icon ic_b_help_s" src="' - . $GLOBALS['pmaThemeImage'] . 'dot.gif" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>'; + $expected = '<a href="http://php.net/manual/' . $lang . '/' . $target . '" target="documentation"><img class="icon ic_b_help_s" src="themes/dot.gif" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>'; $this->assertEquals($expected, PMA_showPHPDocu($target)); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11368-g82453ac
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 82453acc8f4200b66bd4b915cf2064a2f912c0de (commit) via 675c952caeb173001d06a7cf5602915c49a60adf (commit) via e8de184523503d8fa7bfd786e05d819e3903b561 (commit) via d1a1f7183fdf05e501e5e09db8facc6da6992db3 (commit) via 42bbb00159beeb75006e855fe59ccd6550df71f7 (commit) via bc3d890e41e07cca8c9208b72fca46fe30fdcf77 (commit) via d6171121955610713e11735ae3028b3b489eb756 (commit) via 7895632a2dd23ff8bb19073f0c9b49570d519da2 (commit) via a850b8ba0787bf23b7c50fa9464b8a28c6fc8429 (commit) via 8df1307655a7c84e098aedfca10f62967353f19c (commit) via 8d8789d524a6e2cb95dade1eca3da37de89595e8 (commit) via f98120c0ebe03c1fdafdd809e5b1ef22cb428430 (commit) via 2806dc389fdbb07a188dcafde49ca098b50ec532 (commit) via 796b5d09bfe8705db525734b2b210c0bf1482f80 (commit) via 93522c1f63059e7061a73b5c8ecedd65cb5b3a40 (commit) via 8e6ddc9ec5edad900a2ac5f160784507ad05703d (commit) via 0cc102f6a5b061cb81e8dc1f62c4091de1579f1a (commit) via e5fc8cc294cb1325507ab94e4db6670867e4da4a (commit) via 985259f64d1f216fc6d0849d4ff548bcc31ded32 (commit) via 08267ff07866351092e5fe6fed18a0aa9c77919f (commit) via 14b500a51172d795e8b94a5a327ea075beda601a (commit) via 9441d6f0d065fa9a1760fb369ab6f8e937941054 (commit) via 454888a7fe21ed3c3545477e2d2e8c15d6ce6e97 (commit) via 55363bd9ce9b0e6f921aade84bef9b1b99db24cc (commit) via 8285d5d7214145ae3fc9f0ab7f336dfe3356e9a3 (commit) via 23660283b26788bcd00c43ef3e01c8e2ee82d764 (commit) via ccdc0866f3c54ce43c61fa8d1f45807ef498c1e9 (commit) via b4359ca01c82afbd6fa173cedf88800c69a42b7d (commit) via 20f9ae873cd939e7ff28c1034f2d907fd7df7ec8 (commit) via 3bd76030c8525156786c7142ed03746dfdb01b67 (commit) via 69e48bea825ff67bbf8cb0c311b372e377cab6b0 (commit) via 677e6f5171020db24cd523c67e5ead57312bca38 (commit) via 7fd39dfbda6c25807a5c0d20d0366ecd6ea72613 (commit) via 4cad2ec539ac2fd8527d76940ae240e8bc38bcbf (commit) via f012e91abd2f825dea11679acc9788878588886a (commit) via 62533d5b60d47bab8e28d3462f409bf35ede0928 (commit) via a98ad2e977c67988cc7a422e545360617c1f88c0 (commit) via a5755f152b5bfa8f6f4f4c38aa07c8d2bebefa5f (commit) via 15471b5b59ababe7c1ce4f5b9265de85ecdad292 (commit) via 4c9791e3a78e562f95bf8bdc47232ebbda421e07 (commit) via 60f3955a9efc09ed6766e2acf225a48a54d66019 (commit) via 0200c20dec8a73a1a71a8c276a4ebe555dcd1280 (commit) via e24ea7bdef274e3c718518676f175bc25b5ac960 (commit) via 238d159a5f0b51d50c51bdaa72519f6a11247073 (commit) via b3f63436715c52ac20057c8f6d0296dd73d5f66b (commit) via e60da95bf7349e2d3b1570dcb76eb1297b52ac3e (commit) via 5f1bd93a71251d8f6c6921004ef7ead9b2eaecc7 (commit) via 68797d5c2f16c1502c5ee3f42446f69cf6dca749 (commit) via f0a89b9b143ef375bd20d5a2bbfa089cc3233328 (commit) via e38b224deb9d92287691f1074de84f03e9ba2c75 (commit) via d5fa4f12c7140099f376458293e9522de8098834 (commit) via 13b6fa48cdd28dbe36656672ca1b15b3670871ac (commit) via 99d062bee42c91e879a8f7573d320c8b212c5877 (commit) via 82c97cbaaa5bcf2a358fdbab01f4ecf697f3da01 (commit) via 3d0c48c774a8eef82ffd107b2c4949a1e0c53733 (commit) via a09553cfcef35cb34acf3417c31f80ca2ca7bcfc (commit) via f5ed5e2eb6fce434cff91379a38f26df43619b4e (commit) via 1b46292315348cca23084b055f9bd734a9531fa9 (commit) via 18a294b1f00af384d785f0f3f68c1aaf3b6bcd22 (commit) via cd3fb5c786ed289daea546be54a0f3112ae98044 (commit) via b78bb5e4e332bd436f9945f5a3fe618fbae7da43 (commit) via 5d206e9459472ddcb836a6eed1d76a58b112a598 (commit) via 37194c014a0a87b06653d7e2826751a37c74c73a (commit) via 7eeb5ebd2ac876f002c56ca6eb9aed9fca996786 (commit) via ba3f84c7524fdb867516a45d0e35f5c82208414b (commit) via a2159086d9cd610902f97c1d492bdbf584eb6670 (commit) via 39de34778e4cd58ac7fb33c97bc56efe3f4a0fa9 (commit) via ad5173bcd9c08cc1d4c4ee791d1913b021170850 (commit) via 529298f2dc491c96d0dd513e42684f8aaca76935 (commit) via 3b5061f91c216bd07a592cc687d6b008dfb976f7 (commit) via 5364dfa8e716e11724b9946afc6da273317b54f6 (commit) from e490bdd2627b5d227de7ceae9e86c27083ddc4ed (commit) - Log ----------------------------------------------------------------- commit 82453acc8f4200b66bd4b915cf2064a2f912c0de Merge: e490bdd2627b5d227de7ceae9e86c27083ddc4ed 675c952caeb173001d06a7cf5602915c49a60adf Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 16:27:47 2011 +0200 Merge remote-tracking branch 'pootle/master' commit 675c952caeb173001d06a7cf5602915c49a60adf Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:26:19 2011 +0200 Translation update done using Pootle. commit e8de184523503d8fa7bfd786e05d819e3903b561 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:25:59 2011 +0200 Translation update done using Pootle. commit d1a1f7183fdf05e501e5e09db8facc6da6992db3 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:25:47 2011 +0200 Translation update done using Pootle. commit 42bbb00159beeb75006e855fe59ccd6550df71f7 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:23:47 2011 +0200 Translation update done using Pootle. commit bc3d890e41e07cca8c9208b72fca46fe30fdcf77 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:22:55 2011 +0200 Translation update done using Pootle. commit d6171121955610713e11735ae3028b3b489eb756 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:22:35 2011 +0200 Translation update done using Pootle. commit 7895632a2dd23ff8bb19073f0c9b49570d519da2 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:22:17 2011 +0200 Translation update done using Pootle. commit a850b8ba0787bf23b7c50fa9464b8a28c6fc8429 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:22:06 2011 +0200 Translation update done using Pootle. commit 8df1307655a7c84e098aedfca10f62967353f19c Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:21:56 2011 +0200 Translation update done using Pootle. commit 8d8789d524a6e2cb95dade1eca3da37de89595e8 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:21:33 2011 +0200 Translation update done using Pootle. commit f98120c0ebe03c1fdafdd809e5b1ef22cb428430 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:21:03 2011 +0200 Translation update done using Pootle. commit 2806dc389fdbb07a188dcafde49ca098b50ec532 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:20:07 2011 +0200 Translation update done using Pootle. commit 796b5d09bfe8705db525734b2b210c0bf1482f80 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:19:38 2011 +0200 Translation update done using Pootle. commit 93522c1f63059e7061a73b5c8ecedd65cb5b3a40 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:19:19 2011 +0200 Translation update done using Pootle. commit 8e6ddc9ec5edad900a2ac5f160784507ad05703d Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:18:40 2011 +0200 Translation update done using Pootle. commit 0cc102f6a5b061cb81e8dc1f62c4091de1579f1a Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:18:20 2011 +0200 Translation update done using Pootle. commit e5fc8cc294cb1325507ab94e4db6670867e4da4a Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:18:10 2011 +0200 Translation update done using Pootle. commit 985259f64d1f216fc6d0849d4ff548bcc31ded32 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:17:38 2011 +0200 Translation update done using Pootle. commit 08267ff07866351092e5fe6fed18a0aa9c77919f Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:17:23 2011 +0200 Translation update done using Pootle. commit 14b500a51172d795e8b94a5a327ea075beda601a Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:17:17 2011 +0200 Translation update done using Pootle. commit 9441d6f0d065fa9a1760fb369ab6f8e937941054 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:16:53 2011 +0200 Translation update done using Pootle. commit 454888a7fe21ed3c3545477e2d2e8c15d6ce6e97 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:16:13 2011 +0200 Translation update done using Pootle. commit 55363bd9ce9b0e6f921aade84bef9b1b99db24cc Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:15:36 2011 +0200 Translation update done using Pootle. commit 8285d5d7214145ae3fc9f0ab7f336dfe3356e9a3 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:15:15 2011 +0200 Translation update done using Pootle. commit 23660283b26788bcd00c43ef3e01c8e2ee82d764 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 16:15:06 2011 +0200 Translation update done using Pootle. commit ccdc0866f3c54ce43c61fa8d1f45807ef498c1e9 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:15:04 2011 +0200 Translation update done using Pootle. commit b4359ca01c82afbd6fa173cedf88800c69a42b7d Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:14:40 2011 +0200 Translation update done using Pootle. commit 20f9ae873cd939e7ff28c1034f2d907fd7df7ec8 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 16:14:25 2011 +0200 Translation update done using Pootle. commit 3bd76030c8525156786c7142ed03746dfdb01b67 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:14:23 2011 +0200 Translation update done using Pootle. commit 69e48bea825ff67bbf8cb0c311b372e377cab6b0 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:14:10 2011 +0200 Translation update done using Pootle. commit 677e6f5171020db24cd523c67e5ead57312bca38 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 16:13:17 2011 +0200 Translation update done using Pootle. commit 7fd39dfbda6c25807a5c0d20d0366ecd6ea72613 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 16:13:03 2011 +0200 Translation update done using Pootle. commit 4cad2ec539ac2fd8527d76940ae240e8bc38bcbf Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:12:57 2011 +0200 Translation update done using Pootle. commit f012e91abd2f825dea11679acc9788878588886a Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:12:50 2011 +0200 Translation update done using Pootle. commit 62533d5b60d47bab8e28d3462f409bf35ede0928 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 16:12:28 2011 +0200 Translation update done using Pootle. commit a98ad2e977c67988cc7a422e545360617c1f88c0 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:12:27 2011 +0200 Translation update done using Pootle. commit a5755f152b5bfa8f6f4f4c38aa07c8d2bebefa5f Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 16:12:08 2011 +0200 Translation update done using Pootle. commit 15471b5b59ababe7c1ce4f5b9265de85ecdad292 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:12:01 2011 +0200 Translation update done using Pootle. commit 4c9791e3a78e562f95bf8bdc47232ebbda421e07 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:11:52 2011 +0200 Translation update done using Pootle. commit 60f3955a9efc09ed6766e2acf225a48a54d66019 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 16:11:41 2011 +0200 Translation update done using Pootle. commit 0200c20dec8a73a1a71a8c276a4ebe555dcd1280 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:11:00 2011 +0200 Translation update done using Pootle. commit e24ea7bdef274e3c718518676f175bc25b5ac960 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:10:45 2011 +0200 Translation update done using Pootle. commit 238d159a5f0b51d50c51bdaa72519f6a11247073 Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:10:32 2011 +0200 Translation update done using Pootle. commit b3f63436715c52ac20057c8f6d0296dd73d5f66b Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jul 21 16:10:20 2011 +0200 Translation update done using Pootle. commit e60da95bf7349e2d3b1570dcb76eb1297b52ac3e Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 16:07:36 2011 +0200 Translation update done using Pootle. commit 5f1bd93a71251d8f6c6921004ef7ead9b2eaecc7 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 16:07:00 2011 +0200 Translation update done using Pootle. commit 68797d5c2f16c1502c5ee3f42446f69cf6dca749 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 16:06:26 2011 +0200 Translation update done using Pootle. commit f0a89b9b143ef375bd20d5a2bbfa089cc3233328 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 16:05:33 2011 +0200 Translation update done using Pootle. commit e38b224deb9d92287691f1074de84f03e9ba2c75 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 16:05:18 2011 +0200 Translation update done using Pootle. commit d5fa4f12c7140099f376458293e9522de8098834 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 16:04:55 2011 +0200 Translation update done using Pootle. commit 13b6fa48cdd28dbe36656672ca1b15b3670871ac Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 16:02:52 2011 +0200 Translation update done using Pootle. commit 99d062bee42c91e879a8f7573d320c8b212c5877 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 16:01:09 2011 +0200 Translation update done using Pootle. commit 82c97cbaaa5bcf2a358fdbab01f4ecf697f3da01 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 16:00:25 2011 +0200 Translation update done using Pootle. commit 3d0c48c774a8eef82ffd107b2c4949a1e0c53733 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 15:58:56 2011 +0200 Translation update done using Pootle. commit a09553cfcef35cb34acf3417c31f80ca2ca7bcfc Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 15:57:20 2011 +0200 Translation update done using Pootle. commit f5ed5e2eb6fce434cff91379a38f26df43619b4e Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 15:57:01 2011 +0200 Translation update done using Pootle. commit 1b46292315348cca23084b055f9bd734a9531fa9 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 15:56:34 2011 +0200 Translation update done using Pootle. commit 18a294b1f00af384d785f0f3f68c1aaf3b6bcd22 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 15:55:56 2011 +0200 Translation update done using Pootle. commit cd3fb5c786ed289daea546be54a0f3112ae98044 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 15:51:18 2011 +0200 Translation update done using Pootle. commit b78bb5e4e332bd436f9945f5a3fe618fbae7da43 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 15:49:52 2011 +0200 Translation update done using Pootle. commit 5d206e9459472ddcb836a6eed1d76a58b112a598 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 15:49:19 2011 +0200 Translation update done using Pootle. commit 37194c014a0a87b06653d7e2826751a37c74c73a Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 15:47:41 2011 +0200 Translation update done using Pootle. commit 7eeb5ebd2ac876f002c56ca6eb9aed9fca996786 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 15:46:33 2011 +0200 Translation update done using Pootle. commit ba3f84c7524fdb867516a45d0e35f5c82208414b Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 15:45:50 2011 +0200 Translation update done using Pootle. commit a2159086d9cd610902f97c1d492bdbf584eb6670 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 15:43:04 2011 +0200 Translation update done using Pootle. commit 39de34778e4cd58ac7fb33c97bc56efe3f4a0fa9 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 15:42:50 2011 +0200 Translation update done using Pootle. commit ad5173bcd9c08cc1d4c4ee791d1913b021170850 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 15:42:24 2011 +0200 Translation update done using Pootle. commit 529298f2dc491c96d0dd513e42684f8aaca76935 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 15:41:56 2011 +0200 Translation update done using Pootle. commit 3b5061f91c216bd07a592cc687d6b008dfb976f7 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 15:41:42 2011 +0200 Translation update done using Pootle. commit 5364dfa8e716e11724b9946afc6da273317b54f6 Author: teunome <teunome(a)gmail.com> Date: Thu Jul 21 15:40:14 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/it.po | 82 ++++++++++++++++++++++++++++------------------------------- po/pt_BR.po | 63 ++++++++++++++++++++++++++------------------ 2 files changed, 76 insertions(+), 69 deletions(-) diff --git a/po/it.po b/po/it.po index 5f546b8..5b91285 100644 --- a/po/it.po +++ b/po/it.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-07-21 14:00+0200\n" -"PO-Revision-Date: 2011-07-13 13:55+0200\n" +"PO-Revision-Date: 2011-07-21 16:26+0200\n" "Last-Translator: Rouslan Placella <rouslan(a)placella.com>\n" "Language-Team: italian <it(a)li.org>\n" "Language: it\n" @@ -573,10 +573,9 @@ msgid "Search in database" msgstr "Cerca nel database" #: db_search.php:275 -#, fuzzy #| msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgid "Words or values to search for (wildcard: \"%\"):" -msgstr "Parola/e o valore/i da cercare (carattere jolly: \"%\"):" +msgstr "Parole o valori da cercare (carattere jolly: \"%\"):" #: db_search.php:280 msgid "Find:" @@ -587,10 +586,9 @@ msgid "Words are separated by a space character (\" \")." msgstr "Le parole sono separate da spazi (\" \")." #: db_search.php:298 -#, fuzzy #| msgid "Inside table(s):" msgid "Inside tables:" -msgstr "Nella/e tabella/e:" +msgstr "Nelle tabelle:" #: db_search.php:328 msgid "Inside column:" @@ -1023,10 +1021,9 @@ msgstr "Questo non è un numero!" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:51 -#, fuzzy #| msgid "Log file count" msgid "Total count" -msgstr "Numero dei file di log" +msgstr "Totale" #: js/messages.php:54 msgid "The host name is empty!" @@ -1072,24 +1069,22 @@ msgid "Edit" msgstr "Modifica" #: js/messages.php:66 server_status.php:604 -#, fuzzy #| msgid "Server Choice" msgid "Live traffic chart" -msgstr "Scelta del server" +msgstr "Grafico del traffico in tempo reale" #: js/messages.php:67 server_status.php:607 msgid "Live conn./process chart" -msgstr "" +msgstr "Grafico delle connessioni e processi in tempo reale" #: js/messages.php:68 server_status.php:625 -#, fuzzy #| msgid "Show query chart" msgid "Live query chart" -msgstr "Mostra il diagramma della query" +msgstr "Grafico delle query in tempo reale" #: js/messages.php:70 msgid "Static data" -msgstr "" +msgstr "Dati statici" #. l10n: Total number of queries #: js/messages.php:72 libraries/build_html_for_db.lib.php:45 @@ -1116,41 +1111,39 @@ msgstr "." #: js/messages.php:80 msgid "KiB sent since last refresh" -msgstr "" +msgstr "KiB inviati dall'ultimo aggiornamento" #: js/messages.php:81 msgid "KiB received since last refresh" -msgstr "" +msgstr "KiB ricevuti dall'ultimo aggiornamento" #: js/messages.php:82 -#, fuzzy #| msgid "Server Choice" msgid "Server traffic (in KiB)" -msgstr "Scelta del server" +msgstr "Traffico del server (in KiB)" #: js/messages.php:83 msgid "Connections since last refresh" -msgstr "" +msgstr "Numero di connessioni dall'ultimo aggiornamento" #: js/messages.php:84 server_status.php:983 msgid "Processes" msgstr "Processi" #: js/messages.php:85 -#, fuzzy #| msgid "Connections" msgid "Connections / Processes" -msgstr "Connessioni" +msgstr "Connessioni / Processi" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:87 msgid "Questions since last refresh" -msgstr "" +msgstr "Numero di 'questions' dall'ultimo aggiornamento" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:89 msgid "Questions (executed statements by the server)" -msgstr "" +msgstr "Questions (instruzioni eseguiti dal server)" #: js/messages.php:91 server_status.php:587 msgid "Query statistics" @@ -1158,15 +1151,15 @@ msgstr "Statistiche query" #: js/messages.php:94 msgid "System CPU Usage" -msgstr "" +msgstr "Utilizzo della CPU" #: js/messages.php:95 msgid "System memory" -msgstr "" +msgstr "Memoria" #: js/messages.php:96 msgid "System swap" -msgstr "" +msgstr "Swap" #: js/messages.php:97 libraries/common.lib.php:1276 server_status.php:1398 msgid "MiB" @@ -1177,14 +1170,14 @@ msgid "KiB" msgstr "KiB" #: js/messages.php:100 +#, fuzzy msgid "Average load" -msgstr "" +msgstr "Carico medio" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:102 -#, fuzzy msgid "Questions" -msgstr "Suggestions:" +msgstr "Questions" #: js/messages.php:103 server_status.php:864 msgid "Traffic" @@ -1196,24 +1189,22 @@ msgid "Settings" msgstr "Impostazioni" #: js/messages.php:105 -#, fuzzy #| msgid "Remove database" msgid "Remove chart" -msgstr "Rimuovi il database" +msgstr "Rimuovi il diagramma" #: js/messages.php:106 msgid "Edit labels and series" -msgstr "" +msgstr "Modifica le etichette e le serie" #: js/messages.php:107 -#, fuzzy #| msgid "Snap to grid" msgid "Add chart to grid" -msgstr "Calamita alla griglia" +msgstr "Aggiungi diagramma alla griglia" #: js/messages.php:109 msgid "Please add at least one variable to the series" -msgstr "" +msgstr "Aggiungi almeno una variabile alla serie" #: js/messages.php:110 libraries/display_export.lib.php:306 #: libraries/display_tbl.lib.php:561 libraries/export/sql.php:1039 @@ -1223,36 +1214,38 @@ msgid "None" msgstr "Nessuno" #: js/messages.php:111 +#, fuzzy msgid "Resume monitor" -msgstr "" +msgstr "Avvia il monitoraggio" #: js/messages.php:112 +#, fuzzy msgid "Pause monitor" -msgstr "" +msgstr "Arresta il monitoraggio" #: js/messages.php:114 msgid "general_log and slow_query_log is enabled." -msgstr "" +msgstr "general_log e slow_query_log sono abilitati." #: js/messages.php:115 msgid "general_log is enabled." -msgstr "" +msgstr "general_log é abilitato." #: js/messages.php:116 msgid "slow_query_log is enabled." -msgstr "" +msgstr "slow_query_log é abilitato." #: js/messages.php:117 msgid "slow_query_log and general_log is disabled." -msgstr "" +msgstr "slow_query_log e general_log sono disabilitati." #: js/messages.php:118 msgid "log_output is not set to TABLE." -msgstr "" +msgstr "log_output non é impostato su TABLE." #: js/messages.php:119 msgid "log_output is set to TABLE." -msgstr "" +msgstr "log_output é impostato su TABLE." #: js/messages.php:120 #, php-format @@ -1261,11 +1254,14 @@ msgid "" "than %d seconds. It is advisable to set this long_query_time 0-2 seconds, " "depending on your system." msgstr "" +"slow_query_log é abilitato, ma il server registra solo query che impiegano " +"piú di %d secondi. É consigliato di impostare long_query_time a 0-2 seconds, " +"a secondi del tipo di sistema." #: js/messages.php:121 #, php-format msgid "long_query_time is set to %d second(s)." -msgstr "" +msgstr "long_query_time é impostato a %d secondi." #: js/messages.php:122 msgid "" diff --git a/po/pt_BR.po b/po/pt_BR.po index bb7638a..b0b620a 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,8 +4,8 @@ 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-07-21 14:00+0200\n" -"PO-Revision-Date: 2011-07-17 20:04+0200\n" -"Last-Translator: <rds_ralison(a)yahoo.com.br>\n" +"PO-Revision-Date: 2011-07-21 16:15+0200\n" +"Last-Translator: <teunome(a)gmail.com>\n" "Language-Team: brazilian_portuguese <pt_BR(a)li.org>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" @@ -1147,11 +1147,11 @@ msgstr "" #: js/messages.php:95 msgid "System memory" -msgstr "" +msgstr "Memória do sistema" #: js/messages.php:96 msgid "System swap" -msgstr "" +msgstr "Swap do sistema" #: js/messages.php:97 libraries/common.lib.php:1276 server_status.php:1398 msgid "MiB" @@ -1163,7 +1163,7 @@ msgstr "KB" #: js/messages.php:100 msgid "Average load" -msgstr "" +msgstr "Carga média" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:102 @@ -1191,7 +1191,7 @@ msgstr "Remover Banco de Dados" #: js/messages.php:106 msgid "Edit labels and series" -msgstr "" +msgstr "Editar rótulos e séries." #: js/messages.php:107 #, fuzzy @@ -1201,7 +1201,7 @@ msgstr "Ajustar à grade" #: js/messages.php:109 msgid "Please add at least one variable to the series" -msgstr "" +msgstr "Por favor adicione ao menos uma variável a série" #: js/messages.php:110 libraries/display_export.lib.php:306 #: libraries/display_tbl.lib.php:561 libraries/export/sql.php:1039 @@ -1220,19 +1220,19 @@ msgstr "" #: js/messages.php:114 msgid "general_log and slow_query_log is enabled." -msgstr "" +msgstr "general_log e slow_query_log estão ativados." #: js/messages.php:115 msgid "general_log is enabled." -msgstr "" +msgstr "general_log está ativado." #: js/messages.php:116 msgid "slow_query_log is enabled." -msgstr "" +msgstr "slow_query_log está ativado." #: js/messages.php:117 msgid "slow_query_log and general_log is disabled." -msgstr "" +msgstr "slow_query_log e general_log estão desativados." #: js/messages.php:118 msgid "log_output is not set to TABLE." @@ -1249,17 +1249,22 @@ msgid "" "than %d seconds. It is advisable to set this long_query_time 0-2 seconds, " "depending on your system." msgstr "" +"slow_query_log está ativado, mas o servidor faz o log apenas de queries que " +"demoram mais do que %d segundos. É aconselhado alterar essa long_query_time " +"0-2 segundos, dependendo do seu sistema." #: js/messages.php:121 #, php-format msgid "long_query_time is set to %d second(s)." -msgstr "" +msgstr "long_query_time está definida para %d segundo(s)." #: js/messages.php:122 msgid "" "Following settings will be applied globally and reset to default on server " "restart:" msgstr "" +"As seguintes configurações serão aplicadas globalmente e restauradas para o " +"padrão quando o servidor reiniciar:" #. l10n: %s is FILE or TABLE #: js/messages.php:124 @@ -1286,13 +1291,15 @@ msgstr "Desabilitado" #: js/messages.php:130 #, php-format msgid "Set long_query_time to %ds" -msgstr "" +msgstr "Definir long_query_time para %ds" #: js/messages.php:131 msgid "" "You can't change these variables. Please log in as root or contact your " "database administrator." msgstr "" +"Você não pode alterar essas variáveis. Por favor faça o log como root ou " +"entre em contato com o administrador." #: js/messages.php:132 #, fuzzy @@ -1320,7 +1327,7 @@ msgstr "" #: js/messages.php:138 #, php-format msgid "Divided by %s:" -msgstr "" +msgstr "Dividido por %s:" #: js/messages.php:140 #, fuzzy @@ -1330,7 +1337,7 @@ msgstr "Tabelas selecionadas" #: js/messages.php:141 msgid "Group together INSERTs into same table" -msgstr "" +msgstr "Agrupar INSERTs na mesma tabela" #: js/messages.php:142 msgid "" @@ -1348,7 +1355,7 @@ msgstr "" #: js/messages.php:145 msgid "Analysing & loading logs. This may take a while." -msgstr "" +msgstr "Analisando e carregando logs. Isso pode demorar." #: js/messages.php:146 msgid "" @@ -5016,7 +5023,7 @@ msgstr "Número de linhas:" #: libraries/display_export.lib.php:155 msgid "Row to begin at:" -msgstr "" +msgstr "Começar na linha:" #: libraries/display_export.lib.php:166 msgid "Dump all rows" @@ -5044,15 +5051,15 @@ msgstr "Nome do arquivo do modelo:" #: libraries/display_export.lib.php:222 msgid "@SERVER@ will become the server name" -msgstr "" +msgstr "@SERVER@ se tornará o nome do servidor" #: libraries/display_export.lib.php:224 msgid ", @DATABASE@ will become the database name" -msgstr "" +msgstr ", @DATABASE@ se tornará o nome do banco de dados" #: libraries/display_export.lib.php:226 msgid ", @TABLE@ will become the table name" -msgstr "" +msgstr ", @TABLE@ se tornará o nome da tabela" #: libraries/display_export.lib.php:230 #, fuzzy, php-format @@ -5120,6 +5127,8 @@ msgid "" "Scroll down to fill in the options for the selected format and ignore the " "options for other formats." msgstr "" +"Role para baixo para preencher as opções para o formato selecionado e " +"ignorar as opções de outros formatos." #: libraries/display_export.lib.php:340 libraries/display_import.lib.php:260 msgid "Encoding Conversion:" @@ -5165,13 +5174,15 @@ msgstr "Arquivo para importar:" #: libraries/display_import.lib.php:156 #, php-format msgid "File may be compressed (%s) or uncompressed." -msgstr "" +msgstr "Arquivo pode ser compactado (%s) ou descompactado." #: libraries/display_import.lib.php:158 msgid "" "A compressed file's name must end in .[format].[compression]. " "Example: .sql.zip" msgstr "" +"O nome de um arquivo compactado deve terminar em " +".[formato].[compactação]. Exemplo: .sql.zip" #: libraries/display_import.lib.php:178 msgid "File uploads are not allowed on this server." @@ -5220,7 +5231,7 @@ msgstr "Adicionar/Remover colunas" #: libraries/display_tbl.lib.php:414 msgid "Drag to reorder" -msgstr "" +msgstr "Arraste para reordenar" #: libraries/display_tbl.lib.php:415 #, fuzzy @@ -5230,11 +5241,11 @@ msgstr "Clique para selecionar" #: libraries/display_tbl.lib.php:416 msgid "Click to mark/unmark" -msgstr "" +msgstr "Clique para marcar/desmarcar" #: libraries/display_tbl.lib.php:417 msgid "Click the drop-down arrow to toggle column's visibility" -msgstr "" +msgstr "Clique na seta para alternar a visibilidade da coluna" #: libraries/display_tbl.lib.php:428 #, php-format @@ -5336,7 +5347,7 @@ msgstr "Transformações do navegador" #: libraries/display_tbl.lib.php:647 msgid "Geometry" -msgstr "" +msgstr "Geometria" #: libraries/display_tbl.lib.php:648 msgid "Well Known Text" @@ -5390,7 +5401,7 @@ msgstr "Exibir gráfico" #: libraries/display_tbl.lib.php:2506 msgid "Visualize GIS data" -msgstr "" +msgstr "Visualisar dados GIS" #: libraries/display_tbl.lib.php:2526 #, fuzzy hooks/post-receive -- phpMyAdmin

1 0