From 3a3da2987e9ea0a1a9cd858d014e08dab52c9712 Mon Sep 17 00:00:00 2001
From: Dieter Adriaenssens <ruleant@users.sourceforge.net>
Date: Wed, 11 Apr 2012 16:18:14 +0200
Subject: [PATCH 1/7] add vim directive for indenting with spaces

---
 gis_data_editor.php                               | 1 +
 js/OpenStreetMap.js                               | 1 +
 js/gis_data_editor.js                             | 1 +
 js/keyhandler.js                                  | 1 +
 js/makegrid.js                                    | 1 +
 js/querywindow.js                                 | 1 +
 js/server_plugins.js                              | 3 ++-
 js/server_status_monitor.js                       | 1 +
 js/server_variables.js                            | 1 +
 js/tbl_chart.js                                   | 1 +
 js/tbl_gis_visualization.js                       | 1 +
 libraries/PMA.php                                 | 1 +
 libraries/data_drizzle.inc.php                    | 3 ++-
 libraries/data_mysql.inc.php                      | 3 ++-
 libraries/gis/pma_gis_factory.php                 | 3 ++-
 libraries/gis/pma_gis_geometry.php                | 1 +
 libraries/gis/pma_gis_geometrycollection.php      | 1 +
 libraries/gis/pma_gis_linestring.php              | 1 +
 libraries/gis/pma_gis_multilinestring.php         | 1 +
 libraries/gis/pma_gis_multipoint.php              | 1 +
 libraries/gis/pma_gis_multipolygon.php            | 1 +
 libraries/gis/pma_gis_point.php                   | 1 +
 libraries/gis/pma_gis_polygon.php                 | 1 +
 libraries/gis/pma_gis_visualization.php           | 1 +
 libraries/gis_visualization.lib.php               | 1 +
 libraries/import/shp.php                          | 1 +
 libraries/server_variables_doc.php                | 1 +
 setup/frames/index.inc.php                        | 1 +
 setup/frames/menu.inc.php                         | 1 +
 setup/frames/servers.inc.php                      | 1 +
 setup/index.php                                   | 1 +
 setup/scripts.js                                  | 1 +
 tbl_gis_visualization.php                         | 1 +
 test/bootstrap-dist.php                           | 1 +
 test/classes/PMA_Theme_test.php                   | 1 +
 test/classes/_data/gen_version_info/info.inc.php  | 3 ++-
 test/classes/_data/incorrect_theme/info.inc.php   | 3 ++-
 test/classes/gis/PMA_GIS_Factory_test.php         | 3 ++-
 test/classes/gis/PMA_GIS_Geom_test.php            | 3 ++-
 test/classes/gis/PMA_GIS_Geometry_test.php        | 3 ++-
 test/classes/gis/PMA_GIS_Linestring_test.php      | 3 ++-
 test/classes/gis/PMA_GIS_Multilinestring_test.php | 3 ++-
 test/classes/gis/PMA_GIS_Multipoint_test.php      | 3 ++-
 test/classes/gis/PMA_GIS_Multipolygon_test.php    | 1 +
 test/classes/gis/PMA_GIS_Point_test.php           | 3 ++-
 test/classes/gis/PMA_GIS_Polygon_test.php         | 3 ++-
 test/libraries/PMA_GIS_modifyQuery_test.php       | 3 ++-
 url.php                                           | 1 +
 webapp.php                                        | 1 +
 49 files changed, 64 insertions(+), 15 deletions(-)

