From 53e61583a7b7a519da347069e78a272f349a7133 Mon Sep 17 00:00:00 2001 From: Julio Guerra Date: Wed, 11 Apr 2012 17:58:32 +0200 Subject: [PATCH 01/12] 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 d57016e309..260d9915b8 100644 --- a/po/gl.po +++ b/po/gl.po @@ -4,8 +4,8 @@ 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-09 19:51+0200\n" -"PO-Revision-Date: 2012-03-20 03:34+0200\n" -"Last-Translator: frandieguez \n" +"PO-Revision-Date: 2012-04-11 16:57-0000\n" +"Last-Translator: Julio Guerra \n" "Language-Team: Galician \n" "Language: gl\n" "MIME-Version: 1.0\n" @@ -776,7 +776,7 @@ msgstr "Acción" #: db_tracking.php:102 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:120 tbl_tracking.php:605 tbl_tracking.php:663 msgid "active" @@ -813,11 +813,11 @@ msgstr "Rexistro de actividade da base de datos" #: enum_editor.php:23 js/messages.php:266 #: libraries/rte/rte_routines.lib.php:690 msgid "ENUM/SET editor" -msgstr "" +msgstr "Editor de ENUM/SET" #: enum_editor.php:28 js/messages.php:268 msgid "Values for a new column" -msgstr "" +msgstr "Valores para a nova columna" #: enum_editor.php:30 js/messages.php:267 #, fuzzy, php-format @@ -827,7 +827,7 @@ msgstr "Número de campos" #: enum_editor.php:34 js/messages.php:269 msgid "Enter each value in a separate field" -msgstr "" +msgstr "Introduza cada valor nun campo separado" #: enum_editor.php:123 #, fuzzy @@ -837,11 +837,11 @@ msgstr "Engadir un servidor novo" #: enum_editor.php:129 gis_data_editor.php:317 msgid "Output" -msgstr "" +msgstr "Saída" #: enum_editor.php:130 msgid "Copy and paste the joined values into the \"Length/Values\" field" -msgstr "" +msgstr "Copia e pega os valores unidos no campo \"Tamaño/Definir\"" #: export.php:29 #, fuzzy @@ -890,40 +890,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:172 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:323 #: libraries/display_tbl.lib.php:693 msgid "Geometry" -msgstr "" +msgstr "Xeometría" #: gis_data_editor.php:172 js/messages.php:319 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:317 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:318 msgid "Y" -msgstr "" +msgstr "Y" #: gis_data_editor.php:195 gis_data_editor.php:243 gis_data_editor.php:295 #: js/messages.php:320 #, 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:326 @@ -940,11 +940,11 @@ msgstr "As liñas rematan por" #: gis_data_editor.php:223 gis_data_editor.php:279 js/messages.php:325 msgid "Outer Ring" -msgstr "" +msgstr "Círculo externo" #: gis_data_editor.php:225 gis_data_editor.php:281 js/messages.php:324 msgid "Inner Ring" -msgstr "" +msgstr "Círculo interno" #: gis_data_editor.php:252 #, fuzzy @@ -960,7 +960,7 @@ msgstr "Engadir un usuario novo" #: gis_data_editor.php:266 js/messages.php:322 msgid "Polygon" -msgstr "" +msgstr "Polígono" #: gis_data_editor.php:306 js/messages.php:328 #, fuzzy @@ -979,6 +979,8 @@ 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:57 #, php-format @@ -1027,6 +1029,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:390 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" @@ -1208,7 +1212,7 @@ msgstr "Escolla de servidor" #: js/messages.php:67 server_status.php:806 msgid "Live conn./process chart" -msgstr "" +msgstr "Gráfica conexións/procesos en directo" #: js/messages.php:68 server_status.php:824 #, fuzzy @@ -1218,7 +1222,7 @@ msgstr "Caixa de Procuras SQL" #: js/messages.php:70 msgid "Static data" -msgstr "" +msgstr "Datos estáticos" #. l10n: Total number of queries #: js/messages.php:72 libraries/build_html_for_db.lib.php:46 @@ -1231,7 +1235,7 @@ msgstr "Total" #. l10n: Other, small valued, queries #: js/messages.php:74 server_status.php:603 server_status.php:1022 msgid "Other" -msgstr "" +msgstr "Outro" #. l10n: Thousands separator #: js/messages.php:76 libraries/common.lib.php:1452 @@ -1247,11 +1251,11 @@ msgstr "." #: js/messages.php:80 msgid "KiB sent since last refresh" -msgstr "" +msgstr "KiB enviados dende o último refresco" #: js/messages.php:81 msgid "KiB received since last refresh" -msgstr "" +msgstr "KiB recibidos dende o último refresco" #: js/messages.php:82 #, fuzzy @@ -1261,7 +1265,7 @@ msgstr "Escolla de servidor" #: js/messages.php:83 msgid "Connections since last refresh" -msgstr "" +msgstr "Conexións dende o último refresco" #: js/messages.php:84 js/messages.php:122 server_status.php:1235 msgid "Processes" @@ -1276,12 +1280,12 @@ msgstr "Conexións" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:87 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:89 msgid "Questions (executed statements by the server)" -msgstr "" +msgstr "Preguntas (sentencias executadas polo servidor)" #: js/messages.php:91 server_status.php:785 #, fuzzy @@ -1323,15 +1327,15 @@ msgstr "caché de procuras" #: js/messages.php:101 msgid "System CPU Usage" -msgstr "" +msgstr "Uso da CPU do sistema" #: js/messages.php:102 msgid "System memory" -msgstr "" +msgstr "Memoria do sistema" #: js/messages.php:103 msgid "System swap" -msgstr "" +msgstr "Arquivo de intercambio do sistema" #. l10n: shortcuts for Megabyte #: js/messages.php:104 js/messages.php:127 libraries/common.lib.php:1402 @@ -1347,7 +1351,7 @@ msgstr "KiB" #: js/messages.php:107 msgid "Average load" -msgstr "" +msgstr "Carga promedio" #: js/messages.php:108 #, fuzzy @@ -1357,7 +1361,7 @@ msgstr "Número de ficheiros de rexistro" #: js/messages.php:109 msgid "Cached memory" -msgstr "" +msgstr "Memoria caché" #: js/messages.php:110 #, fuzzy @@ -1367,11 +1371,11 @@ msgstr "Reserva da memoria intermedia" #: js/messages.php:111 msgid "Free memory" -msgstr "" +msgstr "Memoria libre" #: js/messages.php:112 msgid "Used memory" -msgstr "" +msgstr "Memoria usada" #: js/messages.php:114 #, fuzzy @@ -1381,11 +1385,11 @@ msgstr "Total" #: js/messages.php:115 msgid "Cached Swap" -msgstr "" +msgstr "Intercambio en caché" #: js/messages.php:116 msgid "Used Swap" -msgstr "" +msgstr "Intercambio usado" #: js/messages.php:117 #, fuzzy @@ -1395,7 +1399,7 @@ msgstr "Páxinas libres" #: js/messages.php:119 msgid "Bytes sent" -msgstr "" +msgstr "Bytes enviados" #: js/messages.php:120 #, fuzzy @@ -1465,7 +1469,7 @@ msgstr "Mudar o nome da base de datos para" #: js/messages.php:139 msgid "Edit title and labels" -msgstr "" +msgstr "Editar título e etiquetas" #: js/messages.php:140 #, fuzzy @@ -1475,7 +1479,7 @@ msgstr "Axustar á grella" #: js/messages.php:142 msgid "Please add at least one variable to the series" -msgstr "" +msgstr "Por favor engada polo menos unha variable á serie" #: js/messages.php:143 libraries/display_export.lib.php:308 #: libraries/display_tbl.lib.php:573 libraries/export/sql.php:1093 @@ -1487,35 +1491,35 @@ msgstr "Ningunha" #: js/messages.php:144 msgid "Resume monitor" -msgstr "" +msgstr "Recomezar monitorización" #: js/messages.php:145 msgid "Pause monitor" -msgstr "" +msgstr "Pausar monitorización" #: js/messages.php:147 msgid "general_log and slow_query_log are enabled." -msgstr "" +msgstr "general_log e slow_query_log están activas." #: js/messages.php:148 msgid "general_log is enabled." -msgstr "" +msgstr "general_log está activa." #: js/messages.php:149 msgid "slow_query_log is enabled." -msgstr "" +msgstr "slow_query_log está activa." #: js/messages.php:150 msgid "slow_query_log and general_log are disabled." -msgstr "" +msgstr "slow_query_log e general_log están desactivadas." #: js/messages.php:151 msgid "log_output is not set to TABLE." -msgstr "" +msgstr "log_output non está definido como TABLE." #: js/messages.php:152 msgid "log_output is set to TABLE." -msgstr "" +msgstr "log_output está definido como TABLE." #: js/messages.php:153 #, php-format @@ -1524,17 +1528,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:154 #, 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:155 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:157 @@ -1565,6 +1574,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:165 #, fuzzy @@ -1594,23 +1605,23 @@ msgstr "Diferenza" #: js/messages.php:171 #, php-format msgid "Divided by %s" -msgstr "" +msgstr "Dividido por %s" #: js/messages.php:172 msgid "Unit" -msgstr "" +msgstr "Unidade" #: js/messages.php:174 msgid "From slow log" -msgstr "" +msgstr "Do rexistro de procuras lento" #: js/messages.php:175 msgid "From general log" -msgstr "" +msgstr "Do rexistro de procuras xeral" #: js/messages.php:176 msgid "Analysing & loading logs. This may take a while." -msgstr "" +msgstr "Analizando e cargando rexistros. Esto pode tardar un anaco." #: js/messages.php:177 #, fuzzy @@ -11248,9 +11259,8 @@ msgid "Rearrange/edit charts" msgstr "" #: server_status.php:1584 -#, fuzzy msgid "Refresh rate" -msgstr "Refrescar" +msgstr "Tasa de refresco" #: server_status.php:1589 #, fuzzy @@ -13996,8 +14006,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" @@ -14100,8 +14110,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.
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
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
Se " +#~ "recibe unha páxina en branco é que todo está ben." #~ msgid "Dropping Procedure" #~ msgstr "Procedementos" @@ -14130,8 +14140,8 @@ msgstr "concurrent_insert está definido a 0" #~ "Server traffic: These tables show the network traffic statistics " #~ "of this MySQL server since its startup." #~ msgstr "" -#~ "Tráfico do servidor: Estas táboas mostran as estatísticas do " -#~ "tráfico da rede neste servidor de MySQL desde que se iniciou." +#~ "Tráfico do servidor: Estas táboas mostran as estatísticas do tráfico " +#~ "da rede neste servidor de MySQL desde que se iniciou." #~ msgid "" #~ "Query statistics: Since its startup, %s queries have been sent to " @@ -14214,9 +14224,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'...
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'...
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 " @@ -14224,9 +14234,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'...
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'...
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" @@ -14253,9 +14263,9 @@ msgstr "concurrent_insert está definido a 0" #~ "SQL queries settings, for SQL Query box options see [a@?page=form&" #~ "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&" -#~ "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&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" @@ -14270,8 +14280,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 4dc81c2f2627b5907b29567718a4ff7ddaf11f91 Mon Sep 17 00:00:00 2001 From: Julio Guerra Date: Wed, 11 Apr 2012 18:32:16 +0200 Subject: [PATCH 02/12] Translated using Weblate. --- po/gl.po | 77 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 35 deletions(-) diff --git a/po/gl.po b/po/gl.po index 260d9915b8..d76a76e17e 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-09 19:51+0200\n" -"PO-Revision-Date: 2012-04-11 16:57-0000\n" +"PO-Revision-Date: 2012-04-11 17:30-0000\n" "Last-Translator: Julio Guerra \n" "Language-Team: Galician \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:1677 @@ -105,7 +105,7 @@ msgstr "Non se configurou ningún servidor de streaming blob!" #: bs_disp_as_mime_type.php:35 msgid "Failed to fetch headers" -msgstr "Produciuse un fallo ao obter as cabeceiras." +msgstr "Produciuse un fallo ó obter as cabeceiras" #: bs_disp_as_mime_type.php:41 msgid "Failed to open remote URL" @@ -716,10 +716,9 @@ msgid "Add prefix to table" msgstr "Engaidr prefixo á táboa" #: db_structure.php:603 libraries/mult_submits.inc.php:251 -#, 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:605 libraries/mult_submits.inc.php:251 #, fuzzy @@ -2066,7 +2065,7 @@ msgstr "Ignorar" #: js/messages.php:316 libraries/display_tbl.lib.php:1391 msgid "Copy" -msgstr "" +msgstr "Copiar" #: js/messages.php:331 #, fuzzy @@ -3005,7 +3004,7 @@ msgid "" "configuration file!" msgstr "" "A directiva $cfg['PmaAbsoluteUri'] DEBE estar asignada no seu " -"ficheiro de configuración." +"ficheiro de configuración!" #: libraries/common.inc.php:650 #, fuzzy, php-format @@ -4857,7 +4856,7 @@ msgstr "" #: libraries/config/messages.inc.php:369 msgid "HTTP Realm" -msgstr "" +msgstr "Dominio HTTP (Realm)" #: libraries/config/messages.inc.php:370 msgid "" @@ -5236,7 +5235,7 @@ msgstr "" #: libraries/config/messages.inc.php:436 msgid "Add DROP DATABASE" -msgstr "" +msgstr "Engadir DROP DATABASE" #: libraries/config/messages.inc.php:437 msgid "" @@ -5246,7 +5245,7 @@ msgstr "" #: libraries/config/messages.inc.php:438 msgid "Add DROP TABLE" -msgstr "" +msgstr "Engadir DROP TABLE" #: libraries/config/messages.inc.php:439 msgid "" @@ -5256,7 +5255,7 @@ msgstr "" #: libraries/config/messages.inc.php:440 msgid "Add DROP VIEW" -msgstr "" +msgstr "Engadir DROP VIEW" #: libraries/config/messages.inc.php:441 msgid "Defines the list of statements the auto-creation uses for new versions." @@ -5389,6 +5388,8 @@ msgid "" "Defines whether or not type fields should be initially displayed in edit/" "insert mode" msgstr "" +"Define se os campos tipo deben ser mostrados inicialmente no modo " +"editar/inserir" #: libraries/config/messages.inc.php:463 #, fuzzy @@ -5406,7 +5407,7 @@ msgstr "Mostrar os campos de función" #: libraries/config/messages.inc.php:466 msgid "Whether to show hint or not" -msgstr "" +msgstr "Mostrar axudas ou non" #: libraries/config/messages.inc.php:467 #, fuzzy @@ -5442,6 +5443,8 @@ msgstr "Mostrar as procuras SQL" msgid "" "Defines whether the query box should stay on-screen after its submission" msgstr "" +"Define se a caixa de procuras debe permanecer en pantalla despois da súa " +"execución" #: libraries/config/messages.inc.php:474 libraries/sql_query_form.lib.php:352 #, fuzzy @@ -5504,7 +5507,7 @@ msgstr "Ignorar as táboas bloqueadas" #: libraries/config/messages.inc.php:488 msgid "Requires SQL Validator to be enabled" -msgstr "" +msgstr "Require que o validador SQL este habilitado" #: libraries/config/messages.inc.php:490 #: libraries/display_change_password.lib.php:40 @@ -5524,7 +5527,7 @@ msgstr "" #: libraries/config/messages.inc.php:492 msgid "Enable SQL Validator" -msgstr "" +msgstr "Hablitador o validador SQL" #: libraries/config/messages.inc.php:493 msgid "" @@ -5552,10 +5555,11 @@ msgstr "Suxerir un nome novo para as bases de datos" #: libraries/config/messages.inc.php:497 msgid "A warning is displayed on the main page if Suhosin is detected" msgstr "" +"Unha advertencia sera mostrada na pantalla principal se Suhosin e detectado" #: libraries/config/messages.inc.php:498 msgid "Suhosin warning" -msgstr "" +msgstr "Aviso de Suhosin" #: libraries/config/messages.inc.php:499 msgid "" @@ -5583,11 +5587,11 @@ msgstr "Fileiras de área de texto de CHAR" #: libraries/config/messages.inc.php:503 msgid "Title of browser window when a database is selected" -msgstr "" +msgstr "Título da ventana do navegador cando a base de datos está seleccionada" #: libraries/config/messages.inc.php:505 msgid "Title of browser window when nothing is selected" -msgstr "" +msgstr "Título da ventana do navegador cando non hai nada seleccionado" #: libraries/config/messages.inc.php:506 #, fuzzy @@ -5597,11 +5601,11 @@ msgstr "Separador por omisión das táboas" #: libraries/config/messages.inc.php:507 msgid "Title of browser window when a server is selected" -msgstr "" +msgstr "Título da ventana do navegador cando un servidor está seleccionado" #: libraries/config/messages.inc.php:509 msgid "Title of browser window when a table is selected" -msgstr "" +msgstr "Título da ventana do navegador cando unha taboa está seleccionada" #: libraries/config/messages.inc.php:511 msgid "" @@ -5641,10 +5645,12 @@ msgid "" "When disabled, users cannot set any of the options below, regardless of the " "checkbox on the right" msgstr "" +"Se está deshabilitada os usuarios non poden establecer ningunha das opcións " +"que hai debaixo, independientemente da caixa á dereita." #: libraries/config/messages.inc.php:518 msgid "Enable the Developer tab in settings" -msgstr "" +msgstr "Habilitar o separador de desenvolvemento na configuración." #: libraries/config/messages.inc.php:519 msgid "" @@ -5667,6 +5673,7 @@ msgstr "Comprobar cal é a última versión" #: libraries/config/messages.inc.php:522 msgid "Enables check for latest version on main phpMyAdmin page" msgstr "" +"Habilitar a comprobación da última versión na páxina principal de phpMyAdmin" #: libraries/config/messages.inc.php:523 setup/lib/index.lib.php:121 #: setup/lib/index.lib.php:131 setup/lib/index.lib.php:151 @@ -5727,7 +5734,7 @@ msgstr "Folla de cálculo Open Document" #: libraries/config/setup.forms.php:267 #: libraries/config/user_preferences.forms.php:166 msgid "Quick" -msgstr "" +msgstr "Rápido" #: libraries/config/setup.forms.php:271 #: libraries/config/user_preferences.forms.php:170 @@ -5760,7 +5767,7 @@ msgstr "Texto Open Document" #: libraries/config/validate.lib.php:198 msgid "Could not initialize Drizzle connection library" -msgstr "" +msgstr "Non se puido iniciar a biblioteca de conexión Drizzle" #: libraries/config/validate.lib.php:205 libraries/config/validate.lib.php:212 #, fuzzy @@ -5813,7 +5820,7 @@ msgstr "en" #: libraries/core.lib.php:266 #, php-format msgid "The %s extension is missing. Please check your PHP configuration." -msgstr "" +msgstr "Falta a extensión %s. Por favor comprobe a configuración do PHP." #: libraries/core.lib.php:414 msgid "possible deep recursion attack" @@ -5837,6 +5844,7 @@ msgstr "O servidor non está a responder" #: libraries/database_interface.lib.php:1820 msgid "Please check privileges of directory containing database." msgstr "" +"Por favor comprobe os privilexios do directorio que contén a base de datos." #: libraries/database_interface.lib.php:1828 msgid "Details..." @@ -5984,7 +5992,7 @@ msgstr "Tipo de exportación" #: libraries/display_export.lib.php:108 msgid "Quick - display only the minimal options" -msgstr "" +msgstr "Rapido - mostra só as opcións mínimas" #: libraries/display_export.lib.php:124 #, fuzzy @@ -6024,7 +6032,7 @@ msgstr "Número de campos" #: libraries/display_export.lib.php:157 msgid "Row to begin at:" -msgstr "" +msgstr "Comezar na columna:" #: libraries/display_export.lib.php:168 msgid "Dump all rows" @@ -6032,7 +6040,7 @@ msgstr "Envorcar todas as fileiras" #: libraries/display_export.lib.php:176 libraries/display_export.lib.php:197 msgid "Output:" -msgstr "" +msgstr "Saída:" #: libraries/display_export.lib.php:183 libraries/display_export.lib.php:209 #, fuzzy, php-format @@ -6058,11 +6066,11 @@ msgstr "" #: libraries/display_export.lib.php:226 msgid ", @DATABASE@ will become the database name" -msgstr "" +msgstr ", @DATABASE@ será o nome da base de datos" #: libraries/display_export.lib.php:228 msgid ", @TABLE@ will become the table name" -msgstr "" +msgstr ", @TABLE@ será o nome da táboa" #: libraries/display_export.lib.php:232 #, fuzzy, php-format @@ -6081,7 +6089,7 @@ msgstr "" #: libraries/display_export.lib.php:270 msgid "use this for future exports" -msgstr "" +msgstr "usar esto en futuras exportacións" #: libraries/display_export.lib.php:276 libraries/display_import.lib.php:188 #: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:468 @@ -6241,7 +6249,7 @@ msgstr "Número de rexistros (procuras) que se ignoran desde o comezo" #: libraries/display_import.lib.php:250 msgid "Format-Specific Options:" -msgstr "" +msgstr "Opcións específicas do formato:" #: libraries/display_select_lang.lib.php:46 #: libraries/display_select_lang.lib.php:47 setup/frames/index.inc.php:72 @@ -6359,11 +6367,11 @@ msgstr "Transformación do navegador" #: libraries/display_tbl.lib.php:694 msgid "Well Known Text" -msgstr "" +msgstr "Texto moi coñecido" #: libraries/display_tbl.lib.php:695 msgid "Well Known Binary" -msgstr "" +msgstr "Binario moi coñecido" #: libraries/display_tbl.lib.php:1406 libraries/display_tbl.lib.php:1418 msgid "The row has been deleted" @@ -6407,7 +6415,7 @@ msgstr "Mostrar o esquema PDF" #: libraries/display_tbl.lib.php:2680 msgid "Visualize GIS data" -msgstr "" +msgstr "Ver os datos GIS" #: libraries/display_tbl.lib.php:2701 #, fuzzy @@ -8804,10 +8812,9 @@ msgid "Table Search" msgstr "Procurar" #: libraries/tbl_select.lib.php:175 tbl_change.php:1000 -#, fuzzy #| msgid "Insert" msgid "Edit/Insert" -msgstr "Inserir" +msgstr "Editar/Inserir" #: libraries/transformations.lib.php:134 #, php-format From efde7087480fa8619d79545af5c56224f90bd66b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 11 Apr 2012 19:30:17 +0200 Subject: [PATCH 03/12] Translated using Weblate. --- po/ka.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ka.po b/po/ka.po index 8706200c69..0fb3779c5c 100644 --- a/po/ka.po +++ b/po/ka.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-09 19:51+0200\n" -"PO-Revision-Date: 2012-03-29 16:53+0200\n" +"PO-Revision-Date: 2012-04-11 15:58+0200\n" "Last-Translator: Michal Čihař \n" "Language-Team: georgian \n" "Language: ka\n" @@ -12,7 +12,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\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:1677 @@ -12070,7 +12070,7 @@ msgstr "ხედის ამობეჭდვა" #: tbl_structure.php:624 msgid "Relation view" -msgstr "" +msgstr "Relation view" #: tbl_structure.php:632 msgid "Propose table structure" From 8be2afa33c1953e1821e22eb7d82011494a700de Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 11 Apr 2012 19:30:24 +0200 Subject: [PATCH 04/12] Translated using Weblate. --- po/si.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/po/si.po b/po/si.po index bb97600180..3f3305d99b 100644 --- a/po/si.po +++ b/po/si.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-09 19:51+0200\n" -"PO-Revision-Date: 2012-04-10 20:36+0200\n" +"PO-Revision-Date: 2012-04-11 17:06+0200\n" "Last-Translator: Madhura Jayaratne \n" "Language-Team: sinhala \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:1677 @@ -389,7 +389,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:84 #: libraries/export/sql.php:753 @@ -3625,7 +3625,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:285 msgid "Maximal length of created query" @@ -6399,7 +6399,7 @@ msgid "" "Include a timestamp of when databases were created, last updated, and last " "checked" msgstr "" -"දත්තගබඩා සෑදූ , අවසන් වරට යාවත්කාලීන කල හා අවසන් වරට පරීක්ෂා කල වේලාවන් " +"දත්තගබඩා සෑදූ, අවසන් වරට යාවත්කාලීන කල හා අවසන් වරට පරීක්ෂා කල වේලාවන් " "ඇතුලත් කරන්න" #: libraries/export/sql.php:100 @@ -6496,7 +6496,7 @@ msgid "" "Dump TIMESTAMP columns in UTC (enables TIMESTAMP columns to be dumped and " "reloaded between servers in different time zones)" msgstr "" -"TIMESTAMP තීර UTC ලෙස නික්ෂේපනය කරන්න (වෙනස් වෙලා කලාපවල ඇති සේවාදායක අතර " +"TIMESTAMP තීර UTC ලෙස නික්ෂේපනය කරන්න (වෙනස් වේලා කලාපවල ඇති සේවාදායක අතර " "TIMESTAMP තීර නික්ෂේපනය හා ප්‍රතිපූරණයට අවස්ථාව ලබා දේ)" #: libraries/export/sql.php:342 libraries/export/xml.php:45 @@ -6965,7 +6965,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:309 msgid "This format has no options" @@ -9007,7 +9007,8 @@ msgstr "තෝරාගත් භාවිතා කරන්නන් ඉවත #: server_privileges.php:1781 msgid "Revoke all active privileges from the users and delete them afterwards." -msgstr "භාවිත කරන්නන්ගෙන් සියලුම සක්‍රීය වරප්‍රසාද අහෝසි කර අනතුරුව ඔවුන් ඉවත් කරන්න." +msgstr "" +"භාවිතා කරන්නන්ගේ සියලුම සක්‍රීය වරප්‍රසාද අහෝසි කර අනතුරුව ඔවුන් ඉවත් කරන්න." #: server_privileges.php:1782 server_privileges.php:1783 #: server_privileges.php:1784 From 0ebf022426654a557397a57f045802e7d212e134 Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Wed, 11 Apr 2012 16:50:10 -0400 Subject: [PATCH 05/12] Refactoring challenge --- tbl_structure.php | 42 +++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/tbl_structure.php b/tbl_structure.php index 30c937e15a..3c19da67db 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -259,34 +259,22 @@ foreach ($fields as $row) { } // for the case ENUM('–','“') $type = htmlspecialchars($type); - // in case it is too long - $start = 0; - if (strlen($type) > $GLOBALS['cfg']['LimitChars']) { - $start = 13; - $type = '' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . ''; + + $field_charset = ''; + if ( + $extracted_fieldspec['binary'] == false + && + preg_match("@^(char|varchar|text|tinytext|mediumtext|longtext|set|enum)@", $type)) { + if (! empty($row['Collation'])) { + $field_charset = $row['Collation']; + } } - unset($field_charset); - if ((substr($type, $start, 4) == 'char' - || substr($type, $start, 7) == 'varchar' - || substr($type, $start, 4) == 'text' - || substr($type, $start, 8) == 'tinytext' - || substr($type, $start, 10) == 'mediumtext' - || substr($type, $start, 8) == 'longtext' - || substr($type, $start, 3) == 'set' - || substr($type, $start, 4) == 'enum') - && !$extracted_fieldspec['binary'] - ) { - if (strpos($type, ' character set ')) { - $type = substr($type, 0, strpos($type, ' character set ')); - } - if (!empty($row['Collation'])) { - $field_charset = $row['Collation']; - } else { - $field_charset = ''; - } - } else { - $field_charset = ''; + $displayed_type = $type; + if (strlen($type) > $GLOBALS['cfg']['LimitChars']) { + $displayed_type = ""; + $displayed_type .= substr($type, 0, $GLOBALS['cfg']['LimitChars']); + $displayed_type .= ""; } // Display basic mimetype [MIME] @@ -343,7 +331,7 @@ foreach ($fields as $row) { - > + > ' . $field_charset . ''); ?> From 9683539295ef33d9a2ba2d66b8874171493d0e91 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 11 Apr 2012 16:53:00 -0400 Subject: [PATCH 06/12] Attributes must be enclosed with double-quotes --- tbl_structure.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tbl_structure.php b/tbl_structure.php index 3c19da67db..d3110ad7d6 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -272,9 +272,9 @@ foreach ($fields as $row) { $displayed_type = $type; if (strlen($type) > $GLOBALS['cfg']['LimitChars']) { - $displayed_type = ""; + $displayed_type = ''; $displayed_type .= substr($type, 0, $GLOBALS['cfg']['LimitChars']); - $displayed_type .= ""; + $displayed_type .= ''; } // Display basic mimetype [MIME] From 3ad498649a55cc653d54f8f93b35a1f2609540ed Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 11 Apr 2012 17:14:35 -0400 Subject: [PATCH 07/12] Refactoring challenge, part 2 --- libraries/common.lib.php | 18 ++++++++++++++++++ tbl_structure.php | 20 +++----------------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 4d550e6155..534e431894 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -3026,6 +3026,22 @@ function PMA_extractFieldSpec($fieldspec) $attribute = 'UNSIGNED ZEROFILL'; } + $can_contain_collation = false; + if ( + ! $binary + && + preg_match("@^(char|varchar|text|tinytext|mediumtext|longtext|set|enum)@", $type)) { + $can_contain_collation = true; + } + + // for the case ENUM('–','“') + $displayed_type = htmlspecialchars($printtype); + if (strlen($printtype) > $GLOBALS['cfg']['LimitChars']) { + $displayed_type = ''; + $displayed_type .= substr($printtype, 0, $GLOBALS['cfg']['LimitChars']); + $displayed_type .= ''; + } + return array( 'type' => $type, 'spec_in_brackets' => $spec_in_brackets, @@ -3035,6 +3051,8 @@ function PMA_extractFieldSpec($fieldspec) 'unsigned' => $unsigned, 'zerofill' => $zerofill, 'attribute' => $attribute, + 'can_contain_collation' => $can_contain_collation, + 'displayed_type' => $displayed_type ); } diff --git a/tbl_structure.php b/tbl_structure.php index d3110ad7d6..2b2384c06c 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -257,24 +257,10 @@ foreach ($fields as $row) { if (empty($type)) { $type = ' '; } - // for the case ENUM('–','“') - $type = htmlspecialchars($type); $field_charset = ''; - if ( - $extracted_fieldspec['binary'] == false - && - preg_match("@^(char|varchar|text|tinytext|mediumtext|longtext|set|enum)@", $type)) { - if (! empty($row['Collation'])) { - $field_charset = $row['Collation']; - } - } - - $displayed_type = $type; - if (strlen($type) > $GLOBALS['cfg']['LimitChars']) { - $displayed_type = ''; - $displayed_type .= substr($type, 0, $GLOBALS['cfg']['LimitChars']); - $displayed_type .= ''; + if ($extracted_fieldspec['can_contain_collation'] && ! empty($row['Collation'])) { + $field_charset = $row['Collation']; } // Display basic mimetype [MIME] @@ -331,7 +317,7 @@ foreach ($fields as $row) { - > + > ' . $field_charset . ''); ?> From d628eab1e90418d566f52c79adbb636719ac860a Mon Sep 17 00:00:00 2001 From: Jo Michael Date: Wed, 11 Apr 2012 23:25:17 +0200 Subject: [PATCH 08/12] - bug #3517021 [interface] Header links except 'More' hide after closing dialog --- ChangeLog | 1 + js/functions.js | 28 ++++++++++++++++++---------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 855c71bcb8..111cc5cbaa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ phpMyAdmin - ChangeLog - bug [display] Added missing icons in original theme - bug #3516761 [edit] Query error after search - bug #3516405 [display] Chart title is getting wrong within chart export +- bug #3517021 [interface] Header links except 'More' hide after closing dialog 3.5.0.0 (2012-04-07) + rfe #2021981 [interface] Add support for mass prefix change. diff --git a/js/functions.js b/js/functions.js index b33507819e..694b634a35 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1441,20 +1441,24 @@ function PMA_showNoticeForEnum(selectElement) function PMA_createTableDialog( $div, url , target) { /** - * @var button_options Object that stores the options passed to jQueryUI - * dialog - */ + * @var button_options Object that stores the options passed to jQueryUI + * dialog + */ var button_options = {}; // in the following function we need to use $(this) - button_options[PMA_messages['strCancel']] = function() {$(this).closest('.ui-dialog-content').dialog('close').remove();} + button_options[PMA_messages['strCancel']] = function() { + $(this).closest('.ui-dialog-content').dialog('close').remove(); + }; var button_options_error = {}; - button_options_error[PMA_messages['strOK']] = function() {$(this).closest('.ui-dialog-content').dialog('close').remove();} + button_options_error[PMA_messages['strOK']] = function() { + $(this).closest('.ui-dialog-content').dialog('close').remove(); + }; var $msgbox = PMA_ajaxShowMessage(); - $.get( target , url , function(data) { - //in the case of an error, show the error message returned. + $.get(target, url, function(data) { + //in the case of an error, show the error message returned. if (data.success != undefined && data.success == false) { $div .append(data.error) @@ -1466,7 +1470,8 @@ function PMA_createTableDialog( $div, url , target) })// end dialog options //remove the redundant [Back] link in the error message. .find('fieldset').remove(); - } else { + } + else { var size = getWindowSize(); var timeout; $div @@ -1515,12 +1520,15 @@ function PMA_createTableDialog( $div, url , target) close: function() { $(window).unbind('resize.dialog-resizer'); $('#content-hide > *').unwrap(); + // resize topmenu + menuResize(); + menuResize(); // somehow need to call it twice to work }, buttons: button_options }); // end dialog options } - PMA_convertFootnotesToTooltips($div); - PMA_ajaxRemoveMessage($msgbox); + PMA_convertFootnotesToTooltips($div); + PMA_ajaxRemoveMessage($msgbox); }); // end $.get() } From b84bcb1370f524b7ada61e8fd1c2d51ebe6e472a Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 11 Apr 2012 23:35:44 +0200 Subject: [PATCH 09/12] Translated using Weblate. --- po/pl.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/pl.po b/po/pl.po index 48aaaf4473..b1d258c474 100644 --- a/po/pl.po +++ b/po/pl.po @@ -4,8 +4,8 @@ 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-09 19:51+0200\n" -"PO-Revision-Date: 2012-04-09 11:22+0200\n" -"Last-Translator: Bartosz Feński \n" +"PO-Revision-Date: 2012-04-11 23:33+0200\n" +"Last-Translator: Marc Delisle \n" "Language-Team: iMutrix\n" "Language: pl\n" "MIME-Version: 1.0\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\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:1677 @@ -13010,9 +13010,9 @@ msgid "" "source-of-aborted_connects/\">This article might help you track down the " "source." msgstr "" -"Połączenia są zazwyczaj przerwane, kiedy nie mogą być autoryzowane. Ten artykół może pomóc wyśledzić źródło." +"Połączenia są zazwyczaj przerwane, kiedy nie mogą być autoryzowane. Ten artykuł może pomóc wyśledzić źródło." #: po/advisory_rules.php:233 #, php-format From c181e1f47856608acbbf69458a7c8646bbb6de4c Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 11 Apr 2012 23:35:46 +0200 Subject: [PATCH 10/12] Translated using Weblate. --- po/si.po | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/po/si.po b/po/si.po index 3f3305d99b..1415f813d5 100644 --- a/po/si.po +++ b/po/si.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-09 19:51+0200\n" -"PO-Revision-Date: 2012-04-11 17:06+0200\n" +"PO-Revision-Date: 2012-04-11 21:32+0200\n" "Last-Translator: Madhura Jayaratne \n" "Language-Team: sinhala \n" "Language: si\n" @@ -10110,6 +10110,8 @@ msgid "" "The arrangement of the charts is stored to the browsers local storage. You " "may want to export it if you have a complicated set up." msgstr "" +"ප්‍රස්ථාර සැකැස්ම බ්‍රවුසරයේ ගබඩාවේ ගබඩා කර ඇත. සංකීර්ණ වූ සැකැස්මක් ඇත්නම් " +"ඔබට එය අපනයනය කර ගැනීමට අවශ්‍ය විය හැකිය." #: server_status.php:1606 msgid "Reset to default" @@ -10127,6 +10129,11 @@ msgid "" "enabled. Note however, that the general_log produces a lot of data and " "increases server load by up to 15%" msgstr "" +"ඔබගේ සේවාදායකයේ වින්‍යාසයන් ප්‍රශස්ත කිරීමටත් වැඩි කාලයක් ගතවන විමසුම් හඳුනා " +"ගැනීමටත් ඔබට phpMyAdmin අධීක්ෂකය යොදාගත හැක. දෙවැන්න සඳහා log_output, TABLE " +"ලෙස සිටුවීමත් slow_query_log, general_log යන දෙකෙන් එකක් සක්‍රීය කිරීමත් " +"අවශ්‍ය වේ. කෙසේ වෙතත් general_logය ඉතා විශාල දත්ත ප්‍රමාණයක් උත්පාදනය කරන බව " +"සහ එමගින් සේවාදායකය මත භාරය 15% දක්වා ඉහල යා හැකි බව සලකන්න" #: server_status.php:1616 msgid "" @@ -10138,7 +10145,7 @@ msgstr "" #: server_status.php:1629 msgid "Using the monitor:" -msgstr "" +msgstr "අධීක්ෂකය භාවිතා කරමින්:" #: server_status.php:1631 msgid "" @@ -10157,7 +10164,7 @@ msgstr "" #: server_status.php:1640 msgid "Please note:" -msgstr "" +msgstr "කරුණාකර සලකන්න:" #: server_status.php:1642 msgid "" @@ -10181,7 +10188,7 @@ msgstr "ශ්‍රේණිය තෝරන්න:" #: server_status.php:1662 msgid "Commonly monitored" -msgstr "" +msgstr "සාමාන්‍යයෙන් අධීක්ෂණය කරනු ලබන" #: server_status.php:1677 msgid "or type variable name:" @@ -10189,15 +10196,15 @@ msgstr "හෝ විචල්‍ය නාමය යතුරු කරන් #: server_status.php:1681 msgid "Display as differential value" -msgstr "" +msgstr "ආන්තර අගයන් ලෙස පෙන්වන්න" #: server_status.php:1683 msgid "Apply a divisor" -msgstr "" +msgstr "භාජකයක් භාවිතා කරන්න" #: server_status.php:1690 msgid "Append unit to data values" -msgstr "" +msgstr "දත්ත අගයන් සඳහා ඒකකයක් එක් කරන්න" #: server_status.php:1696 msgid "Add this series" @@ -10205,7 +10212,7 @@ msgstr "මෙම ශ්‍රේණිය එක් කරන්න" #: server_status.php:1698 msgid "Clear series" -msgstr "" +msgstr "ශ්‍රේණිය ඉවත් කරන්න" #: server_status.php:1701 msgid "Series in Chart:" @@ -10221,19 +10228,19 @@ msgstr "තෝරාගත් කාල පරාසය:" #: server_status.php:1720 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements" -msgstr "" +msgstr "SELECT,INSERT,UPDATE සහ DELETE ප්‍රකාශ පමණක් ලබාගන්න" #: server_status.php:1725 msgid "Remove variable data in INSERT statements for better grouping" -msgstr "" +msgstr "වඩා හොඳ සමූහනයන් සඳහා INSERT ප්‍රකාශ වල අඩංගු විචල්‍ය දත්ත ඉවත් කරන්න" #: server_status.php:1730 msgid "Choose from which log you want the statistics to be generated from." -msgstr "" +msgstr "සංඛ්‍යාලේඛන උත්පාදනය කල යුත්තේ කුමන ලොගයෙන් දැයි තෝරන්න." #: server_status.php:1732 msgid "Results are grouped by query text." -msgstr "" +msgstr "ප්‍රතිඵල විමසුම් පෙළ මගින් සමූහනය කර ඇත." #: server_status.php:1737 msgid "Query analyzer" @@ -10341,7 +10348,7 @@ msgstr "ක්‍රියාත්මක කරන ලද විමසුම් #: server_synchronize.php:1202 msgid "Enter manually" -msgstr "" +msgstr "අතින් ඇතුල් කරන්න" #: server_synchronize.php:1210 msgid "Current connection" @@ -10366,7 +10373,7 @@ msgstr "" #: server_variables.php:80 msgid "Setting variable failed" -msgstr "" +msgstr "විචල්‍යය සිටුවීම අසමත් විය" #: server_variables.php:99 msgid "Server variables and settings" From cf831935cb7b4db4c05858a75aee4cc0d5461b64 Mon Sep 17 00:00:00 2001 From: Jo Michael Date: Thu, 12 Apr 2012 02:33:51 +0200 Subject: [PATCH 11/12] - bug #3516817 [interface] "More" actions in table structure --- ChangeLog | 1 + js/functions.js | 155 --------------------------------- js/tbl_structure.js | 206 ++++++++++++++++++++++++++++++++++++++++++++ tbl_structure.php | 54 ++++++++---- 4 files changed, 242 insertions(+), 174 deletions(-) diff --git a/ChangeLog b/ChangeLog index 111cc5cbaa..5268a11189 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog - bug #3516761 [edit] Query error after search - bug #3516405 [display] Chart title is getting wrong within chart export - bug #3517021 [interface] Header links except 'More' hide after closing dialog +- bug #3516817 [interface] "More" actions in table structure 3.5.0.0 (2012-04-07) + rfe #2021981 [interface] Add support for mass prefix change. diff --git a/js/functions.js b/js/functions.js index 694b634a35..60ef801a65 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2148,80 +2148,6 @@ $(document).ready(function() { }, 'top.frame_content'); //end $(document).ready for 'Create Table' -/** - * jQuery coding for 'Change Table' and 'Add Column'. Used on tbl_structure.php * - * Attach Ajax Event handlers for Change Table - */ -$(document).ready(function() { - /** - *Ajax action for submitting the "Column Change" and "Add Column" form - **/ - $("#append_fields_form input[name=do_save_data]").live('click', function(event) { - event.preventDefault(); - /** - * @var the_form object referring to the export form - */ - var $form = $("#append_fields_form"); - - /* - * First validate the form; if there is a problem, avoid submitting it - * - * checkTableEditForm() needs a pure element and not a jQuery object, - * this is why we pass $form[0] as a parameter (the jQuery object - * is actually an array of DOM elements) - */ - if (checkTableEditForm($form[0], $form.find('input[name=orig_num_fields]').val())) { - // OK, form passed validation step - if ($form.hasClass('ajax')) { - PMA_prepareForAjaxRequest($form); - //User wants to submit the form - $.post($form.attr('action'), $form.serialize()+"&do_save_data=Save", function(data) { - if ($("#sqlqueryresults").length != 0) { - $("#sqlqueryresults").remove(); - } else if ($(".error").length != 0) { - $(".error").remove(); - } - if (data.success == true) { - PMA_ajaxShowMessage(data.message); - $("
").insertAfter("#floating_menubar"); - $("#sqlqueryresults").html(data.sql_query); - $("#result_query .notice").remove(); - $("#result_query").prepend((data.message)); - if ($("#change_column_dialog").length > 0) { - $("#change_column_dialog").dialog("close").remove(); - } else if ($("#add_columns").length > 0) { - $("#add_columns").dialog("close").remove(); - } - /*Reload the field form*/ - $.post($("#fieldsForm").attr('action'), $("#fieldsForm").serialize()+"&ajax_request=true", function(form_data) { - $("#fieldsForm").remove(); - $("#addColumns").remove(); - var $temp_div = $("
").append(form_data); - if ($("#sqlqueryresults").length != 0) { - $temp_div.find("#fieldsForm").insertAfter("#sqlqueryresults"); - } else { - $temp_div.find("#fieldsForm").insertAfter(".error"); - } - $temp_div.find("#addColumns").insertBefore("iframe.IE_hack"); - /*Call the function to display the more options in table*/ - displayMoreTableOpts(); - }); - } else { - var $temp_div = $("
").append(data); - var $error = $temp_div.find(".error code").addClass("error"); - PMA_ajaxShowMessage($error, false); - } - }) // end $.post() - } else { - // non-Ajax submit - $form.append(''); - $form.submit(); - } - } - }) // end change table button "do_save_data" - -}, 'top.frame_content'); //end $(document).ready for 'Change Table' - /** * jQuery coding for 'Table operations'. Used on tbl_operations.php * Attach Ajax Event handlers for Table operations @@ -2717,87 +2643,6 @@ $(document).ready(function() { }); }); -/** - * Hides certain table structure actions, replacing them - * with the word "More". They are displayed in a dropdown - * menu when the user hovers over the word "More." - */ -$(document).ready(function() { - displayMoreTableOpts(); -}); - -function displayMoreTableOpts() -{ - // Remove the actions from the table cells (they are available by default for JavaScript-disabled browsers) - // if the table is not a view or information_schema (otherwise there is only one action to hide and there's no point) - if($("input[type='hidden'][name='table_type']").val() == "table") { - var $table = $("table[id='tablestructure']"); - $table.find("td[class='browse']").remove(); - $table.find("td[class='primary']").remove(); - $table.find("td[class='unique']").remove(); - $table.find("td[class='index']").remove(); - $table.find("td[class='fulltext']").remove(); - $table.find("td[class='spatial']").remove(); - $table.find("th[class='action']").attr("colspan", 3); - - // Display the "more" text - $table.find("td[class='more_opts']").show(); - - // Position the dropdown - $(".structure_actions_dropdown").each(function() { - // Optimize DOM querying - var $this_dropdown = $(this); - // The top offset must be set for IE even if it didn't change - var cell_right_edge_offset = $this_dropdown.parent().position().left + $this_dropdown.parent().innerWidth(); - var left_offset = cell_right_edge_offset - $this_dropdown.innerWidth(); - var top_offset = $this_dropdown.parent().position().top + $this_dropdown.parent().innerHeight(); - $this_dropdown.offset({ top: top_offset, left: left_offset }); - }); - - // A hack for IE6 to prevent the after_field select element from being displayed on top of the dropdown by - // positioning an iframe directly on top of it - var $after_field = $("select[name='after_field']"); - $("iframe[class='IE_hack']") - .width($after_field.width()) - .height($after_field.height()) - .offset({ - top: $after_field.offset().top, - left: $after_field.offset().left - }); - - // When "more" is hovered over, show the hidden actions - $table.find("td[class='more_opts']") - .mouseenter(function() { - if($.browser.msie && $.browser.version == "6.0") { - $("iframe[class='IE_hack']") - .show() - .width($after_field.width()+4) - .height($after_field.height()+4) - .offset({ - top: $after_field.offset().top, - left: $after_field.offset().left - }); - } - $(".structure_actions_dropdown").hide(); // Hide all the other ones that may be open - $(this).children(".structure_actions_dropdown").show(); - // Need to do this again for IE otherwise the offset is wrong - if($.browser.msie) { - var left_offset_IE = $(this).offset().left + $(this).innerWidth() - $(this).children(".structure_actions_dropdown").innerWidth(); - var top_offset_IE = $(this).offset().top + $(this).innerHeight(); - $(this).children(".structure_actions_dropdown").offset({ - top: top_offset_IE, - left: left_offset_IE }); - } - }) - .mouseleave(function() { - $(this).children(".structure_actions_dropdown").hide(); - if($.browser.msie && $.browser.version == "6.0") { - $("iframe[class='IE_hack']").hide(); - } - }); - } - -} $(document).ready(function(){ PMA_convertFootnotesToTooltips(); }); diff --git a/js/tbl_structure.js b/js/tbl_structure.js index 1e1d696f46..680f117f22 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -474,3 +474,209 @@ function changeColumns(action,url) }) // end $.get() } +/** + * jQuery coding for 'Change Table' and 'Add Column'. Used on tbl_structure.php * + * Attach Ajax Event handlers for Change Table + */ +$(document).ready(function() { + /** + *Ajax action for submitting the "Column Change" and "Add Column" form + **/ + $("#append_fields_form input[name=do_save_data]").live('click', function(event) { + event.preventDefault(); + /** + * @var the_form object referring to the export form + */ + var $form = $("#append_fields_form"); + + /* + * First validate the form; if there is a problem, avoid submitting it + * + * checkTableEditForm() needs a pure element and not a jQuery object, + * this is why we pass $form[0] as a parameter (the jQuery object + * is actually an array of DOM elements) + */ + if (checkTableEditForm($form[0], $form.find('input[name=orig_num_fields]').val())) { + // OK, form passed validation step + if ($form.hasClass('ajax')) { + PMA_prepareForAjaxRequest($form); + //User wants to submit the form + $.post($form.attr('action'), $form.serialize()+"&do_save_data=Save", function(data) { + if ($("#sqlqueryresults").length != 0) { + $("#sqlqueryresults").remove(); + } else if ($(".error").length != 0) { + $(".error").remove(); + } + if (data.success == true) { + PMA_ajaxShowMessage(data.message); + $("
").insertAfter("#floating_menubar"); + $("#sqlqueryresults").html(data.sql_query); + $("#result_query .notice").remove(); + $("#result_query").prepend((data.message)); + if ($("#change_column_dialog").length > 0) { + $("#change_column_dialog").dialog("close").remove(); + } else if ($("#add_columns").length > 0) { + $("#add_columns").dialog("close").remove(); + } + /*Reload the field form*/ + $.post($("#fieldsForm").attr('action'), $("#fieldsForm").serialize()+"&ajax_request=true", function(form_data) { + $("#fieldsForm").remove(); + $("#addColumns").remove(); + var $temp_div = $("
").append(form_data); + if ($("#sqlqueryresults").length != 0) { + $temp_div.find("#fieldsForm").insertAfter("#sqlqueryresults"); + } else { + $temp_div.find("#fieldsForm").insertAfter(".error"); + } + $temp_div.find("#addColumns").insertBefore("iframe.IE_hack"); + /*Call the function to display the more options in table*/ + $table_clone = false; + moreOptsMenuResize(); + }); + } else { + var $temp_div = $("
").append(data); + var $error = $temp_div.find(".error code").addClass("error"); + PMA_ajaxShowMessage($error, false); + } + }) // end $.post() + } else { + // non-Ajax submit + $form.append(''); + $form.submit(); + } + } + }) // end change table button "do_save_data" + +}, 'top.frame_content'); //end $(document).ready for 'Change Table' + +/** + * Hides certain table structure actions, replacing them + * with the word "More". They are displayed in a dropdown + * menu when the user hovers over the word "More." + */ + +var $table_clone = false; + +function moreOptsMenuResize() { + var $table = $("table#tablestructure"); + + // don't use More menu if we're only showing icons and no text + if ($table.hasClass("PropertiesIconic")) { + return; + } + + // reset table to defaults + if ($table_clone === false) { + $table_clone = $table.clone(); + } + else { + $table.replaceWith($table_clone); + $table = $table_clone; + $table_clone = $table.clone(); + } + + var getCurWidth = function() { + var cur_width = 0; + $table.find("tr").eq(1) + .find("td.edit, td.drop, .replaced_by_more:visible, .more_opts:visible") + .each(function () { + cur_width += $(this).outerWidth(); + }); + return cur_width; + }; + + // get window width + var window_width = $(window).width(); + // find out maximum action links width + var max_width = window_width; + $table.find("th").each(function () { + if ($(this).index() < 8) { + max_width -= $(this).outerWidth() + 1; + } + }); + // current action links width + var cur_width = getCurWidth(); + + // remove some links if current width is wider than maximum allowed + if (cur_width > max_width) { + while (cur_width > max_width + && $(".replaced_by_more:visible").length > 0) { + + // hide last visible element + var css_class = $table.find("tr").eq(1) + .find(".replaced_by_more:visible").last().prop("className").split(" "); + $table.find("." + css_class.join(".")).hide(); + // show corresponding more-menu entry + $table.find(".replace_in_more.action_" + css_class[0]).show(); + // recalculate width + cur_width = getCurWidth(); + } + } + + if ($(".replaced_by_more:hidden").length == 0) { + $table.find("td.more_opts").hide(); + } + else { + $table.find("td.more_opts").show(); + } + + // Position the dropdown + $(".structure_actions_dropdown").each(function() { + // Optimize DOM querying + var $this_dropdown = $(this); + // The top offset must be set for IE even if it didn't change + var cell_right_edge_offset = $this_dropdown.parent().position().left + $this_dropdown.parent().innerWidth(); + var left_offset = cell_right_edge_offset - $this_dropdown.innerWidth(); + var top_offset = $this_dropdown.parent().position().top + $this_dropdown.parent().innerHeight(); + $this_dropdown.offset({ top: top_offset, left: left_offset }); + }); + + // A hack for IE6 to prevent the after_field select element from being displayed on top of the dropdown by + // positioning an iframe directly on top of it + var $after_field = $("select[name='after_field']"); + $("iframe[class='IE_hack']") + .width($after_field.width()) + .height($after_field.height()) + .offset({ + top: $after_field.offset().top, + left: $after_field.offset().left + }); + + // When "more" is hovered over, show the hidden actions + $table.find("td.more_opts") + .unbind("mouseenter") + .bind("mouseenter", function() { + if($.browser.msie && $.browser.version == "6.0") { + $("iframe[class='IE_hack']") + .show() + .width($after_field.width()+4) + .height($after_field.height()+4) + .offset({ + top: $after_field.offset().top, + left: $after_field.offset().left + }); + } + $(".structure_actions_dropdown").hide(); // Hide all the other ones that may be open + $(this).children(".structure_actions_dropdown").show(); + // Need to do this again for IE otherwise the offset is wrong + if($.browser.msie) { + var left_offset_IE = $(this).offset().left + $(this).innerWidth() - $(this).children(".structure_actions_dropdown").innerWidth(); + var top_offset_IE = $(this).offset().top + $(this).innerHeight(); + $(this).children(".structure_actions_dropdown").offset({ + top: top_offset_IE, + left: left_offset_IE }); + } + }) + .unbind("mouseleave") + .bind("mouseleave", function() { + $(this).children(".structure_actions_dropdown").hide(); + if($.browser.msie && $.browser.version == "6.0") { + $("iframe[class='IE_hack']").hide(); + } + }); +} +$(window).resize(moreOptsMenuResize); +$(function () { + $(".replace_in_more").hide(); + moreOptsMenuResize(); +}); diff --git a/tbl_structure.php b/tbl_structure.php index 15920ce696..96a95a9d09 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -193,7 +193,8 @@ $i = 0; echo '"table" />'; } ?> - +
@@ -208,7 +209,16 @@ $i = 0; - + @@ -359,10 +369,6 @@ foreach ($fields as $row) { echo '' . _pgettext('None for default', 'None') . ''; } ?> - - + + - - - + if ($GLOBALS['cfg']['PropertiesIconic'] !== true) { ?> From 84c768878497b1bb091d1b14e275318b6a3415af Mon Sep 17 00:00:00 2001 From: Jo Michael Date: Thu, 12 Apr 2012 03:33:49 +0200 Subject: [PATCH 12/12] Fix broken grid editing in table browse mode --- js/tbl_structure.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/tbl_structure.js b/js/tbl_structure.js index 680f117f22..c7d4103e62 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -561,7 +561,7 @@ function moreOptsMenuResize() { var $table = $("table#tablestructure"); // don't use More menu if we're only showing icons and no text - if ($table.hasClass("PropertiesIconic")) { + if ($table.length == 0 || $table.hasClass("PropertiesIconic")) { return; }
- - - @@ -372,7 +378,13 @@ foreach ($fields as $row) { href="sql.php?&sql_query=&dropped_column=&message_to_show=" > + + + + + hasColumn($field_name))) { echo $titles['NoPrimary'] . "\n"; @@ -387,7 +399,7 @@ foreach ($fields as $row) { echo "\n"; ?> + + + + - + @@ -453,24 +467,25 @@ foreach ($fields as $row) { } else { echo "\n"; ?> - +
-
+
-
> +
@@ -483,7 +498,7 @@ foreach ($fields as $row) { } } ?>
-
+
@@ -496,7 +511,7 @@ foreach ($fields as $row) { } } ?>
-
+
@@ -510,7 +525,7 @@ foreach ($fields as $row) { } ?>
-
+
@@ -523,7 +538,7 @@ foreach ($fields as $row) { } } ?>
-
+
@@ -540,6 +555,7 @@ foreach ($fields as $row) {