From d5bcc22ebe801436d0d64dca1f4e4afac4400675 Mon Sep 17 00:00:00 2001 From: Xavier Navarro Date: Tue, 17 Mar 2015 18:45:06 +0100 Subject: [PATCH 1/7] Translated using Weblate (Catalan) Currently translated at 99.0% (3004 of 3032 strings) [CI skip] --- po/ca.po | 77 ++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 24 deletions(-) diff --git a/po/ca.po b/po/ca.po index ec44b6c469..cee61e9200 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.0-alpha1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-03-06 08:15-0500\n" -"PO-Revision-Date: 2015-03-17 07:12+0200\n" +"PO-Revision-Date: 2015-03-17 18:45+0200\n" "Last-Translator: Xavier Navarro \n" "Language-Team: Catalan " "\n" @@ -9653,11 +9653,14 @@ msgid "" "given set whose values combined together are sufficient to determine the " "value of the column." msgstr "" +"Per a cada una de les columnes a sota, selecciona el conjunt mínim de " +"columnes entre les que els seus valors combinats són suficients per a " +"determinar el valor de la columna." #: libraries/normalization.lib.php:345 libraries/normalization.lib.php:730 #, php-format msgid "'%1$s' depends on:" -msgstr "" +msgstr "'%1$s' depèn de:" #: libraries/normalization.lib.php:356 #, php-format @@ -9665,6 +9668,8 @@ msgid "" "No partial dependencies possible as the primary key ( %1$s ) has just one " "column." msgstr "" +"No hi ha dependències parcials possibles ja que la clau principal ( %1$s ) " +"només té una columna." #: libraries/normalization.lib.php:381 #, php-format @@ -9672,11 +9677,13 @@ msgid "" "In order to put the original table '%1$s' into Second normal form we need to " "create the following tables:" msgstr "" +"Per tal de convertir la taula original '%1$s' a la segona forma normal " +"necessitem crear les següents taules:" #: libraries/normalization.lib.php:417 #, php-format msgid "The second step of normalization is complete for table '%1$s'." -msgstr "" +msgstr "S'ha completat el segon pas de normalització per a la taula '%1$s'." #: libraries/normalization.lib.php:457 libraries/normalization.lib.php:600 #: libraries/normalization.lib.php:663 @@ -9690,10 +9697,12 @@ msgid "" "In order to put the original table '%1$s' into Third normal form we need to " "create the following tables:" msgstr "" +"Per tal de convertir la taula original '%1$s' a la tercera forma normal " +"necessitem crear les següents taules:" #: libraries/normalization.lib.php:548 msgid "The third step of normalization is complete." -msgstr "" +msgstr "S'ha completat el tercer pas de normalització." #: libraries/normalization.lib.php:642 #, php-format @@ -9708,7 +9717,7 @@ msgstr "Pas 3." #: libraries/normalization.lib.php:689 msgid "Find transitive dependencies" -msgstr "" +msgstr "Cercar dependències transitives" #: libraries/normalization.lib.php:696 msgid "" @@ -9717,16 +9726,22 @@ msgid "" "value of the column.
Note: A column may have no transitive dependency, " "in that case you don't have to select any." msgstr "" +"Per a cada una de les columnes a sota, selecciona el conjunt mínim de " +"columnes entre les que els seus valors combinats junts són suficients per a " +"determinar el valor de la columna.
Nota: Una columna pot no tenir " +"dependències transitives, en aquest cas no tens que seleccionar cap." #: libraries/normalization.lib.php:743 msgid "" "No Transitive dependencies possible as the table doesn't have any non " "primary key columns" msgstr "" +"No hi ha dependències transitives possibles ja que la taula no té cap " +"columna que no pertany a una clau principal" #: libraries/normalization.lib.php:747 msgid "Table is already in Third normal form!" -msgstr "" +msgstr "La taula ja es troba en tercera forma normal!" #: libraries/normalization.lib.php:770 #| msgid "Hide table structure actions" @@ -9735,31 +9750,35 @@ msgstr "Millorar l'estructura de taula (Normalització):" #: libraries/normalization.lib.php:771 msgid "Select up to what step you want to normalize" -msgstr "" +msgstr "Selecciona fins a quin pas vols normalitzar" #: libraries/normalization.lib.php:774 msgid "Second step of normalization (1NF+2NF)" -msgstr "" +msgstr "Segon pas de normalització (1NF+2NF)" #: libraries/normalization.lib.php:775 msgid "Third step of normalization (1NF+2NF+3NF)" -msgstr "" +msgstr "Tercer pas de normalització (1NF+2NF+3NF)" #: libraries/normalization.lib.php:782 msgid "" "Hint: Please follow the procedure carefully in order to obtain correct " "normalization" msgstr "" +"Consell: Segueix el procediment amb molta cura per obtenir una normalització " +"correcta" #: libraries/normalization.lib.php:843 msgid "" "This list is based on a subset of the table's data and is not necessarily " "accurate. " msgstr "" +"Aquesta llista està basada en un subconjunt de les dades de la taula i no és " +"necessàriament acurada. " #: libraries/normalization.lib.php:859 msgid "No partial dependencies found!" -msgstr "" +msgstr "No s'han trobat dependències parcials!" #: libraries/operations.lib.php:75 #| msgid "Rename database to" @@ -10015,7 +10034,7 @@ msgstr "" #: libraries/plugins/auth/AuthenticationConfig.class.php:164 msgid "Retry to connect" -msgstr "" +msgstr "Reintentar connexió" #: libraries/plugins/auth/AuthenticationCookie.class.php:146 msgid "Your session has expired. Please log in again." @@ -10041,11 +10060,11 @@ msgstr "Elecció de Servidor:" #: libraries/plugins/auth/AuthenticationCookie.class.php:354 msgid "Entered captcha is wrong, try again!" -msgstr "" +msgstr "El captcha entrat és incorrecte, intenta de nou!" #: libraries/plugins/auth/AuthenticationCookie.class.php:364 msgid "Please enter correct captcha!" -msgstr "" +msgstr "Entra el captcha correcte!" #: libraries/plugins/auth/AuthenticationCookie.class.php:422 #| msgid "Cannot log in to the MySQL server" @@ -10423,22 +10442,22 @@ msgstr "" #: libraries/plugins/export/ExportSql.class.php:511 msgid "It appears your database uses procedures;" -msgstr "" +msgstr "Sembla que la teva base de dades fa servir procediments;" #: libraries/plugins/export/ExportSql.class.php:515 #: libraries/plugins/export/ExportSql.class.php:551 #: libraries/plugins/export/ExportSql.class.php:1260 #: libraries/plugins/export/ExportSql.class.php:1798 msgid "alias export may not work reliably in all cases." -msgstr "" +msgstr "exportar els àlies podria no funcionar correctament en tots els casos." #: libraries/plugins/export/ExportSql.class.php:548 msgid "It appears your database uses functions;" -msgstr "" +msgstr "Sembla que la teva base de dades fa servir funcions;" #: libraries/plugins/export/ExportSql.class.php:1257 msgid "It appears your database uses views;" -msgstr "" +msgstr "Sembla que la teva base de dades fa servir vistes;" #: libraries/plugins/export/ExportSql.class.php:1302 msgid "Constraints for dumped tables" @@ -10478,7 +10497,7 @@ msgstr "RELACIONS DE LA TAULA" #: libraries/plugins/export/ExportSql.class.php:1795 msgid "It appears your table uses triggers;" -msgstr "" +msgstr "Sembla que la teva base de dades fa servir disparadors (-triggers-);" #: libraries/plugins/export/ExportSql.class.php:1827 #, php-format @@ -10657,7 +10676,7 @@ msgstr "Orientació" #: libraries/plugins/schema/SchemaPdf.class.php:67 #: libraries/plugins/schema/SchemaSvg.class.php:66 msgid "Same width for all tables" -msgstr "" +msgstr "El mateix ample per a totes les taules" #: libraries/plugins/schema/SchemaPdf.class.php:89 msgid "Show grid" @@ -10714,6 +10733,9 @@ msgid "" "Converts Boolean values to text (default 'T' and 'F'). First option is for " "TRUE, second for FALSE. Nonzero=true." msgstr "" +"Converteix els valors booleans a text (per defecte 'T' i 'F'). La primera " +"opció es per a -TRUE- (cert) i la segona per a -FALSE- (fals). Diferent de " +"zero = cert." #: libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php:31 msgid "" @@ -10809,10 +10831,13 @@ msgid "" "Image upload functionality which also displays a thumbnail. The options are " "the width and height of the thumbnail in pixels. Defaults to 100 X 100." msgstr "" +"Funcionalitat per a pujar imatges que també mostra miniatures. Les opcions " +"són l'amplada i l'alçada de la miniatura en píxels. El valor per defecte és " +"de 100 X 100." #: libraries/plugins/transformations/abstract/ImageUploadTransformationsPlugin.class.php:79 msgid "Image preview here" -msgstr "" +msgstr "Previsualització de l'imatge" #: libraries/plugins/transformations/abstract/InlineTransformationsPlugin.class.php:33 msgid "" @@ -10848,11 +10873,13 @@ msgid "" "Validates the string using regular expression and performs insert only if " "string matches it. The first option is the Regular Expression." msgstr "" +"Valida la cadena usant expressions regulars i només insereix si el valor " +"coincideix. La primera opció és l'expressió regular." #: libraries/plugins/transformations/abstract/RegexValidationTransformationsPlugin.class.php:55 #, php-format msgid "Validation failed for the input string %s." -msgstr "" +msgstr "Ha fallat la validació de la cadena d'entrada %s." #: libraries/plugins/transformations/abstract/SQLTransformationsPlugin.class.php:31 msgid "Formats text as SQL query with syntax highlighting." @@ -10877,6 +10904,8 @@ msgid "" "File upload functionality for TEXT columns. It does not have a textarea for " "input." msgstr "" +"Funcionalitat per a pujar arxius a columnes TEXT. No té un àrea de text per " +"entrar o editar." #: libraries/plugins/transformations/abstract/TextImageLinkTransformationsPlugin.class.php:33 msgid "" @@ -10899,15 +10928,15 @@ msgstr "" #: libraries/plugins/transformations/input/Text_Plain_JsonEditor.class.php:33 msgid "Syntax highlighted CodeMirror editor for JSON." -msgstr "" +msgstr "Ressaltat de sintaxi de l'editor CodeMirror per a JSON." #: libraries/plugins/transformations/input/Text_Plain_SqlEditor.class.php:33 msgid "Syntax highlighted CodeMirror editor for SQL." -msgstr "" +msgstr "Ressaltat de sintaxi de l'editor CodeMirror per a SQL." #: libraries/plugins/transformations/input/Text_Plain_XmlEditor.class.php:33 msgid "Syntax highlighted CodeMirror editor for XML (and HTML)." -msgstr "" +msgstr "Ressaltat de sintaxi de l'editor CodeMirror per a XML (i HTML)." #: libraries/plugins/transformations/output/Text_Plain_Json.class.php:40 #| msgid "Formats text as SQL query with syntax highlighting." From 42afa53f32fbb49b0404be8f257f1ee287775db7 Mon Sep 17 00:00:00 2001 From: Xavier Navarro Date: Wed, 18 Mar 2015 06:47:33 +0100 Subject: [PATCH 2/7] Translated using Weblate (Catalan) Currently translated at 100.0% (3032 of 3032 strings) [CI skip] --- po/ca.po | 57 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/po/ca.po b/po/ca.po index cee61e9200..778ee448db 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.0-alpha1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-03-06 08:15-0500\n" -"PO-Revision-Date: 2015-03-17 18:45+0200\n" +"PO-Revision-Date: 2015-03-18 06:47+0200\n" "Last-Translator: Xavier Navarro \n" "Language-Team: Catalan " "\n" @@ -10964,7 +10964,7 @@ msgstr "Error: La relació de CLAU EXTERNA no s'ha afegit!" #: libraries/pmd_common.php:548 msgid "Error: Missing index on column(s)." -msgstr "" +msgstr "Error. Índex no trobat en columna (es)." #: libraries/pmd_common.php:552 #| msgid "Error: Relation not added." @@ -11083,11 +11083,11 @@ msgstr "Amaga/mostra els elements de navegació" #: libraries/relation.lib.php:298 msgid "Saving Query-By-Example searches" -msgstr "" +msgstr "Desant cerques de Consulta-Per-Exemple" #: libraries/relation.lib.php:309 msgid "Managing Central list of columns" -msgstr "" +msgstr "Gestió de la llista central de columnes" #: libraries/relation.lib.php:317 msgid "Quick steps to setup advanced features:" @@ -11467,7 +11467,7 @@ msgstr "Error en reiniciar la replicació." #: libraries/replication_gui.lib.php:935 msgid "Success." -msgstr "" +msgstr "Correcte." #: libraries/replication_gui.lib.php:936 #| msgid "Error" @@ -11906,7 +11906,7 @@ msgstr "No hi ha esdeveniments per mostrar." #: libraries/select_lang.lib.php:613 msgid "Ignoring unsupported language code." -msgstr "" +msgstr "Ignorant codi d'idioma no suportat." #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:46 #| msgid "Current Server" @@ -12189,7 +12189,7 @@ msgstr "Cap" #: libraries/server_privileges.lib.php:3206 #: libraries/server_user_groups.lib.php:78 msgid "User group" -msgstr "" +msgstr "Grup d'usuari" #: libraries/server_privileges.lib.php:726 #: libraries/server_privileges.lib.php:837 @@ -12199,26 +12199,29 @@ msgstr "Requereix de connexions xifrades amb SSL." #: libraries/server_privileges.lib.php:734 msgid "Require SSL" -msgstr "" +msgstr "Es requereix SSL" #: libraries/server_privileges.lib.php:759 #: libraries/server_privileges.lib.php:768 msgid "Requires that a specific cipher method be used for a connection." -msgstr "" +msgstr "Es requereix l'ús d'un mètode de xifratge específic per a la connexió." #: libraries/server_privileges.lib.php:778 #: libraries/server_privileges.lib.php:787 msgid "Requires that a valid X509 certificate issued by this CA be presented." msgstr "" +"Es requereix l'ús d'un certificat X509 vàlid emés per aquesta CA (Autoritat " +"de Certificació)." #: libraries/server_privileges.lib.php:797 #: libraries/server_privileges.lib.php:806 msgid "Requires that a valid X509 certificate with this subject be presented." msgstr "" +"Es requereix que es presenti un certificat X509 vàlid amb aquest subjecte." #: libraries/server_privileges.lib.php:818 msgid "Requires a valid X509 cetrificate." -msgstr "" +msgstr "Requereix un certificat X509 vàlid." #: libraries/server_privileges.lib.php:867 msgid "Resource limits" @@ -12317,6 +12320,8 @@ msgid "" "An account already exists with the same username but possibly a different " "hostname." msgstr "" +"Ja existeix un compte amb el mateix nom d'usuari però possiblement amb nom " +"de servidor diferent." #: libraries/server_privileges.lib.php:1663 msgid "Do not change the password" @@ -12381,7 +12386,7 @@ msgstr "Atorga" #: libraries/server_privileges.lib.php:2262 msgid "Not enough privilege to view users." -msgstr "" +msgstr "Permisos insuficients per veure usuaris." #: libraries/server_privileges.lib.php:2282 #: libraries/server_privileges.lib.php:3655 @@ -12537,6 +12542,8 @@ msgid "" "Note: You are attempting to edit privileges of the user with which you are " "currently logged in." msgstr "" +"Nota: estàs intentant editar els permisos de l'usuari amb el que has iniciat " +"la sessió actual." #: libraries/server_privileges.lib.php:4159 libraries/server_users.lib.php:25 msgid "Users overview" @@ -13631,11 +13638,11 @@ msgstr "El nombre de fils que no estàn dormint." #: libraries/server_user_groups.lib.php:23 #, php-format msgid "Users of '%s' user group" -msgstr "" +msgstr "Usuaris del grup d'usuaris '%s'" #: libraries/server_user_groups.lib.php:35 msgid "No users were found belonging to this user group." -msgstr "" +msgstr "No s'han trobat usuaris que pertanyin a aquest grup." #: libraries/server_user_groups.lib.php:64 libraries/server_users.lib.php:33 #| msgid "Users" @@ -13671,7 +13678,7 @@ msgstr "Afegir grup d'usuaris" #: libraries/server_user_groups.lib.php:212 #, php-format msgid "Edit user group: '%s'" -msgstr "" +msgstr "Editar grup d'usuaris: '%s'" #: libraries/server_user_groups.lib.php:228 #| msgid "No privileges." @@ -13738,7 +13745,7 @@ msgstr "Estat" #: libraries/sql.lib.php:351 msgid "Summary by state" -msgstr "" +msgstr "Resum per estat" #: libraries/sql.lib.php:357 #| msgid "Total time:" @@ -13816,7 +13823,7 @@ msgstr "Executa consulta/s SQL a la Base de Dades %s" #: libraries/sql_query_form.lib.php:240 msgid "Get auto-saved query" -msgstr "" +msgstr "Obtenir consulta auto desada" #: libraries/sql_query_form.lib.php:284 #| msgid "Bookmark this SQL query" @@ -13837,7 +13844,7 @@ msgstr "Mostra aquesta consulta de nou" #: libraries/sql_query_form.lib.php:333 msgid "Rollback when finished" -msgstr "" +msgstr "Desfer (-rollback-) al acabar" #: libraries/sql_query_form.lib.php:386 msgid "View only" @@ -13960,7 +13967,7 @@ msgstr "Afegir columnes a la llista central" #: libraries/structure.lib.php:351 msgid "Remove columns from central list" -msgstr "" +msgstr "Eliminar columnes de la llista central" #: libraries/structure.lib.php:353 #| msgid "CHAR textarea columns" @@ -14201,7 +14208,7 @@ msgstr "Línia temporal" #: libraries/tbl_chart.lib.php:64 msgctxt "Chart type" msgid "Scatter" -msgstr "" +msgstr "Dispersió" #: libraries/tbl_chart.lib.php:82 msgid "Stacked" @@ -14229,7 +14236,7 @@ msgstr "Etiqueta de l'eix Y:" #: libraries/tbl_chart.lib.php:237 msgid "Series names are in a column" -msgstr "" +msgstr "Els noms de les series hi són en una columna" #: libraries/tbl_chart.lib.php:240 #| msgid "Inside column:" @@ -14364,7 +14371,7 @@ msgstr "primer" #: libraries/tbl_columns_definition_form.lib.php:1099 msgid "Edit ENUM/SET values" -msgstr "" +msgstr "Editar valors ENUM/SET" #: libraries/tbl_columns_definition_form.lib.php:1124 msgctxt "for default" @@ -14425,7 +14432,7 @@ msgstr "Tria de l'índex:" #: libraries/tbl_indexes.lib.php:321 msgid "Key block size:" -msgstr "" +msgstr "Mida del bloc de clau:" #: libraries/tbl_indexes.lib.php:333 msgid "Index type:" @@ -14494,7 +14501,7 @@ msgstr "Propietats de la restricció" #: libraries/tbl_relation.lib.php:376 msgid "" "Only columns with index will be displayed. You can define an index below." -msgstr "" +msgstr "Només es mostraran columnes amb índex. Pots definir un índex a sota." #: libraries/tbl_relation.lib.php:381 msgid "Foreign key constraint" @@ -14820,7 +14827,7 @@ msgstr "Veure volcat (esquema) de les bases de dades" #: server_privileges.php:141 msgid "Username and hostname didn't change." -msgstr "" +msgstr "El nom d'usuari i de servidor no s'han canviat." #: server_status_processes.php:36 #, php-format @@ -15044,7 +15051,7 @@ msgstr "Nom de taula incorrecte" #: tbl_replace.php:236 #, php-format msgid "Row: %1$s, Column: %2$s, Error: %3$s" -msgstr "" +msgstr "Fila: %1$s, Columna: %2$s, Error: %3$s" #: tbl_structure.php:63 #, php-format From 24db9d5cded1a2083da19d464a80e7784001773d Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 18 Mar 2015 12:03:43 +0530 Subject: [PATCH 3/7] Set row span when there are more privileges Signed-off-by: Madhura Jayaratne --- libraries/server_privileges.lib.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 6289958226..c056f8e4e6 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -2293,8 +2293,12 @@ function PMA_getHtmlTableBodyForSpecificDbOrTablePrivs($privMap, $db) . ($odd_row ? 'odd' : 'even') . '">'; $value = htmlspecialchars($current_user . '' . $current_host); - $html_output .= '' - . ' 1) { + $html_output .= ' rowspan="' . $nbPrivileges . '"'; + } + $html_output .= '>'; + $html_output .= '' . "\n"; From c27d16f95f566d92bc70a640eb007f0adb27e808 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 18 Mar 2015 12:05:26 +0530 Subject: [PATCH 4/7] Starts with a odd row Signed-off-by: Madhura Jayaratne --- db_central_columns.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db_central_columns.php b/db_central_columns.php index 453326dd39..997cffca18 100644 --- a/db_central_columns.php +++ b/db_central_columns.php @@ -114,7 +114,7 @@ $tableheader = PMA_getCentralColumnsTableHeader( ); $response->addHTML($tableheader); $result = PMA_getColumnsList($db, $pos, $max_rows); -$odd_row = false; +$odd_row = true; $row_num=0; foreach ($result as $row) { $tableHtmlRow = PMA_getHTMLforCentralColumnsTableRow( From 21302c235e0f70a92d1d780fae2125c40aa7934c Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 18 Mar 2015 13:04:56 +0530 Subject: [PATCH 5/7] Add a class for bitT column Signed-off-by: Madhura Jayaratne --- js/sql.js | 2 +- libraries/DisplayResults.class.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/js/sql.js b/js/sql.js index e57792883d..aa4e1474b9 100644 --- a/js/sql.js +++ b/js/sql.js @@ -582,7 +582,7 @@ function PMA_changeClassForColumn($this_th, newclass, isAddClass) { // index 0 is the th containing the big T var th_index = $this_th.index(); - var has_big_t = !$this_th.closest('tr').children(':first').hasClass('column_heading'); + var has_big_t = $this_th.closest('tr').children(':first').hasClass('column_action'); // .eq() is zero-based if (has_big_t) { th_index--; diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index cc3f382847..1c2d0acd56 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -1429,7 +1429,7 @@ class PMA_DisplayResults = (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE) && ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 0; - $button_html .= '' + $button_html .= '' . $full_or_partial_text_link . ''; } elseif ((($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_LEFT) @@ -1448,7 +1448,7 @@ class PMA_DisplayResults } elseif (($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_NONE)) { // ... elseif display an empty column if the actions links are // disabled to match the rest of the table - $button_html .= ''; + $button_html .= ''; } $this->__set('vertical_display', $vertical_display); @@ -2200,7 +2200,7 @@ class PMA_DisplayResults * column header's alignment right * * @param array $fields_meta set of field properties - * @param array &$th_class array containing classes + * @param array &$th_class array containing classes * * @return void * @@ -2345,7 +2345,7 @@ class PMA_DisplayResults && ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 1; $right_column_html .= "\n" - . '' . $full_or_partial_text_link + . '' . $full_or_partial_text_link . ''; } elseif ((($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_LEFT) From 592a6ef5b8cd5d452fb53edcc08afc9e77db5f2c Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 18 Mar 2015 13:05:52 +0530 Subject: [PATCH 6/7] Remove dead code Signed-off-by: Madhura Jayaratne --- js/db_central_columns.js | 1 - 1 file changed, 1 deletion(-) diff --git a/js/db_central_columns.js b/js/db_central_columns.js index d7f687f362..64ba96e850 100644 --- a/js/db_central_columns.js +++ b/js/db_central_columns.js @@ -22,7 +22,6 @@ AJAX.registerTeardown('db_central_columns.js', function () { $(".del_row").unbind('click'); $(document).off("keyup", ".filter_rows"); $('.edit_cancel_form').unbind('click'); - $('.column_heading').unbind('mouseenter'); $('#table-select').unbind('change'); $('#column-select').unbind('change'); $("#add_col_div>a").unbind('click'); From b678749e7c2d1adf0bb620e6bb57996b6591238f Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 18 Mar 2015 13:09:42 +0530 Subject: [PATCH 7/7] Add a class for styling Signed-off-by: Madhura Jayaratne --- libraries/central_columns.lib.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php index cb053cd245..030e7c7719 100644 --- a/libraries/central_columns.lib.php +++ b/libraries/central_columns.lib.php @@ -641,7 +641,8 @@ function PMA_getCentralColumnsTableHeader($class='', $title='', $actionCount=0) { $action = ''; if ($actionCount > 0) { - $action .= '' . __('Action') . ''; + $action .= '' + . __('Action') . ''; } $tableheader = ''; $tableheader .= ''