diff --git a/gis_data_editor.php b/gis_data_editor.php
index 0b447543be..70c96718b3 100644
--- a/gis_data_editor.php
+++ b/gis_data_editor.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 require_once 'libraries/common.inc.php';
 if (! isset($_REQUEST['get_gis_editor']) && ! isset($_REQUEST['generate'])) {
     include_once 'libraries/header_http.inc.php';
diff --git a/js/OpenStreetMap.js b/js/OpenStreetMap.js
index aebfa65db0..8a7f0166d8 100644
--- a/js/OpenStreetMap.js
+++ b/js/OpenStreetMap.js
@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Namespace: Util.OSM
  */
diff --git a/js/gis_data_editor.js b/js/gis_data_editor.js
index 3f7eceac41..bdfaa32199 100644
--- a/js/gis_data_editor.js
+++ b/js/gis_data_editor.js
@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @fileoverview    functions used in GIS data editor
  *
diff --git a/js/keyhandler.js b/js/keyhandler.js
index 63a13facfd..40c429f8e3 100644
--- a/js/keyhandler.js
+++ b/js/keyhandler.js
@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
   * Allows moving around inputs/select by Ctrl+arrows
   *
diff --git a/js/makegrid.js b/js/makegrid.js
index 38dc220487..3635f82221 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Create advanced table (resize, reorder, and show/hide columns; and also grid editing).
  * This function is designed mainly for table DOM generated from browsing a table in the database.
diff --git a/js/querywindow.js b/js/querywindow.js
index 0eb1cc13a5..67eef0d55e 100644
--- a/js/querywindow.js
+++ b/js/querywindow.js
@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 function PMA_queryAutoCommit()
 {
     var sqlqueryform = document.getElementById('sqlqueryform');
diff --git a/js/server_plugins.js b/js/server_plugins.js
index 9d20edbefc..56f5f8f7db 100644
--- a/js/server_plugins.js
+++ b/js/server_plugins.js
@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Functions used in server plugins pages
  */
@@ -27,4 +28,4 @@ $(function() {
     });
     $tables.find('thead th')
         .append('<img class="sortableIcon" src="' + pma_theme_image + 'cleardot.gif" alt="">');
-});
\ No newline at end of file
+});
diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index f6e5e34e21..b9c686217e 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 $(function() {
     // Show tab links
     $('div#statustabs_charting div.tabLinks').show();
diff --git a/js/server_variables.js b/js/server_variables.js
index 691e6677b9..55d2b41357 100644
--- a/js/server_variables.js
+++ b/js/server_variables.js
@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 $(function() {
     var textFilter = null, odd_row = false;
     var testString = 'abcdefghijklmnopqrstuvwxyz0123456789,ABCEFGHIJKLMOPQRSTUVWXYZ';
diff --git a/js/tbl_chart.js b/js/tbl_chart.js
index c5693d6af8..1070e2afb4 100644
--- a/js/tbl_chart.js
+++ b/js/tbl_chart.js
@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 var chart_xaxis_idx = -1;
 var chart_series;
 var chart_series_index = -1;
diff --git a/js/tbl_gis_visualization.js b/js/tbl_gis_visualization.js
index e43a267db5..03016a67b8 100644
--- a/js/tbl_gis_visualization.js
+++ b/js/tbl_gis_visualization.js
@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @fileoverview    functions used for visualizing GIS data
  *
diff --git a/libraries/PMA.php b/libraries/PMA.php
index 8bac707cac..4a35ebf03d 100644
--- a/libraries/PMA.php
+++ b/libraries/PMA.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Enter description here...
  * @package PhpMyAdmin
diff --git a/libraries/data_drizzle.inc.php b/libraries/data_drizzle.inc.php
index f8b9dc9469..d5c59427c2 100644
--- a/libraries/data_drizzle.inc.php
+++ b/libraries/data_drizzle.inc.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Column types and functions supported by Drizzle
  *
@@ -222,4 +223,4 @@ if ($cfg['ShowFunctionFields']) {
     unset($restrict_functions);
 } // end if
 
-?>
\ No newline at end of file
+?>
diff --git a/libraries/data_mysql.inc.php b/libraries/data_mysql.inc.php
index 9b1bd481a5..3ea587cab7 100644
--- a/libraries/data_mysql.inc.php
+++ b/libraries/data_mysql.inc.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Column types and functions supported by MySQL
  *
@@ -283,4 +284,4 @@ if ($cfg['ShowFunctionFields']) {
     unset($restrict_functions);
 } // end if
 
-?>
\ No newline at end of file
+?>
diff --git a/libraries/gis/pma_gis_factory.php b/libraries/gis/pma_gis_factory.php
index 9c9cdc025a..c62599fedd 100644
--- a/libraries/gis/pma_gis_factory.php
+++ b/libraries/gis/pma_gis_factory.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Factory class that handles the creation of geometric objects.
  *
@@ -47,4 +48,4 @@ class PMA_GIS_Factory
         }
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/libraries/gis/pma_gis_geometry.php b/libraries/gis/pma_gis_geometry.php
index 58858bc471..ad7e27a470 100644
--- a/libraries/gis/pma_gis_geometry.php
+++ b/libraries/gis/pma_gis_geometry.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Base class for all GIS data type classes.
  *
diff --git a/libraries/gis/pma_gis_geometrycollection.php b/libraries/gis/pma_gis_geometrycollection.php
index ef2aa7b61c..7ea50e0c7c 100644
--- a/libraries/gis/pma_gis_geometrycollection.php
+++ b/libraries/gis/pma_gis_geometrycollection.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Handles the visualization of GIS GEOMETRYCOLLECTION objects.
  *
diff --git a/libraries/gis/pma_gis_linestring.php b/libraries/gis/pma_gis_linestring.php
index 00c5def482..a874edc03a 100644
--- a/libraries/gis/pma_gis_linestring.php
+++ b/libraries/gis/pma_gis_linestring.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Handles the visualization of GIS LINESTRING objects.
  *
diff --git a/libraries/gis/pma_gis_multilinestring.php b/libraries/gis/pma_gis_multilinestring.php
index 1d9582ec48..0700a18767 100644
--- a/libraries/gis/pma_gis_multilinestring.php
+++ b/libraries/gis/pma_gis_multilinestring.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Handles the visualization of GIS MULTILINESTRING objects.
  *
diff --git a/libraries/gis/pma_gis_multipoint.php b/libraries/gis/pma_gis_multipoint.php
index e88cc4fef8..106c846b5d 100644
--- a/libraries/gis/pma_gis_multipoint.php
+++ b/libraries/gis/pma_gis_multipoint.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Handles the visualization of GIS MULTIPOINT objects.
  *
diff --git a/libraries/gis/pma_gis_multipolygon.php b/libraries/gis/pma_gis_multipolygon.php
index 75c1085eb9..42f7d61c43 100644
--- a/libraries/gis/pma_gis_multipolygon.php
+++ b/libraries/gis/pma_gis_multipolygon.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Handles the visualization of GIS MULTIPOLYGON objects.
  *
diff --git a/libraries/gis/pma_gis_point.php b/libraries/gis/pma_gis_point.php
index 457839a834..c18509b96d 100644
--- a/libraries/gis/pma_gis_point.php
+++ b/libraries/gis/pma_gis_point.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Handles the visualization of GIS POINT objects.
  *
diff --git a/libraries/gis/pma_gis_polygon.php b/libraries/gis/pma_gis_polygon.php
index ef8902362a..889e442144 100644
--- a/libraries/gis/pma_gis_polygon.php
+++ b/libraries/gis/pma_gis_polygon.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Handles the visualization of GIS POLYGON objects.
  *
diff --git a/libraries/gis/pma_gis_visualization.php b/libraries/gis/pma_gis_visualization.php
index 3422217f4f..5410fc3352 100644
--- a/libraries/gis/pma_gis_visualization.php
+++ b/libraries/gis/pma_gis_visualization.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Generates the JavaScripts needed to visualize GIS data.
  *
diff --git a/libraries/gis_visualization.lib.php b/libraries/gis_visualization.lib.php
index f89bb14f43..9ec6cf19c1 100644
--- a/libraries/gis_visualization.lib.php
+++ b/libraries/gis_visualization.lib.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Functions used to generate GIS visualizations.
  *
diff --git a/libraries/import/shp.php b/libraries/import/shp.php
index 88220591e7..e935ca271f 100644
--- a/libraries/import/shp.php
+++ b/libraries/import/shp.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * ESRI Shape file import plugin for phpMyAdmin
  *
diff --git a/libraries/server_variables_doc.php b/libraries/server_variables_doc.php
index dbd19ebbdc..37d183567d 100644
--- a/libraries/server_variables_doc.php
+++ b/libraries/server_variables_doc.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Used to create server variables documentation links
  * $VARIABLE_DOC_LINKS[string $name] = array(
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index 52e23c86e3..cf762a1ec3 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Overview (main page)
  *
diff --git a/setup/frames/menu.inc.php b/setup/frames/menu.inc.php
index e12d5e574d..2cfaa45593 100644
--- a/setup/frames/menu.inc.php
+++ b/setup/frames/menu.inc.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Menu items
  *
diff --git a/setup/frames/servers.inc.php b/setup/frames/servers.inc.php
index b95b817412..d28a17d389 100644
--- a/setup/frames/servers.inc.php
+++ b/setup/frames/servers.inc.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Server create and edit view
  *
diff --git a/setup/index.php b/setup/index.php
index 5c75eb8664..1b202ba842 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Front controller for setup script
  *
diff --git a/setup/scripts.js b/setup/scripts.js
index e39ccacfb9..1a3d950d88 100644
--- a/setup/scripts.js
+++ b/setup/scripts.js
@@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Functions used in Setup configuration forms
  */
diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php
index ebfbf67041..7060737ea1 100644
--- a/tbl_gis_visualization.php
+++ b/tbl_gis_visualization.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * handles creation of the GIS visualizations.
  *
diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php
index fac9b2720d..5ad7e4c488 100644
--- a/test/bootstrap-dist.php
+++ b/test/bootstrap-dist.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 
 // Adding phpMyAdmin sources to include path
 set_include_path(get_include_path() . PATH_SEPARATOR . dirname(realpath("../index.php")));
diff --git a/test/classes/PMA_Theme_test.php b/test/classes/PMA_Theme_test.php
index c9b2358db4..ef7ef786a6 100644
--- a/test/classes/PMA_Theme_test.php
+++ b/test/classes/PMA_Theme_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 
 require_once 'libraries/Theme.class.php';
 
diff --git a/test/classes/_data/gen_version_info/info.inc.php b/test/classes/_data/gen_version_info/info.inc.php
index d4e2e90911..4c0cf6329e 100644
--- a/test/classes/_data/gen_version_info/info.inc.php
+++ b/test/classes/_data/gen_version_info/info.inc.php
@@ -1,7 +1,8 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Full infrmation about theme, including $theme_generation and $theme_version
  */
 $theme_name = 'Test Theme';
 $theme_generation = "2";
-$theme_version = "0.3";
\ No newline at end of file
+$theme_version = "0.3";
diff --git a/test/classes/_data/incorrect_theme/info.inc.php b/test/classes/_data/incorrect_theme/info.inc.php
index af6d242fb5..333d9c2532 100644
--- a/test/classes/_data/incorrect_theme/info.inc.php
+++ b/test/classes/_data/incorrect_theme/info.inc.php
@@ -1,7 +1,8 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Incorrect theme information file.
  * Full name is not specified
  */
 
-$theme_full_version = '1.0';
\ No newline at end of file
+$theme_full_version = '1.0';
diff --git a/test/classes/gis/PMA_GIS_Factory_test.php b/test/classes/gis/PMA_GIS_Factory_test.php
index c426127878..ba0b320a09 100644
--- a/test/classes/gis/PMA_GIS_Factory_test.php
+++ b/test/classes/gis/PMA_GIS_Factory_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Factory
  *
@@ -77,4 +78,4 @@ class PMA_GIS_FactoryTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/test/classes/gis/PMA_GIS_Geom_test.php b/test/classes/gis/PMA_GIS_Geom_test.php
index 24c596efc1..920a44c7f3 100644
--- a/test/classes/gis/PMA_GIS_Geom_test.php
+++ b/test/classes/gis/PMA_GIS_Geom_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Abstract parent class for all PMA_GIS_<Geom_type> test classes
  *
@@ -71,4 +72,4 @@ abstract class PMA_GIS_GeomTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($this->object->scaleRow($spatial), $min_max);
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/test/classes/gis/PMA_GIS_Geometry_test.php b/test/classes/gis/PMA_GIS_Geometry_test.php
index cc9fa86a09..080707addd 100644
--- a/test/classes/gis/PMA_GIS_Geometry_test.php
+++ b/test/classes/gis/PMA_GIS_Geometry_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Geometry
  *
@@ -244,4 +245,4 @@ class PMA_GIS_GeometryTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/test/classes/gis/PMA_GIS_Linestring_test.php b/test/classes/gis/PMA_GIS_Linestring_test.php
index e45cf70e92..f8760b9133 100644
--- a/test/classes/gis/PMA_GIS_Linestring_test.php
+++ b/test/classes/gis/PMA_GIS_Linestring_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Linestring
  *
@@ -159,4 +160,4 @@ class PMA_GIS_LinestringTest extends PMA_GIS_GeomTest
         );
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/test/classes/gis/PMA_GIS_Multilinestring_test.php b/test/classes/gis/PMA_GIS_Multilinestring_test.php
index 18400805f8..aed8f721bf 100644
--- a/test/classes/gis/PMA_GIS_Multilinestring_test.php
+++ b/test/classes/gis/PMA_GIS_Multilinestring_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Multilinestring
  *
@@ -219,4 +220,4 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest
         );
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/test/classes/gis/PMA_GIS_Multipoint_test.php b/test/classes/gis/PMA_GIS_Multipoint_test.php
index c088c40340..8bc2119725 100644
--- a/test/classes/gis/PMA_GIS_Multipoint_test.php
+++ b/test/classes/gis/PMA_GIS_Multipoint_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Multipoint
  *
@@ -163,4 +164,4 @@ class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest
         );
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/test/classes/gis/PMA_GIS_Multipolygon_test.php b/test/classes/gis/PMA_GIS_Multipolygon_test.php
index bae6859f78..eb1591690c 100644
--- a/test/classes/gis/PMA_GIS_Multipolygon_test.php
+++ b/test/classes/gis/PMA_GIS_Multipolygon_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Multipolygon
  *
diff --git a/test/classes/gis/PMA_GIS_Point_test.php b/test/classes/gis/PMA_GIS_Point_test.php
index 971bd18894..165c58f848 100644
--- a/test/classes/gis/PMA_GIS_Point_test.php
+++ b/test/classes/gis/PMA_GIS_Point_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Point
  *
@@ -165,4 +166,4 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest
         );
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/test/classes/gis/PMA_GIS_Polygon_test.php b/test/classes/gis/PMA_GIS_Polygon_test.php
index 8b9441103c..9d0e951980 100644
--- a/test/classes/gis/PMA_GIS_Polygon_test.php
+++ b/test/classes/gis/PMA_GIS_Polygon_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Test for PMA_GIS_Polygon
  *
