Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS

This commit is contained in:
Madhura Jayaratne 2011-06-17 07:33:44 +05:30
commit d466571b9c
6 changed files with 123 additions and 174 deletions

View File

@ -19,6 +19,7 @@ phpMyAdmin - ChangeLog
+ rfe #939233 [interface] Flexible column width
+ [interface] Mouse-based column reordering in query results
+ AJAX for Insert to a table from database Structure page
- Patch #3316969 PMA_ajaxShowMessage() does not respect timeout
3.4.3.0 (not yet released)
- bug #3311170 [sync] Missing helper icons in Synchronize
@ -30,6 +31,8 @@ phpMyAdmin - ChangeLog
- patch #3313326 [interface] Some tooltips do not disappear
- bug #3315720 [search] Fix search in non unicode tables
- bug #3315741 [display] Inline query edit broken
- patch #3317206 [privileges] Generate password option missing on new accounts
- bug #3317293 [edit] Inline edit places HTML line breaks in edit area
3.4.2.0 (2011-06-07)
- bug #3301249 [interface] Iconic table operations does not remove inline edit label

View File

@ -15,10 +15,9 @@ var sql_box_locked = false;
var only_once_elements = new Array();
/**
* @var ajax_message_init boolean boolean that stores status of
* notification for PMA_ajaxShowNotification
* @var int ajax_message_count Number of AJAX messages shown since page load
*/
var ajax_message_init = false;
var ajax_message_count = 0;
/**
* @var codemirror_editor object containing CodeMirror editor
@ -1244,83 +1243,64 @@ $(document).ready(function(){
* optional, defaults to 'Loading...'
* @param var timeout number of milliseconds for the message to be visible
* optional, defaults to 5000
* @return jQuery object jQuery Element that holds the message div
* @return jQuery object jQuery Element that holds the message div
*/
function PMA_ajaxShowMessage(message, timeout) {
//Handle the case when a empty data.message is passed. We don't want the empty message
if(message == '') {
//Handle the case when a empty data.message is passed. We don't want the empty message
if (message == '') {
return true;
} else if (! message) {
// If the message is undefined, show the default
message = PMA_messages['strLoading'];
}
/**
* @var msg String containing the message that has to be displayed
* @default PMA_messages['strLoading']
*/
if(!message) {
var msg = PMA_messages['strLoading'];
}
else {
var msg = message;
}
/**
* @var timeout Number of milliseconds for which {@link msg} will be visible
* @var timeout Number of milliseconds for which the message will be visible
* @default 5000 ms
*/
if(!timeout) {
var to = 5000;
}
else {
var to = timeout;
if (! timeout) {
timeout = 5000;
}
if( !ajax_message_init) {
//For the first time this function is called, append a new div
$(function(){
$('<div id="loading_parent"></div>')
.insertBefore("#serverinfo");
$('<span id="loading" class="ajax_notification"></span>')
.appendTo("#loading_parent")
.html(msg)
.fadeIn('medium')
.delay(to)
.fadeOut('medium', function(){
$(this)
.html("") //Clear the message
.hide();
});
}, 'top.frame_content');
ajax_message_init = true;
// Create a parent element for the AJAX messages, if necessary
if ($('#loading_parent').length == 0) {
$('<div id="loading_parent"></div>')
.insertBefore("#serverinfo");
}
else {
//Otherwise, just show the div again after inserting the message
$("#loading")
.stop(true, true)
.html(msg)
// Update message count to create distinct message elements every time
ajax_message_count++;
// Remove all old messages, if any
$(".ajax_notification[id^=ajax_message_num]").remove();
/**
* @var $retval a jQuery object containing the reference
* to the created AJAX message
*/
var $retval = $('<span class="ajax_notification" id="ajax_message_num_' + ajax_message_count + '"></span>')
.hide()
.appendTo("#loading_parent")
.html(message)
.fadeIn('medium')
.delay(to)
.delay(timeout)
.fadeOut('medium', function() {
$(this)
.html("")
.hide();
})
}
$(this).remove();
});
return $("#loading");
return $retval;
}
/**
* Removes the message shown for an Ajax operation when it's completed
*/
function PMA_ajaxRemoveMessage($this_msgbox) {
$this_msgbox
.stop(true, true)
.fadeOut('medium', function() {
$this_msgbox.hide();
});
if ($this_msgbox != 'undefined' && $this_msgbox instanceof jQuery) {
$this_msgbox
.stop(true, true)
.fadeOut('medium');
}
}
/**

View File

@ -712,8 +712,10 @@ $(document).ready(function() {
// and store the current value in a hidden span
if($this_field.is(':not(.truncated, .transformed, .relation, .enum, .set, .null)')) {
// handle non-truncated, non-transformed, non-relation values
value = data_value.replace("<br>", "\n");
// We don't need to get any more data, just wrap the value
$this_field_span.append('<textarea>'+data_value+'</textarea>');
$this_field_span.append('<textarea>' + value + '</textarea>');
$this_field.data('original_data', data_value);
}
else if($this_field.is('.truncated, .transformed')) {

View File

@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-06-15 08:36-0400\n"
"PO-Revision-Date: 2011-06-09 17:25+0200\n"
"PO-Revision-Date: 2011-06-15 23:05+0200\n"
"Last-Translator: Matías Bellone <matiasbellone@gmail.com>\n"
"Language-Team: spanish <es@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"
@ -1018,10 +1018,9 @@ msgstr "¡Ésto no es un número!"
#. l10n: Default description for the y-Axis of Charts
#: js/messages.php:51
#, fuzzy
#| msgid "Log file count"
msgid "Total count"
msgstr "Cantidad de archivos de registro"
msgstr "Cantidad total"
#: js/messages.php:54
msgid "The host name is empty!"
@ -1058,24 +1057,22 @@ msgid "Close"
msgstr "Cerrar"
#: js/messages.php:64 server_status.php:397
#, fuzzy
#| msgid "Server Choice"
msgid "Live traffic chart"
msgstr "Elección del servidor"
msgstr "Gráfico de tráfico en vivo"
#: js/messages.php:65 server_status.php:400
msgid "Live conn./process chart"
msgstr ""
msgstr "Gráfico de procesos/conexiones en vivo"
#: js/messages.php:66 server_status.php:429
#, fuzzy
#| msgid "Show query chart"
msgid "Live query chart"
msgstr "Mostrar gráfico de consultas"
msgstr "Gráfico de consultas en vivo"
#: js/messages.php:68
msgid "Static data"
msgstr ""
msgstr "Datos estáticos"
#. l10n: Total number of queries
#: js/messages.php:70 libraries/build_html_for_db.lib.php:45
@ -1088,7 +1085,7 @@ msgstr "Total"
#. l10n: Other, small valued, queries
#: js/messages.php:72 server_status.php:592
msgid "Other"
msgstr ""
msgstr "Otro"
#. l10n: Thousands separator
#: js/messages.php:74 libraries/common.lib.php:1375
@ -5007,24 +5004,22 @@ msgid "Language"
msgstr "Idioma"
#: libraries/display_tbl.lib.php:397
#, fuzzy
#| msgid "Textarea columns"
msgid "Restore column order"
msgstr "Columnas para las áreas de texto"
msgstr "Restaurar orden de las columnas"
#: libraries/display_tbl.lib.php:411
msgid "Drag to reorder"
msgstr ""
msgstr "Arrastrar para reordenar"
#: libraries/display_tbl.lib.php:412
#, fuzzy
#| msgid "Click to select"
msgid "Click to sort"
msgstr "Clic para seleccionar"
msgstr "Pulsar para ordenar"
#: libraries/display_tbl.lib.php:413
msgid "Click to mark/unmark"
msgstr ""
msgstr "Pulsar para marcar/desmarcar"
#: libraries/display_tbl.lib.php:425
#, php-format
@ -8422,71 +8417,62 @@ msgid "Runtime Information"
msgstr "Información acerca del tiempo de ejecución del proceso principal"
#: server_status.php:371
#, fuzzy
#| msgid "Server Choice"
msgid "Server traffic"
msgstr "Elección del servidor"
msgstr "Tráfico del servidor"
#: server_status.php:372
msgid "Query statistics"
msgstr "Estadísticas de Consulta"
#: server_status.php:373
#, fuzzy
#| msgid "See slave status table"
msgid "All status variables"
msgstr "Ver la tabla de estado del esclavo"
msgstr "Todas las variables de estado"
#: server_status.php:383 server_status.php:416
#, fuzzy
#| msgid "Refresh"
msgid "Refresh rate"
msgstr "Actualizar"
msgstr "Velocidad de actualización"
#: server_status.php:384 server_status.php:417
#, fuzzy
#| msgid "Second"
msgid "second"
msgstr "Segundo"
msgstr "segundo"
#: server_status.php:385 server_status.php:386 server_status.php:387
#: server_status.php:388 server_status.php:389 server_status.php:418
#: server_status.php:419 server_status.php:420 server_status.php:421
#: server_status.php:422
#, fuzzy
#| msgid "Second"
msgid "seconds"
msgstr "Segundo"
msgstr "segundos"
#: server_status.php:390 server_status.php:391 server_status.php:392
#: server_status.php:393 server_status.php:423 server_status.php:424
#: server_status.php:425 server_status.php:426
#, fuzzy
#| msgid "Minute"
msgid "minutes"
msgstr "Minuto"
msgstr "minutos"
#: server_status.php:446
#, fuzzy
#| msgid "Do not change the password"
msgid "Containing the word:"
msgstr "No cambiar la contraseña"
msgstr "Que contengan la palabra:"
#: server_status.php:451
#, fuzzy
#| msgid "Show open tables"
msgid "Show only alert values"
msgstr "Mostrar las tablas que están abiertas"
msgstr "Mostrar sólo valores de alerta"
#: server_status.php:455
msgid "Filter by category..."
msgstr ""
msgstr "Filtrar por categoría..."
#: server_status.php:468
#, fuzzy
#| msgid "Related Links"
msgid "Related links:"
msgstr "Enlaces relacionados"
msgstr "Enlaces relacionados:"
#: server_status.php:513 server_status.php:545 server_status.php:666
#: server_status.php:711
@ -8508,12 +8494,12 @@ msgstr "Tipo de consulta"
#. l10n: # = Amount of queries
#: server_status.php:543
msgid "#"
msgstr ""
msgstr "#"
#: server_status.php:615
#, php-format
msgid "Network traffic since startup: %s"
msgstr ""
msgstr "Tráfico de red desde el inicio: %s"
#: server_status.php:623
#, php-format
@ -8598,10 +8584,9 @@ msgid "ID"
msgstr "Identificación"
#: server_status.php:846
#, fuzzy
#| msgid "Whether to enable SSL for connection to MySQL server."
msgid "The number of failed attempts to connect to the MySQL server."
msgstr "Si habilitar SSL para la conexión al servidor MySQL o no."
msgstr "Cantidad de intentos de conexión al servidor MySQL fallidos."
#: server_status.php:847
msgid ""
@ -8623,6 +8608,7 @@ msgstr ""
msgid ""
"The number of connection attempts (successful or not) to the MySQL server."
msgstr ""
"Cantidad de intentos de conexión al servidor MySQL (fallidos o exitosos)."
#: server_status.php:850
msgid ""
@ -9061,6 +9047,8 @@ msgid ""
"The maximum number of connections that have been in use simultaneously since "
"the server started."
msgstr ""
"El máximo número de conexiones que han sido utilizadas simultáneamente desde "
"que inició el servidor."
#: server_status.php:921
msgid "The number of rows waiting to be written in INSERT DELAYED queues."
@ -9094,6 +9082,9 @@ msgid ""
"fragmentation issues, which may be solved by issuing a FLUSH QUERY CACHE "
"statement."
msgstr ""
"Cantidad de bloques de memoria libre en la cache de consultas. Cantidades "
"altas pueden indicar problemas de fragmentación que pueden ser solucionados "
"ejecutando la consulta FLUSH QUERY CACHE."
#: server_status.php:927
msgid "The amount of free memory for query cache."
@ -9845,10 +9836,9 @@ msgid "Line"
msgstr "Línea"
#: tbl_chart.php:88
#, fuzzy
#| msgid "Inline"
msgid "Spline"
msgstr "En línea"
msgstr "Ranuras"
#: tbl_chart.php:89
msgid "Pie"
@ -9859,50 +9849,43 @@ msgid "Stacked"
msgstr "Apiladas"
#: tbl_chart.php:94
#, fuzzy
#| msgid "Report title:"
msgid "Chart title"
msgstr "Título del reporte:"
msgstr "Título del gráfico"
#: tbl_chart.php:99
msgid "X-Axis:"
msgstr ""
msgstr "Eje X:"
#: tbl_chart.php:113
#, fuzzy
#| msgid "SQL queries"
msgid "Series:"
msgstr "Consultas SQL"
msgstr "Series:"
#: tbl_chart.php:115
#, fuzzy
#| msgid "Textarea columns"
msgid "The remaining columns"
msgstr "Columnas para las áreas de texto"
msgstr "Columnas restantes"
#: tbl_chart.php:128
#, fuzzy
#| msgid "X Axis label"
msgid "X-Axis label:"
msgstr "Etiqueta del eje X"
msgstr "Etiqueta del eje X:"
#: tbl_chart.php:128
#, fuzzy
#| msgid "Value"
msgid "X Values"
msgstr "Valor"
msgstr "Valores X"
#: tbl_chart.php:129
#, fuzzy
#| msgid "Y Axis label"
msgid "Y-Axis label:"
msgstr "Etiqueta del eje Y"
msgstr "Etiqueta del eje Y:"
#: tbl_chart.php:129
#, fuzzy
#| msgid "Value"
msgid "Y Values"
msgstr "Valor"
msgstr "Valores Y"
#: tbl_create.php:56
#, php-format

View File

@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-06-15 08:36-0400\n"
"PO-Revision-Date: 2011-06-09 23:29+0200\n"
"PO-Revision-Date: 2011-06-16 00:11+0200\n"
"Last-Translator: <stefan@inkopsforum.se>\n"
"Language-Team: swedish <sv@li.org>\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@ -1004,10 +1004,9 @@ msgstr "Detta är inte ett nummer!"
#. l10n: Default description for the y-Axis of Charts
#: js/messages.php:51
#, fuzzy
#| msgid "Log file count"
msgid "Total count"
msgstr "Antal loggfiler"
msgstr "Totalt antal"
#: js/messages.php:54
msgid "The host name is empty!"
@ -1044,24 +1043,22 @@ msgid "Close"
msgstr "Stäng"
#: js/messages.php:64 server_status.php:397
#, fuzzy
#| msgid "Server Choice"
msgid "Live traffic chart"
msgstr "Välj server"
msgstr "Live trafik diagram"
#: js/messages.php:65 server_status.php:400
msgid "Live conn./process chart"
msgstr ""
msgstr "Live anslutning/process diagram"
#: js/messages.php:66 server_status.php:429
#, fuzzy
#| msgid "Show query chart"
msgid "Live query chart"
msgstr "Visa fråge diagram"
msgstr "Live sökfrågediagram"
#: js/messages.php:68
msgid "Static data"
msgstr ""
msgstr "Statisk data"
#. l10n: Total number of queries
#: js/messages.php:70 libraries/build_html_for_db.lib.php:45
@ -1074,7 +1071,7 @@ msgstr "Total"
#. l10n: Other, small valued, queries
#: js/messages.php:72 server_status.php:592
msgid "Other"
msgstr ""
msgstr "Annan"
#. l10n: Thousands separator
#: js/messages.php:74 libraries/common.lib.php:1375
@ -4910,24 +4907,22 @@ msgid "Language"
msgstr "Språk"
#: libraries/display_tbl.lib.php:397
#, fuzzy
#| msgid "Textarea columns"
msgid "Restore column order"
msgstr "Textarea kolumner"
msgstr "Återställ ordningen på kolumner"
#: libraries/display_tbl.lib.php:411
msgid "Drag to reorder"
msgstr ""
msgstr "Dra för att ändra ordning"
#: libraries/display_tbl.lib.php:412
#, fuzzy
#| msgid "Click to select"
msgid "Click to sort"
msgstr "Klicka för att markera"
msgstr "Klicka för att sortera"
#: libraries/display_tbl.lib.php:413
msgid "Click to mark/unmark"
msgstr ""
msgstr "Klicka för att markera/avmarkera"
#: libraries/display_tbl.lib.php:425
#, php-format
@ -8243,71 +8238,62 @@ msgid "Runtime Information"
msgstr "Körningsinformation"
#: server_status.php:371
#, fuzzy
#| msgid "Server Choice"
msgid "Server traffic"
msgstr "Välj server"
msgstr "Server trafik"
#: server_status.php:372
msgid "Query statistics"
msgstr "Visa statistik"
#: server_status.php:373
#, fuzzy
#| msgid "See slave status table"
msgid "All status variables"
msgstr "Se slavtabell status"
msgstr "Alla statusvariabler"
#: server_status.php:383 server_status.php:416
#, fuzzy
#| msgid "Refresh"
msgid "Refresh rate"
msgstr "Uppdatera"
msgstr "Uppdateringsfrekvens"
#: server_status.php:384 server_status.php:417
#, fuzzy
#| msgid "Second"
msgid "second"
msgstr "Sekunder"
msgstr "Sekund"
#: server_status.php:385 server_status.php:386 server_status.php:387
#: server_status.php:388 server_status.php:389 server_status.php:418
#: server_status.php:419 server_status.php:420 server_status.php:421
#: server_status.php:422
#, fuzzy
#| msgid "Second"
msgid "seconds"
msgstr "Sekunder"
msgstr "sekunder"
#: server_status.php:390 server_status.php:391 server_status.php:392
#: server_status.php:393 server_status.php:423 server_status.php:424
#: server_status.php:425 server_status.php:426
#, fuzzy
#| msgid "Minute"
msgid "minutes"
msgstr "Minuter"
msgstr "minuter"
#: server_status.php:446
#, fuzzy
#| msgid "Do not change the password"
msgid "Containing the word:"
msgstr "Ändra inte lösenordet"
msgstr "Innehåller ordet:"
#: server_status.php:451
#, fuzzy
#| msgid "Show open tables"
msgid "Show only alert values"
msgstr "Visa öppna tabeller"
msgstr "Visa endast varnings värden"
#: server_status.php:455
msgid "Filter by category..."
msgstr ""
msgstr "Filtrera efter kategori ..."
#: server_status.php:468
#, fuzzy
#| msgid "Related Links"
msgid "Related links:"
msgstr "Liknande länkar"
msgstr "Liknande länkar:"
#: server_status.php:513 server_status.php:545 server_status.php:666
#: server_status.php:711
@ -8329,12 +8315,12 @@ msgstr "Fråge-typ"
#. l10n: # = Amount of queries
#: server_status.php:543
msgid "#"
msgstr ""
msgstr "#"
#: server_status.php:615
#, php-format
msgid "Network traffic since startup: %s"
msgstr ""
msgstr "Nätverkstrafik sedan start:%s"
#: server_status.php:623
#, php-format
@ -8416,10 +8402,9 @@ msgid "ID"
msgstr "ID"
#: server_status.php:846
#, fuzzy
#| msgid "Could not connect to MySQL server"
msgid "The number of failed attempts to connect to the MySQL server."
msgstr "Kunde inte ansluta till MySQL-server"
msgstr "Antalet misslyckade försök att ansluta till MySQL-servern."
#: server_status.php:847
msgid ""
@ -8438,7 +8423,7 @@ msgstr "Antalet transaktioner som använde den temporära binära loggcachen."
#: server_status.php:849
msgid ""
"The number of connection attempts (successful or not) to the MySQL server."
msgstr ""
msgstr "Antalet anslutningsförsök (lyckade eller inte) till MySQL-servern."
#: server_status.php:850
msgid ""
@ -8858,6 +8843,8 @@ msgid ""
"The maximum number of connections that have been in use simultaneously since "
"the server started."
msgstr ""
"Det maximala antalet anslutningar som har använts samtidigt sedan servern "
"startade."
#: server_status.php:921
msgid "The number of rows waiting to be written in INSERT DELAYED queues."
@ -8889,6 +8876,8 @@ msgid ""
"fragmentation issues, which may be solved by issuing a FLUSH QUERY CACHE "
"statement."
msgstr ""
"Antalet fria minnesblock i frågecache. Högt antal kan tyda på fragmentering, "
"vilket kan lösas genom att köra ett FLUSH QUERY CACHEN kommando."
#: server_status.php:927
msgid "The amount of free memory for query cache."
@ -9624,10 +9613,9 @@ msgid "Line"
msgstr "Linje"
#: tbl_chart.php:88
#, fuzzy
#| msgid "Inline"
msgid "Spline"
msgstr "Infogad"
msgstr "ISpårning"
#: tbl_chart.php:89
msgid "Pie"
@ -9638,50 +9626,43 @@ msgid "Stacked"
msgstr "Staplade"
#: tbl_chart.php:94
#, fuzzy
#| msgid "Report title:"
msgid "Chart title"
msgstr "Rapport titel:"
msgstr "Diagramtitel"
#: tbl_chart.php:99
msgid "X-Axis:"
msgstr ""
msgstr "X-axel:"
#: tbl_chart.php:113
#, fuzzy
#| msgid "SQL queries"
msgid "Series:"
msgstr "SQL-frågor"
msgstr "Serie:"
#: tbl_chart.php:115
#, fuzzy
#| msgid "Textarea columns"
msgid "The remaining columns"
msgstr "Textarea kolumner"
msgstr "Återstående kolumner"
#: tbl_chart.php:128
#, fuzzy
#| msgid "X Axis label"
msgid "X-Axis label:"
msgstr "X-axel etikett"
#: tbl_chart.php:128
#, fuzzy
#| msgid "Value"
msgid "X Values"
msgstr "Värde"
msgstr "X värde"
#: tbl_chart.php:129
#, fuzzy
#| msgid "Y Axis label"
msgid "Y-Axis label:"
msgstr "Y-axel etikett"
#: tbl_chart.php:129
#, fuzzy
#| msgid "Value"
msgid "Y Values"
msgstr "Värde"
msgstr "Y värden"
#: tbl_create.php:56
#, php-format

View File

@ -1698,7 +1698,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
unset ($row);
echo ' <fieldset id="fieldset_add_user">' . "\n"
. ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;adduser=1">' . "\n"
. ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;adduser=1" class="' . $conditional_class . '">' . "\n"
. PMA_getIcon('b_usradd.png')
. ' ' . __('Add user') . '</a>' . "\n"
. ' </fieldset>' . "\n";