Git
Threads by month
- ----- 2026 -----
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- 6 participants
- 38809 discussions
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19005-gdd81bf8
by Madhura Jayaratne 14 Sep '11
by Madhura Jayaratne 14 Sep '11
14 Sep '11
The branch, master has been updated
via dd81bf847ae2d055aabdd24ca379575297eeae41 (commit)
via 9d83d2fc35482424125b065cfac09e7ce04ebb09 (commit)
via 29a8f3f32c50d359496f56da458b68d721ddb6ab (commit)
via c1c81ed80aff6a870aea4fa84e05de79fb2c5836 (commit)
via 1f6bd00b15ef9806820822316765b450f1e885b3 (commit)
via e3bcd9f7cff628841ee158ffeb01b6df9990c900 (commit)
via c3bb40cbce8a3e055fdd0ec98f9468f5d859ee00 (commit)
from 110c1e4a59f1e45f3a4586ed970fc73d9fd8ff0e (commit)
- Log -----------------------------------------------------------------
commit dd81bf847ae2d055aabdd24ca379575297eeae41
Merge: 9d83d2f 110c1e4
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Wed Sep 14 10:22:02 2011 +0530
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit 9d83d2fc35482424125b065cfac09e7ce04ebb09
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Wed Sep 14 10:06:54 2011 +0530
Load jquery.sprintf.js on demand
commit 29a8f3f32c50d359496f56da458b68d721ddb6ab
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Wed Sep 14 07:56:50 2011 +0530
Load scripts from cache when they are available
commit c1c81ed80aff6a870aea4fa84e05de79fb2c5836
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Tue Sep 13 21:52:52 2011 +0530
Load OpenLayers.js in a synchronous manner.
commit 1f6bd00b15ef9806820822316765b450f1e885b3
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Tue Sep 13 19:03:43 2011 +0530
Revert changes to loadJavascript() method
commit e3bcd9f7cff628841ee158ffeb01b6df9990c900
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Tue Sep 13 08:31:10 2011 +0530
JS files for gis_data_editor loaded dynamically
commit c3bb40cbce8a3e055fdd0ec98f9468f5d859ee00
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Tue Sep 13 08:28:16 2011 +0530
OpenStreetMaps.js merged into OpenLayers.js
-----------------------------------------------------------------------
Summary of changes:
js/functions.js | 2 +-
js/gis_data_editor.js | 92 ++++++++++++++++++++++++++-----
js/openlayers/OpenLayers.js | 130 ++++++++++++++++++++++++++++++++++++++++++-
js/tbl_change.js | 7 ++-
sql.php | 9 ---
tbl_change.php | 9 ---
tbl_select.php | 9 ---
7 files changed, 214 insertions(+), 44 deletions(-)
diff --git a/js/functions.js b/js/functions.js
index b27dcc4..b0fc717 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3325,7 +3325,7 @@ loadJavascript=function(file) {
} else {
$('head').append('<script type="text/javascript" src="'+file+'"></script>');
}
-}
+};
$(document).ready(function() {
/**
diff --git a/js/gis_data_editor.js b/js/gis_data_editor.js
index 6fb3d7b..f77e286 100644
--- a/js/gis_data_editor.js
+++ b/js/gis_data_editor.js
@@ -5,6 +5,8 @@
*
*/
+var gisEditorLoaded = false;
+
/**
* Closes the GIS data editor and perform necessary clean up work.
*/
@@ -78,7 +80,7 @@ function initGISEditorVisualization() {
}
/**
- * Opens up the GIS data editor.
+ * Loads JavaScript files and the GIS editor.
*
* @param value current value of the geometry field
* @param field field name
@@ -86,17 +88,56 @@ function initGISEditorVisualization() {
* @param input_name name of the input field
* @param token token
*/
-function openGISEditor(value, field, type, input_name, token) {
- // Center the popup
- var windowWidth = document.documentElement.clientWidth;
- var windowHeight = document.documentElement.clientHeight;
- var popupWidth = windowWidth * 0.9;
- var popupHeight = windowHeight * 0.9;
- var popupOffsetTop = windowHeight / 2 - popupHeight / 2;
- var popupOffsetLeft = windowWidth / 2 - popupWidth / 2;
- var $gis_editor = $("#gis_editor");
- $gis_editor.css({"top": popupOffsetTop, "left": popupOffsetLeft, "width": popupWidth, "height": popupHeight});
+function loadJSAndGISEditor(value, field, type, input_name, token) {
+ var head = document.getElementsByTagName('head')[0];
+ var script;
+
+ // Loads a set of small JS file needed for the GIS editor
+ var smallScripts = [ 'js/jquery/jquery.svg.js',
+ 'js/jquery/jquery.sprintf.js',
+ 'js/jquery/jquery.mousewheel.js',
+ 'js/jquery/jquery.event.drag-2.0.min.js',
+ 'js/tbl_gis_visualization.js' ];
+
+ for (i = 0; i < smallScripts.length; i++) {
+ script = document.createElement('script');
+ script.type = 'text/javascript';
+ script.src = smallScripts[i];
+ head.appendChild(script);
+ }
+
+ // OpenLayers.js is BIG and takes time. So asynchronous loading would not work.
+ // Load the JS and do a callback to load the content for the GIS Editor.
+ script = document.createElement('script');
+ script.type = 'text/javascript';
+
+ script.onreadystatechange = function() {
+ if (this.readyState == 'complete') {
+ loadGISEditor(value, field, type, input_name, token);
+ }
+ };
+ script.onload = function() {
+ loadGISEditor(value, field, type, input_name, token);
+ };
+
+ script.src = 'js/openlayers/OpenLayers.js';
+ head.appendChild(script);
+
+ gisEditorLoaded = true;
+}
+
+/**
+ * Loads the GIS editor via AJAX
+ *
+ * @param value current value of the geometry field
+ * @param field field name
+ * @param type geometry type
+ * @param input_name name of the input field
+ * @param token token
+ */
+function loadGISEditor(value, field, type, input_name, token) {
+ var $gis_editor = $("#gis_editor");
$.post('gis_data_editor.php', {
'field' : field,
'value' : value,
@@ -105,7 +146,7 @@ function openGISEditor(value, field, type, input_name, token) {
'get_gis_editor' : true,
'token' : token
}, function(data) {
- if(data.success == true) {
+ if (data.success == true) {
$gis_editor.html(data.gis_editor);
initGISEditorVisualization();
prepareJSVersion();
@@ -113,10 +154,33 @@ function openGISEditor(value, field, type, input_name, token) {
PMA_ajaxShowMessage(data.error);
}
}, 'json');
+}
+
+/**
+ * Opens up the dialog for the GIS data editor.
+ */
+function openGISEditor() {
+
+ // Center the popup
+ var windowWidth = document.documentElement.clientWidth;
+ var windowHeight = document.documentElement.clientHeight;
+ var popupWidth = windowWidth * 0.9;
+ var popupHeight = windowHeight * 0.9;
+ var popupOffsetTop = windowHeight / 2 - popupHeight / 2;
+ var popupOffsetLeft = windowWidth / 2 - popupWidth / 2;
+
+ var $gis_editor = $("#gis_editor");
+ var $backgrouond = $("#popup_background");
+
+ $gis_editor.css({"top": popupOffsetTop, "left": popupOffsetLeft, "width": popupWidth, "height": popupHeight});
+ $backgrouond.css({"opacity":"0.7"});
+
+ $gis_editor.append('<div id="gis_data_editor"><img class="ajaxIcon" id="loadingMonitorIcon" src="'
+ + pmaThemeImage + 'ajax_clock_small.gif" alt=""></div>'
+ );
// Make it appear
- $("#popup_background").css({"opacity":"0.7"});
- $("#popup_background").fadeIn("fast");
+ $backgrouond.fadeIn("fast");
$gis_editor.fadeIn("fast");
}
diff --git a/js/openlayers/OpenLayers.js b/js/openlayers/OpenLayers.js
index 43e67e8..66b6188 100644
--- a/js/openlayers/OpenLayers.js
+++ b/js/openlayers/OpenLayers.js
@@ -2550,4 +2550,132 @@ return node;},"_Layer":function(options){var layer,subPaths,node,title;layer=opt
options.subPaths.shift();this.writeNode("_Layer",options,node);return node;}else{if(layer instanceof OpenLayers.Layer.WMS){node=this.writeNode("_WMS",layer);}else if(layer instanceof OpenLayers.Layer.Vector){if(layer.protocol instanceof OpenLayers.Protocol.WFS.v1){node=this.writeNode("_WFS",layer);}else if(layer.protocol instanceof OpenLayers.Protocol.HTTP){if(layer.protocol.format instanceof OpenLayers.Format.GML){layer.protocol.format.version="2.1.2";node=this.writeNode("_GML",layer);}else if(layer.protocol.format instanceof OpenLayers.Format.KML){layer.protocol.format.version="2.2";node=this.writeNode("_KML",layer);}}else{this.setNamespace("feature",this.featureNS);node=this.writeNode("_InlineGeometry",layer);}}
if(layer.options.maxScale){this.writeNode("sld:MinScaleDenominator",layer.options.maxScale,node);}
if(layer.options.minScale){this.writeNode("sld:MaxScaleDenominator",layer.options.minScale,node);}
-this.nestingLayerLookup[layer.name]=node;return node;}},"_WFS":function(layer){var node=this.createElementNSPlus("Layer",{attributes:{name:layer.protocol.featurePrefix+":"+layer.protocol.featureType,hidden:layer.visibility?"0":"1"}});this.writeNode("ows:Title",layer.name,node);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.WFS,version:layer.protocol.version,url:layer.protocol.url},node);return node;},"_InlineGeometry":function(layer){var node=this.createElementNSPlus("Layer",{attributes:{name:this.featureType,hidden:layer.visibility?"0":"1"}});this.writeNode("ows:Title",layer.name,node);this.writeNode("InlineGeometry",layer,node);return node;},"_GML":function(layer){var node=this.createElementNSPlus("Layer");this.writeNode("ows:Title",layer.name,node);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.GML,url:layer.protocol.url,version:layer.protocol.format.version},node);return node;},"_KML":function(layer){var node=this.createElementNSPlus("Layer");this.writeNode("ows:Title",layer.name,node);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.KML,version:layer.protocol.format.version,url:layer.protocol.url},node);return node;}},"gml":OpenLayers.Util.applyDefaults({"boundedBy":function(bounds){var node=this.createElementNSPlus("gml:boundedBy");this.writeNode("gml:Box",bounds,node);return node;}},OpenLayers.Format.GML.v2.prototype.writers.gml),"ows":OpenLayers.Format.OWSCommon.v1_0_0.prototype.writers.ows,"sld":OpenLayers.Format.SLD.v1_0_0.prototype.writers.sld,"feature":OpenLayers.Format.GML.v2.prototype.writers.feature},CLASS_NAME:"OpenLayers.Format.OWSContext.v0_3_1"});
\ No newline at end of file
+this.nestingLayerLookup[layer.name]=node;return node;}},"_WFS":function(layer){var node=this.createElementNSPlus("Layer",{attributes:{name:layer.protocol.featurePrefix+":"+layer.protocol.featureType,hidden:layer.visibility?"0":"1"}});this.writeNode("ows:Title",layer.name,node);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.WFS,version:layer.protocol.version,url:layer.protocol.url},node);return node;},"_InlineGeometry":function(layer){var node=this.createElementNSPlus("Layer",{attributes:{name:this.featureType,hidden:layer.visibility?"0":"1"}});this.writeNode("ows:Title",layer.name,node);this.writeNode("InlineGeometry",layer,node);return node;},"_GML":function(layer){var node=this.createElementNSPlus("Layer");this.writeNode("ows:Title",layer.name,node);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.GML,url:layer.protocol.url,version:layer.protocol.format.version},node);return node;},"_KML":function(layer){var node=this.createElementNSPlus("Layer");this.writeNode("ows:Title",layer.name,node);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.KML,version:layer.protocol.format.version,url:layer.protocol.url},node);return node;}},"gml":OpenLayers.Util.applyDefaults({"boundedBy":function(bounds){var node=this.createElementNSPlus("gml:boundedBy");this.writeNode("gml:Box",bounds,node);return node;}},OpenLayers.Format.GML.v2.prototype.writers.gml),"ows":OpenLayers.Format.OWSCommon.v1_0_0.prototype.writers.ows,"sld":OpenLayers.Format.SLD.v1_0_0.prototype.writers.sld,"feature":OpenLayers.Format.GML.v2.prototype.writers.feature},CLASS_NAME:"OpenLayers.Format.OWSContext.v0_3_1"});
+
+// OpenStreetMaps.js merged
+
+/**
+ * Namespace: Util.OSM
+ */
+OpenLayers.Util.OSM = {};
+
+/**
+ * Constant: MISSING_TILE_URL
+ * {String} URL of image to display for missing tiles
+ */
+OpenLayers.Util.OSM.MISSING_TILE_URL = "http://www.openstreetmap.org/openlayers/img/404.png";
+
+/**
+ * Property: originalOnImageLoadError
+ * {Function} Original onImageLoadError function.
+ */
+OpenLayers.Util.OSM.originalOnImageLoadError = OpenLayers.Util.onImageLoadError;
+
+/**
+ * Function: onImageLoadError
+ */
+OpenLayers.Util.onImageLoadError = function() {
+ if (this.src.match(/^http:\/\/[abc]\.[a-z]+\.openstreetmap\.org\//)) {
+ this.src = OpenLayers.Util.OSM.MISSING_TILE_URL;
+ } else if (this.src.match(/^http:\/\/[def]\.tah\.openstreetmap\.org\//)) {
+ // do nothing - this layer is transparent
+ } else {
+ OpenLayers.Util.OSM.originalOnImageLoadError;
+ }
+};
+
+/**
+ * Class: OpenLayers.Layer.OSM.Mapnik
+ *
+ * Inherits from:
+ * - <OpenLayers.Layer.OSM>
+ */
+OpenLayers.Layer.OSM.Mapnik = OpenLayers.Class(OpenLayers.Layer.OSM, {
+ /**
+ * Constructor: OpenLayers.Layer.OSM.Mapnik
+ *
+ * Parameters:
+ * name - {String}
+ * options - {Object} Hashtable of extra options to tag onto the layer
+ */
+ initialize: function(name, options) {
+ var url = [
+ "http://a.tile.openstreetmap.org/${z}/${x}/${y}.png",
+ "http://b.tile.openstreetmap.org/${z}/${x}/${y}.png",
+ "http://c.tile.openstreetmap.org/${z}/${x}/${y}.png"
+ ];
+ options = OpenLayers.Util.extend({
+ numZoomLevels: 19,
+ buffer: 0,
+ transitionEffect: "resize"
+ }, options);
+ var newArguments = [name, url, options];
+ OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
+ },
+
+ CLASS_NAME: "OpenLayers.Layer.OSM.Mapnik"
+});
+
+/**
+ * Class: OpenLayers.Layer.OSM.Osmarender
+ *
+ * Inherits from:
+ * - <OpenLayers.Layer.OSM>
+ */
+OpenLayers.Layer.OSM.Osmarender = OpenLayers.Class(OpenLayers.Layer.OSM, {
+ /**
+ * Constructor: OpenLayers.Layer.OSM.Osmarender
+ *
+ * Parameters:
+ * name - {String}
+ * options - {Object} Hashtable of extra options to tag onto the layer
+ */
+ initialize: function(name, options) {
+ var url = [
+ "http://a.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png",
+ "http://b.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png",
+ "http://c.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png"
+ ];
+ options = OpenLayers.Util.extend({
+ numZoomLevels: 18,
+ buffer: 0,
+ transitionEffect: "resize"
+ }, options);
+ var newArguments = [name, url, options];
+ OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
+ },
+
+ CLASS_NAME: "OpenLayers.Layer.OSM.Osmarender"
+});
+
+/**
+ * Class: OpenLayers.Layer.OSM.CycleMap
+ *
+ * Inherits from:
+ * - <OpenLayers.Layer.OSM>
+ */
+OpenLayers.Layer.OSM.CycleMap = OpenLayers.Class(OpenLayers.Layer.OSM, {
+ /**
+ * Constructor: OpenLayers.Layer.OSM.CycleMap
+ *
+ * Parameters:
+ * name - {String}
+ * options - {Object} Hashtable of extra options to tag onto the layer
+ */
+ initialize: function(name, options) {
+ var url = [
+ "http://a.tile.opencyclemap.org/cycle/${z}/${x}/${y}.png",
+ "http://b.tile.opencyclemap.org/cycle/${z}/${x}/${y}.png",
+ "http://c.tile.opencyclemap.org/cycle/${z}/${x}/${y}.png"
+ ];
+ options = OpenLayers.Util.extend({
+ numZoomLevels: 19,
+ buffer: 0,
+ transitionEffect: "resize"
+ }, options);
+ var newArguments = [name, url, options];
+ OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
+ },
+
+ CLASS_NAME: "OpenLayers.Layer.OSM.CycleMap"
+});
\ No newline at end of file
diff --git a/js/tbl_change.js b/js/tbl_change.js
index 25bc120..099dab9 100644
--- a/js/tbl_change.js
+++ b/js/tbl_change.js
@@ -238,7 +238,12 @@ $(document).ready(function() {
//Token
var token = $("input[name='token']").val();
- openGISEditor(value, field, type, input_name, token);
+ openGISEditor();
+ if (!gisEditorLoaded) {
+ loadJSAndGISEditor(value, field, type, input_name, token);
+ } else {
+ loadGISEditor(value, field, type, input_name, token);
+ }
});
/**
diff --git a/sql.php b/sql.php
index 8b8cf12..9695d12 100644
--- a/sql.php
+++ b/sql.php
@@ -17,16 +17,7 @@ require_once './libraries/bookmark.lib.php';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
$GLOBALS['js_include'][] = 'tbl_change.js';
-
-// required for GIS editor loaded via AJAX
$GLOBALS['js_include'][] = 'gis_data_editor.js';
-$GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js';
-$GLOBALS['js_include'][] = 'jquery/jquery.svg.js';
-$GLOBALS['js_include'][] = 'jquery/jquery.mousewheel.js';
-$GLOBALS['js_include'][] = 'jquery/jquery.event.drag-2.0.min.js';
-$GLOBALS['js_include'][] = 'tbl_gis_visualization.js';
-$GLOBALS['js_include'][] = 'openlayers/OpenLayers.js';
-$GLOBALS['js_include'][] = 'OpenStreetMap.js';
if (isset($_SESSION['profiling'])) {
$GLOBALS['js_include'][] = 'highcharts/highcharts.js';
diff --git a/tbl_change.php b/tbl_change.php
index 5395dda..2fd9394 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -122,16 +122,7 @@ $GLOBALS['js_include'][] = 'functions.js';
$GLOBALS['js_include'][] = 'tbl_change.js';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
-
-// required for GIS editor
$GLOBALS['js_include'][] = 'gis_data_editor.js';
-$GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js';
-$GLOBALS['js_include'][] = 'jquery/jquery.svg.js';
-$GLOBALS['js_include'][] = 'jquery/jquery.mousewheel.js';
-$GLOBALS['js_include'][] = 'jquery/jquery.event.drag-2.0.min.js';
-$GLOBALS['js_include'][] = 'tbl_gis_visualization.js';
-$GLOBALS['js_include'][] = 'openlayers/OpenLayers.js';
-$GLOBALS['js_include'][] = 'OpenStreetMap.js';
/**
* HTTP and HTML headers
diff --git a/tbl_select.php b/tbl_select.php
index 00cecfe..0ad5d25 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -23,16 +23,7 @@ $GLOBALS['js_include'][] = 'tbl_select.js';
$GLOBALS['js_include'][] = 'tbl_change.js';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
-
-// required for GIS editor loaded via AJAX
$GLOBALS['js_include'][] = 'gis_data_editor.js';
-$GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js';
-$GLOBALS['js_include'][] = 'jquery/jquery.svg.js';
-$GLOBALS['js_include'][] = 'jquery/jquery.mousewheel.js';
-$GLOBALS['js_include'][] = 'jquery/jquery.event.drag-2.0.min.js';
-$GLOBALS['js_include'][] = 'tbl_gis_visualization.js';
-$GLOBALS['js_include'][] = 'openlayers/OpenLayers.js';
-$GLOBALS['js_include'][] = 'OpenStreetMap.js';
$titles['Browse'] = PMA_tbl_setTitle($GLOBALS['cfg']['PropertiesIconic'], $pmaThemeImage);
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-18998-g110c1e4
by Marc Delisle 13 Sep '11
by Marc Delisle 13 Sep '11
13 Sep '11
The branch, master has been updated
via 110c1e4a59f1e45f3a4586ed970fc73d9fd8ff0e (commit)
from 47463352c4941b4db35ead6b954d2b597f11eebb (commit)
- Log -----------------------------------------------------------------
commit 110c1e4a59f1e45f3a4586ed970fc73d9fd8ff0e
Author: Marc Delisle <marc(a)infomarc.info>
Date: Tue Sep 13 12:30:10 2011 -0400
Refresh .po files
-----------------------------------------------------------------------
Summary of changes:
po/af.po | 4 +-
po/ar.po | 4 +-
po/az.po | 4 +-
po/be.po | 4 +-
po/be(a)latin.po | 4 +-
po/bg.po | 4 +-
po/bn.po | 4 +-
po/br.po | 4 +-
po/bs.po | 4 +-
po/ca.po | 8 ++++-
po/cs.po | 8 ++++-
po/cy.po | 4 +-
po/da.po | 8 ++++-
po/de.po | 8 ++++-
po/el.po | 22 +++++----------
po/en_GB.po | 77 +++++++++--------------------------------------------
po/es.po | 16 ++++++-----
po/et.po | 4 +-
po/eu.po | 4 +-
po/fa.po | 4 +-
po/fi.po | 4 +-
po/fr.po | 33 +++++-----------------
po/gl.po | 4 +-
po/he.po | 4 +-
po/hi.po | 4 +-
po/hr.po | 4 +-
po/hu.po | 4 +-
po/id.po | 13 +++------
po/it.po | 8 ++++-
po/ja.po | 15 +++++++---
po/ka.po | 4 +-
po/ko.po | 4 +-
po/lt.po | 4 +-
po/lv.po | 4 +-
po/mk.po | 4 +-
po/ml.po | 4 +-
po/mn.po | 4 +-
po/ms.po | 4 +-
po/nb.po | 4 +-
po/nl.po | 8 ++++-
po/phpmyadmin.pot | 4 +-
po/pl.po | 11 +++-----
po/pt.po | 4 +-
po/pt_BR.po | 73 ++++++++------------------------------------------
po/ro.po | 4 +-
po/ru.po | 56 ++++++++------------------------------
po/si.po | 4 +-
po/sk.po | 4 +-
po/sl.po | 22 ++++++++-------
po/sq.po | 4 +-
po/sr.po | 4 +-
po/sr(a)latin.po | 4 +-
po/sv.po | 34 +++++++++--------------
po/ta.po | 4 +-
po/te.po | 4 +-
po/th.po | 4 +-
po/tr.po | 8 ++++-
po/tt.po | 4 +-
po/ug.po | 4 +-
po/uk.po | 4 +-
po/ur.po | 4 +-
po/uz.po | 4 +-
po/uz(a)latin.po | 4 +-
po/zh_CN.po | 8 ++++-
po/zh_TW.po | 8 ++++-
65 files changed, 249 insertions(+), 375 deletions(-)
diff --git a/po/af.po b/po/af.po
index d52e249..c24179d 100644
--- a/po/af.po
+++ b/po/af.po
@@ -3,7 +3,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2010-03-30 23:04+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: afrikaans <af(a)li.org>\n"
@@ -6491,7 +6491,7 @@ msgstr "Stellings"
#: libraries/export/sql.php:211
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 81dfa6a..0848bef 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -3,7 +3,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2011-08-07 03:51+0200\n"
"Last-Translator: Abdullah Al-Saedi <abdullah.10(a)windowslive.com>\n"
"Language-Team: arabic <ar(a)li.org>\n"
@@ -6409,7 +6409,7 @@ msgstr "أوامر"
#: libraries/export/sql.php:211
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
diff --git a/po/az.po b/po/az.po
index a26f395..b492591 100644
--- a/po/az.po
+++ b/po/az.po
@@ -3,7 +3,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2010-03-12 09:11+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: azerbaijani <az(a)li.org>\n"
@@ -6577,7 +6577,7 @@ msgstr "Variantlar"
#: libraries/export/sql.php:211
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
diff --git a/po/be.po b/po/be.po
index c7e7de2..5127cc8 100644
--- a/po/be.po
+++ b/po/be.po
@@ -3,7 +3,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2010-03-12 09:12+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: belarusian_cyrillic <be(a)li.org>\n"
@@ -6774,7 +6774,7 @@ msgstr "Выразы"
#: libraries/export/sql.php:211
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
diff --git a/po/be(a)latin.po b/po/be(a)latin.po
index 03b912d..3745ea7 100644
--- a/po/be(a)latin.po
+++ b/po/be(a)latin.po
@@ -3,7 +3,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2010-03-30 23:09+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: belarusian_latin <be@latin@li.org>\n"
@@ -6757,7 +6757,7 @@ msgstr "Vyrazy"
#: libraries/export/sql.php:211
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
diff --git a/po/bg.po b/po/bg.po
index a14533a..f0d3775 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -3,7 +3,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2011-09-02 09:19+0200\n"
"Last-Translator: <stoyanster(a)gmail.com>\n"
"Language-Team: bulgarian <bg(a)li.org>\n"
@@ -6296,7 +6296,7 @@ msgstr "Добавяне на заявления:"
#: libraries/export/sql.php:211
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
diff --git a/po/bn.po b/po/bn.po
index b96627a..e40cf5b 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -3,7 +3,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2010-10-21 01:36+0200\n"
"Last-Translator: Nobin নবীন <nobin(a)cyberbogra.com>\n"
"Language-Team: bangla <bn(a)li.org>\n"
@@ -6694,7 +6694,7 @@ msgstr "Statements"
#: libraries/export/sql.php:211
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
diff --git a/po/br.po b/po/br.po
index 944702e..5ead377 100644
--- a/po/br.po
+++ b/po/br.po
@@ -7,7 +7,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2011-08-22 20:10+0200\n"
"Last-Translator: Fulup <fulup.jakez(a)ofis-bzh.org>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -6294,7 +6294,7 @@ msgstr ""
#: libraries/export/sql.php:211
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
diff --git a/po/bs.po b/po/bs.po
index 05b1b56..b2bd4c1 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -3,7 +3,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2010-03-12 09:12+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: bosnian <bs(a)li.org>\n"
@@ -6561,7 +6561,7 @@ msgstr "Ime"
#: libraries/export/sql.php:211
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index be0e100..55f2896 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3,7 +3,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2011-02-23 09:57+0200\n"
"Last-Translator: Xavier Navarro <xvnavarro(a)gmail.com>\n"
"Language-Team: catalan <ca(a)li.org>\n"
@@ -6682,8 +6682,12 @@ msgid "Add statements:"
msgstr "Afegir instruccions:"
#: libraries/export/sql.php:211
+#, fuzzy
+#| msgid ""
+#| "Enclose table and field names with backquotes <i>(Protects field and "
+#| "table names formed with special characters or keywords)</i>"
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
"Inclou noms de taules i camps amb -backquotes- <i>(Protegeix els noms de "
diff --git a/po/cs.po b/po/cs.po
index 32623a5..9b598a6 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2011-09-07 09:31+0200\n"
"Last-Translator: Michal Čihař <michal(a)cihar.com>\n"
"Language-Team: czech <cs(a)li.org>\n"
@@ -6462,8 +6462,12 @@ msgid "Add statements:"
msgstr "Přidat příkazy:"
#: libraries/export/sql.php:211
+#, fuzzy
+#| msgid ""
+#| "Enclose table and field names with backquotes <i>(Protects field and "
+#| "table names formed with special characters or keywords)</i>"
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
"Uzavřít název tabulky a polí do zpětných uvozovek <i>(Zabrání interpretaci "
diff --git a/po/cy.po b/po/cy.po
index 042e8cc..d1352ff 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2011-05-19 21:21+0200\n"
"Last-Translator: <ardavies(a)tiscali.co.uk>\n"
"Language-Team: Welsh <cy(a)li.org>\n"
@@ -6555,7 +6555,7 @@ msgstr "Ychwanegwch cyfyngiadau"
#: libraries/export/sql.php:211
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
diff --git a/po/da.po b/po/da.po
index 54c6a8d..52a2769 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3,7 +3,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2011-08-30 18:16+0200\n"
"Last-Translator: Jørgen Thomsen <opensource(a)jth.net>\n"
"Language-Team: danish <da(a)li.org>\n"
@@ -6490,8 +6490,12 @@ msgid "Add statements:"
msgstr "Tilføj forespørgsler:"
#: libraries/export/sql.php:211
+#, fuzzy
+#| msgid ""
+#| "Enclose table and field names with backquotes <i>(Protects field and "
+#| "table names formed with special characters or keywords)</i>"
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
"Omgiv tabel- og feltnavne med backquotes <i>(Beskytter felt- og tabelnavne "
diff --git a/po/de.po b/po/de.po
index 49042d1..4a574f2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,7 +3,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2011-09-02 04:56+0200\n"
"Last-Translator: Sven Strickroth <email(a)cs-ware.de>\n"
"Language-Team: german <de(a)li.org>\n"
@@ -6569,8 +6569,12 @@ msgid "Add statements:"
msgstr "Befehle hinzufügen:"
#: libraries/export/sql.php:211
+#, fuzzy
+#| msgid ""
+#| "Enclose table and field names with backquotes <i>(Protects field and "
+#| "table names formed with special characters or keywords)</i>"
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
"Tabellen- und Feldnamen in Backticks einschließen <i>(Schützt Feld- und "
diff --git a/po/el.po b/po/el.po
index 07815fa..3aceb04 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3,14 +3,14 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2011-09-12 12:07+0200\n"
"Last-Translator: Panagiotis Papazoglou <papaz_p(a)yahoo.com>\n"
"Language-Team: greek <el(a)li.org>\n"
-"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -2211,7 +2211,6 @@ msgstr "Απομακρύντε το φάκελο «./config» πριν τη χρ
#: libraries/Config.class.php:727
#, php-format
-#| msgid "Existing configuration file (%d) is not readable."
msgid "Existing configuration file (%s) is not readable."
msgstr "Το υπαρχον αρχείο ρυθμίσεων (%s) δεν είναι αναγνώσιμο."
@@ -6572,8 +6571,12 @@ msgid "Add statements:"
msgstr "Προσθήκη δηλώσεων:"
#: libraries/export/sql.php:211
+#, fuzzy
+#| msgid ""
+#| "Enclose table and field names with backquotes <i>(Protects field and "
+#| "table names formed with special characters or keywords)</i>"
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
"Εσωκλείνει ονόματα πίνακα και πεδίων με ανάποδα εισαγωγικά <i>(Προστατεύει "
@@ -10562,12 +10565,10 @@ msgid "Refresh rate"
msgstr "Ρυθμός ανανέωσης"
#: server_status.php:1572
-#| msgid "Chart columns:"
msgid "Chart columns"
msgstr "Στήλες διαγράμματος"
#: server_status.php:1588
-#| msgid "Error management:"
msgid "Chart arrangement"
msgstr "Διευθέτηση διαγράμματος"
@@ -10580,7 +10581,6 @@ msgstr ""
"φυλλομετρητών. Ίσως θέλετε να το εξάγετε αν έχετε πολύπλοκη ρύθμιση."
#: server_status.php:1589
-#| msgid "Restore default value"
msgid "Reset to default"
msgstr "Επαναφορά προεπιλογής"
@@ -10589,14 +10589,6 @@ msgid "Monitor Instructions"
msgstr "Οδηγίες Εποπτείας"
#: server_status.php:1594
-#| msgid ""
-#| "The phpMyAdmin Monitor can assist you in optimizing the server "
-#| "configuration and track down time intensive\n"
-#| " queries. For the latter you will need to set log_output to "
-#| "'TABLE' and have either the slow_query_log or general_log enabled. Note "
-#| "however, that the\n"
-#| " general_log produces a lot of data and increases server load by "
-#| "up to 15%"
msgid ""
"The phpMyAdmin Monitor can assist you in optimizing the server configuration "
"and track down time intensive queries. For the latter you will need to set "
diff --git a/po/en_GB.po b/po/en_GB.po
index 25a763e..58d982d 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,7 +3,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2011-09-10 16:23+0200\n"
"Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n"
"Language-Team: english-gb <en_GB(a)li.org>\n"
@@ -824,7 +824,6 @@ msgid "Copy and paste the joined values into the \"Length/Values\" field"
msgstr "Copy and paste the joined values into the \"Length/Values\" field"
#: export.php:29
-#| msgid "Bar type"
msgid "Bad type!"
msgstr "Bad type!"
@@ -833,7 +832,6 @@ msgid "Selected export type has to be saved in file!"
msgstr "Selected export type has to be saved in file!"
#: export.php:106
-#| msgid "Add parameter"
msgid "Bad parameters!"
msgstr "Bad parameters!"
@@ -860,7 +858,6 @@ msgid "Dump has been saved to file %s."
msgstr "Dump has been saved to file %s."
#: file_echo.php:21
-#| msgid "Export type"
msgid "Invalid export type"
msgstr "Invalid export type"
@@ -899,7 +896,6 @@ msgstr "Y"
#: gis_data_editor.php:195 gis_data_editor.php:243 gis_data_editor.php:295
#: js/messages.php:289
#, php-format
-#| msgid "Point"
msgid "Point %d"
msgstr "Point %d"
@@ -1242,17 +1238,14 @@ msgstr ""
"your configuration to default in the <i>Settings</i> menu."
#: js/messages.php:96
-#| msgid "Query cache"
msgid "Query cache efficiency"
msgstr "Query cache efficiency"
#: js/messages.php:97
-#| msgid "Query cache"
msgid "Query cache usage"
msgstr "Query cache usage"
#: js/messages.php:98
-#| msgid "Query cache"
msgid "Query cache used"
msgstr "Query cache used"
@@ -1524,7 +1517,6 @@ msgstr "Log analyzed, but no data found in this time span."
#. l10n: A collection of available filters
#: js/messages.php:173
-#| msgid "Tables display options"
msgid "Log table filter options"
msgstr "Log table filter options"
@@ -1595,12 +1587,10 @@ msgid "Import"
msgstr "Import"
#: js/messages.php:192
-#| msgid "Update Query"
msgid "Analyse Query"
msgstr "Analyse Query"
#: js/messages.php:196
-#| msgid "Apply a divisor"
msgid "Advisor system"
msgstr "Advisor system"
@@ -1613,17 +1603,14 @@ msgid "Issue"
msgstr "Issue"
#: js/messages.php:199
-#| msgid "Documentation"
msgid "Recommendation"
msgstr "Recommendation"
#: js/messages.php:200
-#| msgid "Details"
msgid "Rule details"
msgstr "Rule details"
#: js/messages.php:201
-#| msgid "Authentication"
msgid "Justification"
msgstr "Justification"
@@ -1774,7 +1761,6 @@ msgid "Show search criteria"
msgstr "Show search criteria"
#: js/messages.php:262 libraries/tbl_select.lib.php:135
-#| msgid "Search"
msgid "Zoom Search"
msgstr "Zoom Search"
@@ -1811,7 +1797,6 @@ msgid "Strings are converted into integer for plotting"
msgstr "Strings are converted into integer for plotting"
#: js/messages.php:280
-#| msgid "Add/Delete columns"
msgid "Select two columns"
msgstr "Select two columns"
@@ -1903,7 +1888,6 @@ msgstr ""
"You can also edit most columns<br />by clicking directly on their content."
#: js/messages.php:322
-#| msgid "Go to view"
msgid "Go to link"
msgstr "Go to link"
@@ -1947,13 +1931,11 @@ msgid "Done"
msgstr "Done"
#: js/messages.php:359
-#| msgid "Prev"
msgctxt "Previous month"
msgid "Prev"
msgstr "Prev"
#: js/messages.php:364
-#| msgid "Next"
msgctxt "Next month"
msgid "Next"
msgstr "Next"
@@ -2102,8 +2084,6 @@ msgstr "Saturday"
#. l10n: Short week day name
#: js/messages.php:420
-#| msgctxt "Short week day name"
-#| msgid "Sun"
msgid "Sun"
msgstr "Sun"
@@ -2210,7 +2190,8 @@ msgstr "Existing configuration file (%s) is not readable."
#: libraries/Config.class.php:752
msgid "Wrong permissions on configuration file, should not be world writable!"
-msgstr "Wrong permissions on configuration file, should not be world writeable!"
+msgstr ""
+"Wrong permissions on configuration file, should not be world writeable!"
#: libraries/Config.class.php:1297
msgid "Font size"
@@ -2355,7 +2336,6 @@ msgstr[0] "%1$d row inserted."
msgstr[1] "%1$d rows inserted."
#: libraries/PDF.class.php:81
-#| msgid "Allows reading data."
msgid "Error while creating PDF:"
msgstr "Error while creating PDF:"
@@ -2393,7 +2373,6 @@ msgid "This MySQL server does not support the %s storage engine."
msgstr "This MySQL server does not support the %s storage engine."
#: libraries/Table.class.php:329
-#| msgid "Show slave status"
msgid "unknown table status: "
msgstr "unknown table status: "
@@ -2425,8 +2404,8 @@ msgid ""
"Failed to cleanup table UI preferences (see $cfg['Servers'][$i]"
"['MaxTableUiprefs'] %s)"
msgstr ""
-"Failed to cleanup table UI preferences (see "
-"$cfg['Servers'][$i]['MaxTableUiprefs'] %s)"
+"Failed to cleanup table UI preferences (see $cfg['Servers'][$i]"
+"['MaxTableUiprefs'] %s)"
#: libraries/Table.class.php:1513
#, php-format
@@ -2435,8 +2414,9 @@ msgid ""
"after you refresh this page. Please check if the table structure has been "
"changed."
msgstr ""
-"Cannot save UI property \"%s\". The changes made will not be persistent after "
-"you refresh this page. Please check if the table structure has been changed."
+"Cannot save UI property \"%s\". The changes made will not be persistent "
+"after you refresh this page. Please check if the table structure has been "
+"changed."
#: libraries/Theme.class.php:145
#, php-format
@@ -2599,7 +2579,6 @@ msgid "PBMS get BLOB info failed:"
msgstr "PBMS get BLOB info failed:"
#: libraries/blobstreaming.lib.php:373
-#| msgid "get BLOB Content-Type failed"
msgid "PBMS get BLOB Content-Type failed"
msgstr "PBMS get BLOB Content-Type failed"
@@ -2877,7 +2856,6 @@ msgstr "Missing parameter:"
#: libraries/common.lib.php:2364 libraries/common.lib.php:2367
#: libraries/display_tbl.lib.php:306
-#| msgid "Begin"
msgctxt "First page"
msgid "Begin"
msgstr "Begin"
@@ -2885,7 +2863,6 @@ msgstr "Begin"
#: libraries/common.lib.php:2365 libraries/common.lib.php:2368
#: libraries/display_tbl.lib.php:307 server_binlog.php:135
#: server_binlog.php:137
-#| msgid "Previous"
msgctxt "Previous page"
msgid "Previous"
msgstr "Previous"
@@ -2893,14 +2870,12 @@ msgstr "Previous"
#: libraries/common.lib.php:2395 libraries/common.lib.php:2398
#: libraries/display_tbl.lib.php:370 server_binlog.php:170
#: server_binlog.php:172
-#| msgid "Next"
msgctxt "Next page"
msgid "Next"
msgstr "Next"
#: libraries/common.lib.php:2396 libraries/common.lib.php:2399
#: libraries/display_tbl.lib.php:385
-#| msgid "End"
msgctxt "Last page"
msgid "End"
msgstr "End"
@@ -4268,7 +4243,6 @@ msgid "Memory limit"
msgstr "Memory limit"
#: libraries/config/messages.inc.php:319
-#| msgid "These are Edit, Inline edit, Copy and Delete links"
msgid "These are Edit, Copy and Delete links"
msgstr "These are Edit, Copy and Delete links"
@@ -4628,7 +4602,6 @@ msgstr ""
"newest record in \"table_uiprefs\" and automatically delete older records"
#: libraries/config/messages.inc.php:399
-#| msgid "Maximum number of tables displayed in table list"
msgid "Maximum number of records saved in \"table_uiprefs\" table"
msgstr "Maximum number of records saved in \"table_uiprefs\" table"
@@ -4965,12 +4938,10 @@ msgid "Show function fields"
msgstr "Show function fields"
#: libraries/config/messages.inc.php:462
-#| msgid "Where to show the table row links"
msgid "Whether to show hint or not"
msgstr "Whether to show hint or not"
#: libraries/config/messages.inc.php:463
-#| msgid "Show indexes"
msgid "Show hint"
msgstr "Show hint"
@@ -5303,7 +5274,6 @@ msgid "Could not initialize Drizzle connection library"
msgstr "Could not initialise Drizzle connection library"
#: libraries/config/validate.lib.php:205 libraries/config/validate.lib.php:212
-#| msgid "Could not connect to MySQL server"
msgid "Could not connect to Drizzle server"
msgstr "Could not connect to Drizzle server"
@@ -5409,7 +5379,6 @@ msgid "The server is not responding"
msgstr "The server is not responding"
#: libraries/dbi/drizzle.dbi.lib.php:344
-#| msgid "(or the local MySQL server's socket is not correctly configured)"
msgid "(or the local Drizzle server's socket is not correctly configured)"
msgstr "(or the local Drizzle server's socket is not correctly configured)"
@@ -5717,7 +5686,6 @@ msgid "Language"
msgstr "Language"
#: libraries/display_tbl.lib.php:401
-#| msgid "Save directory"
msgid "Save edited data"
msgstr "Save edited data"
@@ -6493,8 +6461,12 @@ msgid "Add statements:"
msgstr "Add statements:"
#: libraries/export/sql.php:211
+#, fuzzy
+#| msgid ""
+#| "Enclose table and field names with backquotes <i>(Protects field and "
+#| "table names formed with special characters or keywords)</i>"
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
"Enclose table and field names with backquotes <i>(Protects field and table "
@@ -6605,7 +6577,6 @@ msgid "Stand-in structure for view"
msgstr "Stand-in structure for view"
#: libraries/export/sql.php:1111
-#| msgid "Allows reading data."
msgid "Error reading data:"
msgstr "Error reading data:"
@@ -6677,7 +6648,6 @@ msgstr "Go to database"
#: libraries/import.lib.php:1109 libraries/import.lib.php:1132
#, php-format
-#| msgid "Missing data for %s"
msgid "Edit settings for %s"
msgstr "Edit settings for %s"
@@ -6687,7 +6657,6 @@ msgstr "Go to table"
#: libraries/import.lib.php:1130
#, php-format
-#| msgid "Structure only"
msgid "Structure of %s"
msgstr "Structure of %s"
@@ -6791,7 +6760,6 @@ msgid "MySQL Spatial Extension does not support ESRI type \"%s\"."
msgstr "MySQL Spatial Extension does not support ESRI type \"%s\"."
#: libraries/import/shp.php:371
-#| msgid "This page does not contain any tables!"
msgid "The imported file does not contain any data"
msgstr "The imported file does not contain any data"
@@ -7313,13 +7281,11 @@ msgid "Execute every"
msgstr "Execute every"
#: libraries/rte/rte_events.lib.php:449
-#| msgid "Start"
msgctxt "Start of recurring event"
msgid "Start"
msgstr "Start"
#: libraries/rte/rte_events.lib.php:457
-#| msgid "End"
msgctxt "End of recurring event"
msgid "End"
msgstr "End"
@@ -8112,7 +8078,6 @@ msgid "Operator"
msgstr "Operator"
#: libraries/tbl_select.lib.php:128
-#| msgid "Search"
msgid "Table Search"
msgstr "Table Search"
@@ -8294,7 +8259,6 @@ msgid "General Settings"
msgstr "General Settings"
#: main.php:101
-#| msgid "MySQL connection collation"
msgid "Server connection collation"
msgstr "Server connection collation"
@@ -8307,7 +8271,6 @@ msgid "More settings"
msgstr "More settings"
#: main.php:156
-#| msgid "Database for user"
msgid "Database server"
msgstr "Database server"
@@ -8316,7 +8279,6 @@ msgid "Software"
msgstr "Software"
#: main.php:160
-#| msgid "Show versions"
msgid "Software version"
msgstr "Software version"
@@ -8331,7 +8293,6 @@ msgid "User"
msgstr "User"
#: main.php:167
-#| msgid "Server socket"
msgid "Server charset"
msgstr "Server charset"
@@ -8340,7 +8301,6 @@ msgid "Web server"
msgstr "Web server"
#: main.php:190
-#| msgid "Use light version"
msgid "Database client version"
msgstr "Database client version"
@@ -8481,7 +8441,6 @@ msgid "No databases"
msgstr "No databases"
#: navigation.php:270
-#| msgid "filter tables by name"
msgid "Filter tables by name"
msgstr "Filter tables by name"
@@ -8859,7 +8818,6 @@ msgid "License"
msgstr "Licence"
#: server_plugins.php:182
-#| msgid "Disabled"
msgid "disabled"
msgstr "disabled"
@@ -9542,7 +9500,6 @@ msgid "Monitor"
msgstr "Monitor"
#: server_status.php:779
-#| msgid "Apply a divisor"
msgid "Advisor"
msgstr "Advisor"
@@ -9563,7 +9520,6 @@ msgid "Filter by category..."
msgstr "Filter by category..."
#: server_status.php:855
-#| msgid "Show only alert values"
msgid "Show unformatted values"
msgstr "Show unformatted values"
@@ -9572,12 +9528,10 @@ msgid "Related links:"
msgstr "Related links:"
#: server_status.php:892
-#| msgid "Query analyzer"
msgid "Run analyzer"
msgstr "Run analyser"
#: server_status.php:893
-#| msgid "Introduction"
msgid "Instructions"
msgstr "Instructions"
@@ -10408,12 +10362,10 @@ msgid "Refresh rate"
msgstr "Refresh rate"
#: server_status.php:1572
-#| msgid "Chart columns:"
msgid "Chart columns"
msgstr "Chart columns"
#: server_status.php:1588
-#| msgid "Error management:"
msgid "Chart arrangement"
msgstr "Chart arrangement"
@@ -10426,7 +10378,6 @@ msgstr ""
"may want to export it if you have a complicated set up."
#: server_status.php:1589
-#| msgid "Restore default value"
msgid "Reset to default"
msgstr "Reset to default"
@@ -10463,7 +10414,6 @@ msgstr ""
"charting features however."
#: server_status.php:1612
-#| msgid "Pause monitor"
msgid "Using the monitor:"
msgstr "Using the monitor:"
@@ -10552,7 +10502,6 @@ msgstr ""
" "
#: server_status.php:1637
-#| msgid "Remove chart"
msgid "Preset chart"
msgstr "Preset chart"
diff --git a/po/es.po b/po/es.po
index e45af75..bf27f21 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,14 +3,14 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2011-09-12 19:03+0200\n"
"Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n"
"Language-Team: spanish <es(a)li.org>\n"
-"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -2218,7 +2218,6 @@ msgstr "¡Elimine el directorio './config' antes de utilizar phpMyAdmin!"
#: libraries/Config.class.php:727
#, php-format
-#| msgid "Existing configuration file (%d) is not readable."
msgid "Existing configuration file (%s) is not readable."
msgstr "El archivo de configuración existente (%s) no pudo ser leído."
@@ -2452,8 +2451,8 @@ msgid ""
"after you refresh this page. Please check if the table structure has been "
"changed."
msgstr ""
-"No se pudo guardar la propiedad de interfaz \"%s\". Los cambios realizados no "
-"serán persistentes luego de actualizar esta página. Revise si cambió la "
+"No se pudo guardar la propiedad de interfaz \"%s\". Los cambios realizados "
+"no serán persistentes luego de actualizar esta página. Revise si cambió la "
"estructura de la tabla."
#: libraries/Theme.class.php:145
@@ -6609,8 +6608,12 @@ msgid "Add statements:"
msgstr "Agregar sentencias:"
#: libraries/export/sql.php:211
+#, fuzzy
+#| msgid ""
+#| "Enclose table and field names with backquotes <i>(Protects field and "
+#| "table names formed with special characters or keywords)</i>"
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
"Encerrar tabla y nombres de campo con comillas invertidas <i>(protege los "
@@ -11472,7 +11475,6 @@ msgid "No index parts defined!"
msgstr "¡No se han definido las partes del índice!"
#: tbl_indexes.php:169
-#| msgid "Create a new index"
msgid "Create an index"
msgstr "Crear un índice"
diff --git a/po/et.po b/po/et.po
index b84f47a..497d63a 100644
--- a/po/et.po
+++ b/po/et.po
@@ -3,7 +3,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2010-03-12 09:14+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: estonian <et(a)li.org>\n"
@@ -6696,7 +6696,7 @@ msgstr "Parameerid"
#: libraries/export/sql.php:211
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
diff --git a/po/eu.po b/po/eu.po
index 49ca4c2..1c2f81c 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -3,7 +3,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2010-07-21 14:53+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: basque <eu(a)li.org>\n"
@@ -6567,7 +6567,7 @@ msgstr "Sententziak"
#: libraries/export/sql.php:211
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
diff --git a/po/fa.po b/po/fa.po
index 2d609cd..10102de 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -3,7 +3,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2010-05-19 03:54+0200\n"
"Last-Translator: <ahmad_usa2007(a)yahoo.com>\n"
"Language-Team: persian <fa(a)li.org>\n"
@@ -6480,7 +6480,7 @@ msgstr "شرج"
#: libraries/export/sql.php:211
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 00c9244..687a04f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3,7 +3,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2010-11-26 21:29+0200\n"
"Last-Translator: <asdfsdf(a)asdfasdfasdf.com>\n"
"Language-Team: finnish <fi(a)li.org>\n"
@@ -6816,7 +6816,7 @@ msgstr "Tieto"
#: libraries/export/sql.php:211
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index c8a0ad9..50fbcdd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,7 +3,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2011-09-09 12:45+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: french <fr(a)li.org>\n"
@@ -1910,7 +1910,6 @@ msgstr ""
"directement sur leur contenu."
#: js/messages.php:322
-#| msgid "Go to view"
msgid "Go to link"
msgstr "Suivre le lien"
@@ -1954,13 +1953,11 @@ msgid "Done"
msgstr "Fermer"
#: js/messages.php:359
-#| msgid "Prev"
msgctxt "Previous month"
msgid "Prev"
msgstr "Précédent"
#: js/messages.php:364
-#| msgid "Next"
msgctxt "Next month"
msgid "Next"
msgstr "Suivant"
@@ -2109,8 +2106,6 @@ msgstr "Samedi"
#. l10n: Short week day name
#: js/messages.php:420
-#| msgctxt "Short week day name"
-#| msgid "Sun"
msgid "Sun"
msgstr "Dim"
@@ -2368,7 +2363,6 @@ msgstr[0] "%1$d ligne insérée."
msgstr[1] "%1$d lignes insérées."
#: libraries/PDF.class.php:81
-#| msgid "Allows reading data."
msgid "Error while creating PDF:"
msgstr "Erreur pendant la création du PDF: "
@@ -2407,7 +2401,6 @@ msgid "This MySQL server does not support the %s storage engine."
msgstr "Ce serveur MySQL ne supporte pas le moteur de stockage %s."
#: libraries/Table.class.php:329
-#| msgid "Show slave status"
msgid "unknown table status: "
msgstr "Statut de table incorrect:"
@@ -2439,8 +2432,8 @@ msgid ""
"Failed to cleanup table UI preferences (see $cfg['Servers'][$i]"
"['MaxTableUiprefs'] %s)"
msgstr ""
-"Echec lors de la tentative de vidage de la table UI Préférences (voir "
-"$cfg['Servers'][$i]['MaxTableUiprefs'] %s)"
+"Echec lors de la tentative de vidage de la table UI Préférences (voir $cfg"
+"['Servers'][$i]['MaxTableUiprefs'] %s)"
#: libraries/Table.class.php:1513
#, php-format
@@ -2898,7 +2891,6 @@ msgstr "Paramètre manquant :"
#: libraries/common.lib.php:2364 libraries/common.lib.php:2367
#: libraries/display_tbl.lib.php:306
-#| msgid "Begin"
msgctxt "First page"
msgid "Begin"
msgstr "Début"
@@ -2906,7 +2898,6 @@ msgstr "Début"
#: libraries/common.lib.php:2365 libraries/common.lib.php:2368
#: libraries/display_tbl.lib.php:307 server_binlog.php:135
#: server_binlog.php:137
-#| msgid "Previous"
msgctxt "Previous page"
msgid "Previous"
msgstr "Précédent"
@@ -2914,14 +2905,12 @@ msgstr "Précédent"
#: libraries/common.lib.php:2395 libraries/common.lib.php:2398
#: libraries/display_tbl.lib.php:370 server_binlog.php:170
#: server_binlog.php:172
-#| msgid "Next"
msgctxt "Next page"
msgid "Next"
msgstr "Suivant"
#: libraries/common.lib.php:2396 libraries/common.lib.php:2399
#: libraries/display_tbl.lib.php:385
-#| msgid "End"
msgctxt "Last page"
msgid "End"
msgstr "Fin"
@@ -4304,7 +4293,6 @@ msgid "Memory limit"
msgstr "Limite mémoire"
#: libraries/config/messages.inc.php:319
-#| msgid "These are Edit, Inline edit, Copy and Delete links"
msgid "These are Edit, Copy and Delete links"
msgstr "Il s'agit des liens Modifier, Copier et Effacer"
@@ -4668,7 +4656,6 @@ msgstr ""
"récentes entrées dans «table_uiprefs» sont conservées"
#: libraries/config/messages.inc.php:399
-#| msgid "Maximum number of tables displayed in table list"
msgid "Maximum number of records saved in \"table_uiprefs\" table"
msgstr "Nombre maximum de lignes conservées dans la table «table_uiprefs»"
@@ -5011,12 +4998,10 @@ msgid "Show function fields"
msgstr "Montrer les fonctions"
#: libraries/config/messages.inc.php:462
-#| msgid "Where to show the table row links"
msgid "Whether to show hint or not"
msgstr "Afficher ou non les explications"
#: libraries/config/messages.inc.php:463
-#| msgid "Show indexes"
msgid "Show hint"
msgstr "Montrer les explications"
@@ -5353,7 +5338,6 @@ msgid "Could not initialize Drizzle connection library"
msgstr "Impossible d'initialiser la bibliothèque de connexion Drizzle"
#: libraries/config/validate.lib.php:205 libraries/config/validate.lib.php:212
-#| msgid "Could not connect to MySQL server"
msgid "Could not connect to Drizzle server"
msgstr "Connexion au serveur Drizzle impossible"
@@ -5461,7 +5445,6 @@ msgid "The server is not responding"
msgstr "Le serveur ne répond pas"
#: libraries/dbi/drizzle.dbi.lib.php:344
-#| msgid "(or the local MySQL server's socket is not correctly configured)"
msgid "(or the local Drizzle server's socket is not correctly configured)"
msgstr ""
"(ou l'interface de connexion vers le serveur Drizzle local n'est pas "
@@ -5776,7 +5759,6 @@ msgid "Language"
msgstr "Langue"
#: libraries/display_tbl.lib.php:401
-#| msgid "Save directory"
msgid "Save edited data"
msgstr "Sauvegarder les données modifiées"
@@ -6564,8 +6546,12 @@ msgid "Add statements:"
msgstr "Ajouter les énoncés :"
#: libraries/export/sql.php:211
+#, fuzzy
+#| msgid ""
+#| "Enclose table and field names with backquotes <i>(Protects field and "
+#| "table names formed with special characters or keywords)</i>"
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
"Entourer les noms des tables et des colonnes par des guillemets obliques <i>"
@@ -6679,7 +6665,6 @@ msgid "Stand-in structure for view"
msgstr "Doublure de structure pour la vue"
#: libraries/export/sql.php:1111
-#| msgid "Allows reading data."
msgid "Error reading data:"
msgstr "Erreur de lecture des données :"
@@ -6751,7 +6736,6 @@ msgstr "Aller à la base de données"
#: libraries/import.lib.php:1109 libraries/import.lib.php:1132
#, php-format
-#| msgid "Missing data for %s"
msgid "Edit settings for %s"
msgstr "Paramètres de modification pour %s"
@@ -6761,7 +6745,6 @@ msgstr "Aller à la table"
#: libraries/import.lib.php:1130
#, php-format
-#| msgid "Structure only"
msgid "Structure of %s"
msgstr "Structure de %s"
diff --git a/po/gl.po b/po/gl.po
index b3c07d2..5e96fe9 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -3,7 +3,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2010-07-21 14:50+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: galician <gl(a)li.org>\n"
@@ -7029,7 +7029,7 @@ msgstr "Informacións"
#: libraries/export/sql.php:211
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
diff --git a/po/he.po b/po/he.po
index f8efcdb..46bc7b5 100644
--- a/po/he.po
+++ b/po/he.po
@@ -3,7 +3,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2011-03-02 20:17+0200\n"
"Last-Translator: <zippoxer(a)gmail.com>\n"
"Language-Team: hebrew <he(a)li.org>\n"
@@ -6575,7 +6575,7 @@ msgstr "משפטים"
#: libraries/export/sql.php:211
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 28712d3..696eae9 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -3,7 +3,7 @@ msgid ""
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-09-11 06:58-0400\n"
+"POT-Creation-Date: 2011-09-13 12:29-0400\n"
"PO-Revision-Date: 2011-07-24 19:04+0200\n"
"Last-Translator: <deadefy(a)nepalimail.com>\n"
"Language-Team: hindi <hi(a)li.org>\n"
@@ -6425,7 +6425,7 @@ msgstr "शर्तें जोडें"
#: libraries/export/sql.php:211
msgid ""
-"Enclose table and field names with backquotes <i>(Protects field and table "
+"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
diff --git a/po/hr.po b/po/ characters or keywords)</i>"