@@ -345,4 +346,4 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest
         );
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/test/libraries/PMA_GIS_modifyQuery_test.php b/test/libraries/PMA_GIS_modifyQuery_test.php
index 209b97e758..863b630402 100644
--- a/test/libraries/PMA_GIS_modifyQuery_test.php
+++ b/test/libraries/PMA_GIS_modifyQuery_test.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Tests for PMA_GIS_modifyQuery method
  *
@@ -91,4 +92,4 @@ class PMA_GIS_modifyQueryTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/url.php b/url.php
index 5088eff2c1..23f3ac5b76 100644
--- a/url.php
+++ b/url.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * URL redirector to avoid leaking Referer with some sensitive information.
  */
diff --git a/webapp.php b/webapp.php
index 8affd5c76a..0f7c19028b 100644
--- a/webapp.php
+++ b/webapp.php
@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * generate an WebApp file for Prism / WebRunner
  *

From a3312b3ce487473e4987fed3f23fe752b13fae08 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Wed, 11 Apr 2012 16:19:53 +0200
Subject: [PATCH 2/7] Translated using Weblate.

---
 po/si.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/po/si.po b/po/si.po
index 87d5b100e3..e9e99271b2 100644
--- a/po/si.po
+++ b/po/si.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-04-10 11:58+0200\n"
-"PO-Revision-Date: 2012-04-10 20:36+0200\n"
+"PO-Revision-Date: 2012-04-11 16:19+0200\n"
 "Last-Translator: Madhura Jayaratne <madhura.cj@gmail.com>\n"
 "Language-Team: sinhala <si@li.org>\n"
 "Language: si\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Weblate 0.8\n"
+"X-Generator: Weblate 0.9\n"
 
 #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:350
 #: libraries/display_tbl.lib.php:359 server_privileges.php:1793
@@ -3598,7 +3598,7 @@ msgstr "දෝෂ නොසලකා ඇතුල් කිරීම් භා
 
 #: libraries/config/messages.inc.php:134
 msgid "Syntax to use when inserting data"
-msgstr "දත්ත ඇතුළු කිරීමේදී භාවිතා කලයුතු වාග් රීතිය"
+msgstr "දත්ත ඇතුල් කිරීමේදී භාවිතා කල යුතු වාග් රීතිය"
 
 #: libraries/config/messages.inc.php:135 libraries/export/sql.php:286
 msgid "Maximal length of created query"

From b6c5f4222b2cbf615e0359b75632ef2b72ae87cc Mon Sep 17 00:00:00 2001
From: Julio Guerra <xullo123@hotmail.com>
Date: Wed, 11 Apr 2012 17:58:04 +0200
Subject: [PATCH 3/7] Translated using Weblate.

---
 po/gl.po | 153 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 81 insertions(+), 72 deletions(-)

diff --git a/po/gl.po b/po/gl.po
index ffbf1ce127..e6d4e8cdcb 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,11 +1,11 @@
 # Automatically generated <>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
+"Project-Id-Version: phpMyAdmin 3.5.1-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-04-10 11:58+0200\n"
-"PO-Revision-Date: 2012-03-20 03:34+0200\n"
-"Last-Translator: frandieguez <fran.dieguez@mabishu.com>\n"
+"PO-Revision-Date: 2012-04-11 16:57-0000\n"
+"Last-Translator: Julio Guerra <xullo123@hotmail.com>\n"
 "Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
@@ -759,7 +759,7 @@ msgstr "Acción"
 
 #: db_tracking.php:101 js/messages.php:34
 msgid "Delete tracking data for this table"
-msgstr ""
+msgstr "Borra os datos de seguimento para esta táboa"
 
 #: db_tracking.php:119 tbl_tracking.php:617 tbl_tracking.php:675
 msgid "active"
@@ -840,40 +840,40 @@ msgstr "Exportar as táboas"
 #: gis_data_editor.php:84
 #, php-format
 msgid "Value for the column \"%s\""
-msgstr ""
+msgstr "Valor para a columna \"%s\""
 
 #: gis_data_editor.php:113 tbl_gis_visualization.php:164
 msgid "Use OpenStreetMaps as Base Layer"
-msgstr ""
+msgstr "Utilizar OpenStreetMaps como Capa Base"
 
 #: gis_data_editor.php:134
 msgid "SRID"
-msgstr ""
+msgstr "SRID"
 
 #: gis_data_editor.php:151 js/messages.php:322
 #: libraries/display_tbl.lib.php:692
 msgid "Geometry"
-msgstr ""
+msgstr "Xeometría"
 
 #: gis_data_editor.php:172 js/messages.php:318
 msgid "Point"
-msgstr ""
+msgstr "Punto"
 
 #: gis_data_editor.php:173 gis_data_editor.php:197 gis_data_editor.php:245
 #: gis_data_editor.php:297 js/messages.php:316
 msgid "X"
-msgstr ""
+msgstr "X"
 
 #: gis_data_editor.php:175 gis_data_editor.php:199 gis_data_editor.php:247
 #: gis_data_editor.php:299 js/messages.php:317
 msgid "Y"
-msgstr ""
+msgstr "Y"
 
 #: gis_data_editor.php:195 gis_data_editor.php:243 gis_data_editor.php:295
 #: js/messages.php:319
 #, php-format
 msgid "Point %d"
-msgstr ""
+msgstr "Punto %d"
 
 #: gis_data_editor.php:204 gis_data_editor.php:250 gis_data_editor.php:302
 #: js/messages.php:325
@@ -890,11 +890,11 @@ msgstr "As liñas rematan por"
 
 #: gis_data_editor.php:223 gis_data_editor.php:279 js/messages.php:324
 msgid "Outer Ring"
-msgstr ""
+msgstr "Círculo externo"
 
 #: gis_data_editor.php:225 gis_data_editor.php:281 js/messages.php:323
 msgid "Inner Ring"
-msgstr ""
+msgstr "Círculo interno"
 
 #: gis_data_editor.php:252
 #, fuzzy
@@ -910,7 +910,7 @@ msgstr "Engadir un usuario novo"
 
 #: gis_data_editor.php:266 js/messages.php:321
 msgid "Polygon"
-msgstr ""
+msgstr "Polígono"
 
 #: gis_data_editor.php:306 js/messages.php:327
 #, fuzzy
@@ -926,13 +926,15 @@ msgstr "Engadir un servidor novo"
 
 #: gis_data_editor.php:317
 msgid "Output"
-msgstr ""
+msgstr "Saída"
 
 #: gis_data_editor.php:318
 msgid ""
 "Chose \"GeomFromText\" from the \"Function\" column and paste the below "
 "string into the \"Value\" field"
 msgstr ""
+"Seleccione \"GeomFromText\" da columna \"Función\" e pegue a cadea situada "
+"debaixo no campo \"Valor\""
 
 #: import.php:86
 #, php-format
@@ -981,6 +983,8 @@ msgstr ""
 msgid ""
 "Cannot convert file's character set without character set conversion library"
 msgstr ""
+"Non se pode convertir o xogo de carácteres do arquivo sen a librería "
+"correspondente"
 
 #: import.php:439 libraries/display_import.lib.php:23
 msgid "Could not load import plugins, please check your installation!"
@@ -1153,7 +1157,7 @@ msgstr "Escolla de servidor"
 
 #: js/messages.php:63 server_status.php:820
 msgid "Live conn./process chart"
-msgstr ""
+msgstr "Gráfica conexións/procesos en directo"
 
 #: js/messages.php:64 server_status.php:838
 #, fuzzy
@@ -1163,7 +1167,7 @@ msgstr "Caixa de Procuras SQL"
 
 #: js/messages.php:66
 msgid "Static data"
-msgstr ""
+msgstr "Datos estáticos"
 
 #. l10n: Total number of queries
 #: js/messages.php:68 libraries/build_html_for_db.lib.php:46
@@ -1176,7 +1180,7 @@ msgstr "Total"
 #. l10n: Other, small valued, queries
 #: js/messages.php:70 server_status.php:617 server_status.php:1036
 msgid "Other"
-msgstr ""
+msgstr "Outro"
 
 #. l10n: Thousands separator
 #: js/messages.php:72 libraries/common.lib.php:1484
@@ -1192,11 +1196,11 @@ msgstr "."
 
 #: js/messages.php:76
 msgid "KiB sent since last refresh"
-msgstr ""
+msgstr "KiB enviados dende o último refresco"
 
 #: js/messages.php:77
 msgid "KiB received since last refresh"
-msgstr ""
+msgstr "KiB recibidos dende o último refresco"
 
 #: js/messages.php:78
 #, fuzzy
@@ -1206,7 +1210,7 @@ msgstr "Escolla de servidor"
 
 #: js/messages.php:79
 msgid "Connections since last refresh"
-msgstr ""
+msgstr "Conexións dende o último refresco"
 
 #: js/messages.php:80 js/messages.php:118 server_status.php:1249
 msgid "Processes"
@@ -1221,12 +1225,12 @@ msgstr "Conexións"
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:83
 msgid "Questions since last refresh"
-msgstr ""
+msgstr "Preguntas dende o último refresco"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:85
 msgid "Questions (executed statements by the server)"
-msgstr ""
+msgstr "Preguntas (sentencias executadas polo servidor)"
 
 #: js/messages.php:87 server_status.php:799
 #, fuzzy
@@ -1268,15 +1272,15 @@ msgstr "caché de procuras"
 
 #: js/messages.php:97
 msgid "System CPU Usage"
-msgstr ""
+msgstr "Uso da CPU do sistema"
 
 #: js/messages.php:98
 msgid "System memory"
-msgstr ""
+msgstr "Memoria do sistema"
 
 #: js/messages.php:99
 msgid "System swap"
-msgstr ""
+msgstr "Arquivo de intercambio do sistema"
 
 #. l10n: shortcuts for Megabyte
 #: js/messages.php:100 js/messages.php:123 libraries/common.lib.php:1434
@@ -1292,7 +1296,7 @@ msgstr "KiB"
 
 #: js/messages.php:103
 msgid "Average load"
-msgstr ""
+msgstr "Carga promedio"
 
 #: js/messages.php:104
 #, fuzzy
@@ -1302,7 +1306,7 @@ msgstr "Número de ficheiros de rexistro"
 
 #: js/messages.php:105
 msgid "Cached memory"
-msgstr ""
+msgstr "Memoria caché"
 
 #: js/messages.php:106
 #, fuzzy
@@ -1312,11 +1316,11 @@ msgstr "Reserva da memoria intermedia"
 
 #: js/messages.php:107
 msgid "Free memory"
-msgstr ""
+msgstr "Memoria libre"
 
 #: js/messages.php:108
 msgid "Used memory"
-msgstr ""
+msgstr "Memoria usada"
 
 #: js/messages.php:110
 #, fuzzy
@@ -1326,11 +1330,11 @@ msgstr "Total"
 
 #: js/messages.php:111
 msgid "Cached Swap"
-msgstr ""
+msgstr "Intercambio en caché"
 
 #: js/messages.php:112
 msgid "Used Swap"
-msgstr ""
+msgstr "Intercambio usado"
 
 #: js/messages.php:113
 #, fuzzy
@@ -1340,7 +1344,7 @@ msgstr "Páxinas libres"
 
 #: js/messages.php:115
 msgid "Bytes sent"
-msgstr ""
+msgstr "Bytes enviados"
 
 #: js/messages.php:116
 #, fuzzy
@@ -1410,7 +1414,7 @@ msgstr "Mudar o nome da base de datos para"
 
 #: js/messages.php:135
 msgid "Edit title and labels"
-msgstr ""
+msgstr "Editar título e etiquetas"
 
 #: js/messages.php:136
 #, fuzzy
@@ -1420,7 +1424,7 @@ msgstr "Axustar á grella"
 
 #: js/messages.php:138
 msgid "Please add at least one variable to the series"
-msgstr ""
+msgstr "Por favor engada polo menos unha variable á serie"
 
 #: js/messages.php:139 libraries/display_export.lib.php:311
 #: libraries/display_tbl.lib.php:573 libraries/export/sql.php:1113
@@ -1432,35 +1436,35 @@ msgstr "Ningunha"
 
 #: js/messages.php:140
 msgid "Resume monitor"
-msgstr ""
+msgstr "Recomezar monitorización"
 
 #: js/messages.php:141
 msgid "Pause monitor"
-msgstr ""
+msgstr "Pausar monitorización"
 
 #: js/messages.php:143
 msgid "general_log and slow_query_log are enabled."
-msgstr ""
+msgstr "general_log e slow_query_log están activas."
 
 #: js/messages.php:144
 msgid "general_log is enabled."
-msgstr ""
+msgstr "general_log está activa."
 
 #: js/messages.php:145
 msgid "slow_query_log is enabled."
-msgstr ""
+msgstr "slow_query_log está activa."
 
 #: js/messages.php:146
 msgid "slow_query_log and general_log are disabled."
-msgstr ""
+msgstr "slow_query_log e general_log están desactivadas."
 
 #: js/messages.php:147
 msgid "log_output is not set to TABLE."
-msgstr ""
+msgstr "log_output non está definido como TABLE."
 
 #: js/messages.php:148
 msgid "log_output is set to TABLE."
-msgstr ""
+msgstr "log_output está definido como TABLE."
 
 #: js/messages.php:149
 #, php-format
@@ -1469,17 +1473,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á activo, pero o servidor só rexistra procuras que tardan "
+"máis que %d segundos. É recomendable establecer o long_query_time a 0-2 "
+"segundos, dependendo do seu sistema."
 
 #: js/messages.php:150
 #, php-format
 msgid "long_query_time is set to %d second(s)."
-msgstr ""
+msgstr "long_query_time está establecido en  %d segundo(s)."
 
 #: js/messages.php:151
 msgid ""
 "Following settings will be applied globally and reset to default on server "
 "restart:"
 msgstr ""
+"Os seguintes valores de configuración serán aplicados globalmente e serán "
+"reseteados ós valores predeterminados ó reiniciar o servidor:"
 
 #. l10n: %s is FILE or TABLE
 #: js/messages.php:153
@@ -1510,6 +1519,8 @@ msgid ""
 "You can't change these variables. Please log in as root or contact your "
 "database administrator."
 msgstr ""
+"Vostede non pode cambiar estas variables. Por favor ingrese como root ou "
+"contacte co seu administrador."
 
 #: js/messages.php:161
 #, fuzzy
@@ -1539,23 +1550,23 @@ msgstr "Diferenza"
 #: js/messages.php:167
 #, php-format
 msgid "Divided by %s"
-msgstr ""
+msgstr "Dividido por %s"
 
 #: js/messages.php:168
 msgid "Unit"
-msgstr ""
+msgstr "Unidade"
 
 #: js/messages.php:170
 msgid "From slow log"
-msgstr ""
+msgstr "Do rexistro de procuras lento"
 
 #: js/messages.php:171
 msgid "From general log"
-msgstr ""
+msgstr "Do rexistro de procuras xeral"
 
 #: js/messages.php:172
 msgid "Analysing & loading logs. This may take a while."
-msgstr ""
+msgstr "Analizando e cargando rexistros. Esto pode tardar un anaco."
 
 #: js/messages.php:173
 #, fuzzy
@@ -1894,7 +1905,7 @@ msgstr ""
 
 #: js/messages.php:265 libraries/rte/rte_routines.lib.php:689
 msgid "ENUM/SET editor"
-msgstr ""
+msgstr "Editor  de ENUM/SET"
 
 #: js/messages.php:266
 #, fuzzy, php-format
@@ -1904,11 +1915,11 @@ msgstr "Número de campos"
 
 #: js/messages.php:267
 msgid "Values for a new column"
-msgstr ""
+msgstr "Valores para a nova columna"
 
 #: js/messages.php:268
 msgid "Enter each value in a separate field"
-msgstr ""
+msgstr "Introduza cada valor nun campo separado"
 
 #: js/messages.php:269
 #, fuzzy, php-format
@@ -11238,9 +11249,8 @@ msgid "Rearrange/edit charts"
 msgstr ""
 
 #: server_status.php:1602
-#, fuzzy
 msgid "Refresh rate"
-msgstr "Refrescar"
+msgstr "Tasa de refresco"
 
 #: server_status.php:1607
 #, fuzzy
@@ -14083,8 +14093,8 @@ msgstr "concurrent_insert está definido a 0"
 #~ "appropriate column name."
 #~ msgstr ""
 #~ "O campo que se mostra aparece en rosa. Para indicar que un campo se "
-#~ "seleccione ou non como o campo a mostrar, prema a icona \"Escoller o "
-#~ "campo a mostrar\" e a seguir o nome do campo apropiado."
+#~ "seleccione ou non como o campo a mostrar, prema a icona \"Escoller o campo a "
+#~ "mostrar\" e a seguir o nome do campo apropiado."
 
 #~ msgid "memcached usage"
 #~ msgstr "Uso do espazo"
@@ -14187,8 +14197,8 @@ msgstr "concurrent_insert está definido a 0"
 #~ "deber a que php atopou un erro nel ou a que php non puido atopar o "
 #~ "ficheiro.<br/>Invoque o ficheiro de configuración directamente mediante o "
 #~ "vínculo que hai máis abaixo e lea a mensaxe de erro de php que reciba. Na "
-#~ "maioría dos casos simplemente faltan unha aspa ou un ponto e vírcula <br/"
-#~ ">Se recibe unha páxina en branco é que todo está ben."
+#~ "maioría dos casos simplemente faltan unha aspa ou un ponto e vírcula <br/>Se "
+#~ "recibe unha páxina en branco é que todo está ben."
 
 #~ msgid "Dropping Procedure"
 #~ msgstr "Procedementos"
@@ -14217,8 +14227,8 @@ msgstr "concurrent_insert está definido a 0"
 #~ "<b>Server traffic</b>: These tables show the network traffic statistics "
 #~ "of this MySQL server since its startup."
 #~ msgstr ""
-#~ "<b>Tráfico do servidor</b>: Estas táboas mostran as estatísticas do "
-#~ "tráfico da rede neste servidor de MySQL desde que se iniciou."
+#~ "<b>Tráfico do servidor</b>: Estas táboas mostran as estatísticas do tráfico "
+#~ "da rede neste servidor de MySQL desde que se iniciou."
 
 #~ msgid ""
 #~ "<b>Query statistics</b>: Since its startup, %s queries have been sent to "
@@ -14301,9 +14311,9 @@ msgstr "concurrent_insert está definido a 0"
 #~ "\\'b')."
 #~ msgstr ""
 #~ "Introduza os valores das opcións de transformación empregando este "
-#~ "formato:'a', 100, b,'c'...<br />Se necesitar introducir unha barra para "
-#~ "trás (\"\\\") ou aspas simples (\"'\") entre estes valores, precédaos de "
-#~ "barra para trás (por exemplo '\\\\xyz' ou 'a\\'b')."
+#~ "formato:'a', 100, b,'c'...<br />Se necesitar introducir unha barra para trás "
+#~ "(\"\\\") ou aspas simples (\"'\") entre estes valores, precédaos de barra para "
+#~ "trás (por exemplo '\\\\xyz' ou 'a\\'b')."
 
 #~ msgid ""
 #~ "Enter each value in a separate field. If you ever need to put a backslash "
@@ -14311,9 +14321,9 @@ msgstr "concurrent_insert está definido a 0"
 #~ "a backslash (for example '\\\\xyz' or 'a\\'b')."
 #~ msgstr ""
 #~ "Introduza os valores das opcións de transformación empregando este "
-#~ "formato:'a', 100, b,'c'...<br />Se necesitar introducir unha barra para "
-#~ "trás (\"\\\") ou aspas simples (\"'\") entre estes valores, precédaos de "
-#~ "barra para trás (por exemplo '\\\\xyz' ou 'a\\'b')."
+#~ "formato:'a', 100, b,'c'...<br />Se necesitar introducir unha barra para trás "
+#~ "(\"\\\") ou aspas simples (\"'\") entre estes valores, precédaos de barra para "
+#~ "trás (por exemplo '\\\\xyz' ou 'a\\'b')."
 
 #~ msgid "New table"
 #~ msgstr "Sen táboas"
@@ -14340,9 +14350,9 @@ msgstr "concurrent_insert está definido a 0"
 #~ "SQL queries settings, for SQL Query box options see [a@?page=form&amp;"
 #~ "formset=main_frame#tab_Sql_box]Navigation frame[/a] settings"
 #~ msgstr ""
-#~ "Configuración das solicitudes de SQL; para as opcións da caixa Procuras "
-#~ "SQL vexa a configuración da [a@?page=form&amp;"
-#~ "formset=main_frame#tab_Sql_box]moldura de navegación[/a]"
+#~ "Configuración das solicitudes de SQL; para as opcións da caixa Procuras SQL "
+#~ "vexa a configuración da "
+#~ "[a@?page=form&amp;formset=main_frame#tab_Sql_box]moldura de navegación[/a]"
 
 #~ msgid "Remove carriage return/line field characters within columns"
 #~ msgstr "Eliminar os caracteres CRLF dentro dos campos"
@@ -14357,8 +14367,7 @@ msgstr "concurrent_insert está definido a 0"
 #~ msgstr "lembrar o modelo"
 
 #~ msgid "Imported file compression will be automatically detected from: %s"
-#~ msgstr ""
-#~ "A compresión do ficheiro importado detectarase automaticamente de: %s"
+#~ msgstr "A compresión do ficheiro importado detectarase automaticamente de: %s"
 
 #~ msgid "Add into comments"
 #~ msgstr "Engadir aos comentarios"

From aef7194b2a036d7e8e5d093ca724442cce6d7a77 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 11 Apr 2012 18:23:17 +0200
Subject: [PATCH 4/7] Translated using Weblate.

---
 po/fr.po | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index a7868f39d9..dbc4a58608 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-04-10 11:58+0200\n"
-"PO-Revision-Date: 2012-04-09 15:34+0200\n"
+"PO-Revision-Date: 2012-04-11 18:23+0200\n"
 "Last-Translator: Marc Delisle <marc@infomarc.info>\n"
 "Language-Team: none\n"
 "Language: fr\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Weblate 0.8\n"
+"X-Generator: Weblate 0.9\n"
 
 #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:350
 #: libraries/display_tbl.lib.php:359 server_privileges.php:1793
@@ -3981,14 +3981,13 @@ msgid "Customize startup page"
 msgstr "Personnaliser la page de départ"
 
 #: libraries/config/messages.inc.php:226
-#, fuzzy
 #| msgid "Database server"
 msgid "Database structure"
-msgstr "Serveur de base de données"
+msgstr "Structure de base de données"
 
 #: libraries/config/messages.inc.php:227
 msgid "Choose which details to show in the database structure (list of tables)"
-msgstr ""
+msgstr "Choisissez les détails à afficher dans la liste des tables"
 
 #: libraries/config/messages.inc.php:228
 msgid "Tabs"
@@ -5068,32 +5067,36 @@ msgstr "Afficher le formulaire de création de base de données"
 #: libraries/config/messages.inc.php:462
 msgid "Show or hide a column displaying the Creation timestamp for all tables"
 msgstr ""
+"Montrer ou cacher une colonne contenant la date de création pour toutes les "
+"tables"
 
 #: libraries/config/messages.inc.php:463
-#, fuzzy
 #| msgid "Show more actions"
 msgid "Show Creation timestamp"
-msgstr "Montrer d'autres actions"
+msgstr "Montrer la date de création"
 
 #: libraries/config/messages.inc.php:464
 msgid ""
 "Show or hide a column displaying the Last update timestamp for all tables"
 msgstr ""
+"Montrer ou cacher une colonne contenant la date de dernière mise à jour pour "
+"toutes les tables"
 
 #: libraries/config/messages.inc.php:465
 msgid "Show Last update timestamp"
-msgstr ""
+msgstr "Montrer la date de dernière mise à jour"
 
 #: libraries/config/messages.inc.php:466
 msgid ""
 "Show or hide a column displaying the Last check timestamp for all tables"
 msgstr ""
+"Montrer ou cacher une colonne contenant la date de dernière vérification "
+"pour toutes les tables"
 
 #: libraries/config/messages.inc.php:467
-#, fuzzy
 #| msgid "Show master status"
 msgid "Show Last check timestamp"
-msgstr "Montrer l'état du maître"
+msgstr "Montrer la date de dernière vérification"
 
 #: libraries/config/messages.inc.php:468
 msgid ""
@@ -5817,7 +5820,7 @@ msgstr ""
 #: libraries/display_import.lib.php:69
 #, php-format
 msgid "%s of %s"
-msgstr ""
+msgstr "%s sur %s"
 
 #: libraries/display_import.lib.php:78
 msgid "Uploading your import file..."

From 2ae5ccef124e075025ce3c807671f15ed94b188d Mon Sep 17 00:00:00 2001
From: Julio Guerra <xullo123@hotmail.com>
Date: Wed, 11 Apr 2012 18:24:02 +0200
Subject: [PATCH 5/7] Translated using Weblate.

---
 po/gl.po | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/po/gl.po b/po/gl.po
index e6d4e8cdcb..cbf21d84e7 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.1-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-04-10 11:58+0200\n"
-"PO-Revision-Date: 2012-04-11 16:57-0000\n"
+"PO-Revision-Date: 2012-04-11 18:05+0200\n"
 "Last-Translator: Julio Guerra <xullo123@hotmail.com>\n"
 "Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
 "Language: gl\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Weblate 0.7\n"
+"X-Generator: Weblate 0.9\n"
 
 #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:350
 #: libraries/display_tbl.lib.php:359 server_privileges.php:1793
@@ -699,10 +699,9 @@ msgid "Add prefix to table"
 msgstr "Engaidr prefixo á táboa"
 
 #: db_structure.php:676 libraries/mult_submits.inc.php:272
-#, fuzzy
 #| msgid "Replace table data with file"
 msgid "Replace table prefix"
-msgstr "Substituír os datos da táboa polos do ficheiro"
+msgstr "Substituír o prefixo da táboa"
 
 #: db_structure.php:678 libraries/mult_submits.inc.php:272
 #, fuzzy

From edbff5a0913d3ec1312f3f59ca6bf87891c2d652 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Wed, 11 Apr 2012 18:24:06 +0200
Subject: [PATCH 6/7] Translated using Weblate.

---
 po/si.po | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/po/si.po b/po/si.po
index e9e99271b2..df59261c53 100644
--- a/po/si.po
+++ b/po/si.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-04-10 11:58+0200\n"
-"PO-Revision-Date: 2012-04-11 16:19+0200\n"
+"PO-Revision-Date: 2012-04-11 17:06+0200\n"
 "Last-Translator: Madhura Jayaratne <madhura.cj@gmail.com>\n"
 "Language-Team: sinhala <si@li.org>\n"
 "Language: si\n"
@@ -372,7 +372,7 @@ msgstr "සෑදීම"
 #: libraries/schema/Pdf_Relation_Schema.class.php:1289 tbl_printview.php:403
 #: tbl_structure.php:922
 msgid "Last update"
-msgstr "අවසන් යාවත් කාලීන කිරීම"
+msgstr "අවසන් යාවත්කාලීන කිරීම"
 
 #: db_printview.php:202 libraries/db_info.inc.php:87
 #: libraries/db_structure.lib.php:70 libraries/export/sql.php:768
@@ -3909,14 +3909,13 @@ msgid "Customize startup page"
 msgstr "ඇරඹුම් පිටුව රිසි සේ සකසන්න"
 
 #: libraries/config/messages.inc.php:226
-#, fuzzy
 #| msgid "Database server"
 msgid "Database structure"
-msgstr "දත්තගබඩා සේවාදායකය"
+msgstr "දත්තගබඩා සැකිල්ල"
 
 #: libraries/config/messages.inc.php:227
 msgid "Choose which details to show in the database structure (list of tables)"
-msgstr ""
+msgstr "දත්තගබඩා සැකිල්ලේ (වගු ලයිස්තුවේ) පෙන්විය යුතු විස්තර තෝරන්න"
 
 #: libraries/config/messages.inc.php:228
 msgid "Tabs"
@@ -4939,33 +4938,35 @@ msgstr "දත්තගබඩාවක් සෑදීමේ පෝරමය ප
 
 #: libraries/config/messages.inc.php:462
 msgid "Show or hide a column displaying the Creation timestamp for all tables"
-msgstr ""
+msgstr "සියලුම වගු සඳහා වගුව සෑදූ වේලාව දැක්වෙන තීරුව පෙන්වන්න හෝ සඟවන්න"
 
 #: libraries/config/messages.inc.php:463
-#, fuzzy
 #| msgid "Show more actions"
 msgid "Show Creation timestamp"
-msgstr "තවත් ක්‍රියාවන් පෙන්වන්න"
+msgstr "සෑදූ වේලාව පෙන්වන්න"
 
 #: libraries/config/messages.inc.php:464
 msgid ""
 "Show or hide a column displaying the Last update timestamp for all tables"
 msgstr ""
+"සියලුම වගු සඳහා අවසන් වරට වගුව යාවත්කාලීන කල වේලාව දැක්වෙන තීරුව පෙන්වන්න හෝ "
+"සඟවන්න"
 
 #: libraries/config/messages.inc.php:465
 msgid "Show Last update timestamp"
-msgstr ""
+msgstr "සඳහා අවසන් වරට යාවත්කාලීන කල වේලාව පෙන්වන්න"
 
 #: libraries/config/messages.inc.php:466
 msgid ""
 "Show or hide a column displaying the Last check timestamp for all tables"
 msgstr ""
+"සියලුම වගු සඳහා අවසන් වරට වගුව පරීක්ෂා කල වේලාව දැක්වෙන තීරුව පෙන්වන්න හෝ "
+"සඟවන්න"
 
 #: libraries/config/messages.inc.php:467
-#, fuzzy
 #| msgid "Show master status"
 msgid "Show Last check timestamp"
-msgstr "Master හි තත්වය පෙන්වන්න"
+msgstr "අවසන් වරට පරීක්ෂා කල වේලාව පෙන්වන්න"
 
 #: libraries/config/messages.inc.php:468
 msgid ""
@@ -6347,7 +6348,7 @@ msgid ""
 "Include a timestamp of when databases were created, last updated, and last "
 "checked"
 msgstr ""
-"දත්තගබඩා සෑදූ , අවසන් වරට යාවත්කාලීන කල හා අවසන් වරට පරීක්ෂා කල වේලාවන් "
+"දත්තගබඩා සෑදූ, අවසන් වරට යාවත්කාලීන කල හා අවසන් වරට පරීක්ෂා කල වේලාවන් "
 "ඇතුලත් කරන්න"
 
 #: libraries/export/sql.php:100
@@ -6448,7 +6449,7 @@ msgid ""
 "Dump TIMESTAMP columns in UTC <i>(enables TIMESTAMP columns to be dumped and "
 "reloaded between servers in different time zones)</i>"
 msgstr ""
-"TIMESTAMP තීර UTC ලෙස නික්ෂේපනය කරන්න <i>(වෙනස් වෙලා කලාපවල ඇති සේවාදායක අතර "
+"TIMESTAMP තීර UTC ලෙස නික්ෂේපනය කරන්න <i>(වෙනස් වේලා කලාපවල ඇති සේවාදායක අතර "
 "TIMESTAMP තීර නික්ෂේපනය හා ප්‍රතිපූරණයට අවස්ථාව ලබා දේ)</i>"
 
 #: libraries/export/sql.php:345 libraries/export/xml.php:45
@@ -6923,7 +6924,7 @@ msgstr "ලොග්අවුට් වන්න"
 #: libraries/navigation_header.inc.php:117
 #: libraries/navigation_header.inc.php:119
 msgid "Reload navigation frame"
-msgstr ""
+msgstr "යාත්‍රණ රාමුව ප්‍රතිපූර්ණය කරන්න"
 
 #: libraries/plugin_interface.lib.php:284
 msgid "This format has no options"
@@ -8994,7 +8995,8 @@ msgstr "තෝරාගත් භාවිතා කරන්නන් ඉවත
 
 #: server_privileges.php:1920
 msgid "Revoke all active privileges from the users and delete them afterwards."
-msgstr "භාවිත කරන්නන්ගෙන් සියලුම සක්‍රීය වරප්‍රසාද අහෝසි කර අනතුරුව ඔවුන් ඉවත් කරන්න."
+msgstr ""
+"භාවිතා කරන්නන්ගේ සියලුම සක්‍රීය වරප්‍රසාද අහෝසි කර අනතුරුව ඔවුන් ඉවත් කරන්න."
 
 #: server_privileges.php:1921 server_privileges.php:1922
 #: server_privileges.php:1923

From 9ad2e1079f09d213980b30c7267f2c2518d67e1d Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 11 Apr 2012 12:54:07 -0400
Subject: [PATCH 7/7] 3.4.x is no longer the stable version

---
 scripts/create-release.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index 4ec71fbd13..33a13588bc 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -243,6 +243,8 @@ if [ $# -gt 0 ] ; then
                     echo '* 2.11 branch, no STABLE update'
                 elif echo $version | grep -q '^3\.3\.' ; then
                     echo '* 3.3 branch, no STABLE update'
+                elif echo $version | grep -q '^3\.4\.' ; then
+                    echo '* 3.4 branch, no STABLE update'
                 else
                     mark_as_release $branch STABLE
                     git checkout master