From 3a7e5539885cc60f5549ea31301561af071da134 Mon Sep 17 00:00:00 2001 From: Domen Date: Fri, 27 Jul 2012 12:49:24 +0200 Subject: [PATCH 01/19] Translated using Weblate. --- po/sl.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/sl.po b/po/sl.po index ac919a30e3..515f42f3f3 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-27 10:40+0200\n" -"PO-Revision-Date: 2012-06-29 18:51+0200\n" +"PO-Revision-Date: 2012-07-27 12:49+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" "X-Generator: Weblate 1.1\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354 @@ -7662,10 +7662,9 @@ msgstr "" "tabel, tvorjenih s posebnimi znaki ali ključnimi besedami)" #: libraries/plugins/export/ExportSql.class.php:354 -#, fuzzy #| msgid "Object creation options" msgid "Data creation options" -msgstr "Možnosti ustvarjanja objektov" +msgstr "Možnosti ustvarjanja podatkov" #: libraries/plugins/export/ExportSql.class.php:358 #: libraries/plugins/export/ExportSql.class.php:1573 From f8626b59e1e11662ad84489a5aa51cbf524b0c22 Mon Sep 17 00:00:00 2001 From: Victor Volkov Date: Fri, 27 Jul 2012 17:27:17 +0200 Subject: [PATCH 02/19] Translated using Weblate. --- po/ru.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/ru.po b/po/ru.po index 1ccca8eb1f..152b316321 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-27 10:40+0200\n" -"PO-Revision-Date: 2012-06-29 18:49+0200\n" +"PO-Revision-Date: 2012-07-27 17:27+0200\n" "Last-Translator: Victor Volkov \n" "Language-Team: russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Weblate 1.1\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354 @@ -7711,10 +7711,9 @@ msgstr "" "и полей содержащих специальные символы или зарезервированные слова)" #: libraries/plugins/export/ExportSql.class.php:354 -#, fuzzy #| msgid "Object creation options" msgid "Data creation options" -msgstr "Параметры создания объектов" +msgstr "Параметры создания данных" #: libraries/plugins/export/ExportSql.class.php:358 #: libraries/plugins/export/ExportSql.class.php:1573 From 2f9d7db9fc6931c97a3ac903e08a99ac2b537fbb Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 27 Jul 2012 17:50:58 +0200 Subject: [PATCH 03/19] Translated using Weblate. --- po/tr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index 79179653d6..604788fa14 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-27 10:40+0200\n" -"PO-Revision-Date: 2012-07-26 02:11+0200\n" +"PO-Revision-Date: 2012-07-27 17:50+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -7680,10 +7680,9 @@ msgstr "" "kelimelerle şekillendirilmiş sütun ve tablo adlarını korur)" #: libraries/plugins/export/ExportSql.class.php:354 -#, fuzzy #| msgid "Object creation options" msgid "Data creation options" -msgstr "Nesne oluşturma seçenekleri" +msgstr "Veri oluşturma seçenekleri" #: libraries/plugins/export/ExportSql.class.php:358 #: libraries/plugins/export/ExportSql.class.php:1573 From f3e959c523f78a5a30708ea056ad0d0c7ed70127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 27 Jul 2012 18:07:27 +0200 Subject: [PATCH 04/19] Translated using Weblate. --- po/es.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/es.po b/po/es.po index 10421d71a3..9f8aed92e1 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-27 10:40+0200\n" -"PO-Revision-Date: 2012-07-09 17:51+0200\n" +"PO-Revision-Date: 2012-07-27 18:07+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -7772,10 +7772,9 @@ msgstr "" "clave)" #: libraries/plugins/export/ExportSql.class.php:354 -#, fuzzy #| msgid "Object creation options" msgid "Data creation options" -msgstr "Opciones de creación de objetos" +msgstr "Opciones de creación de datos" #: libraries/plugins/export/ExportSql.class.php:358 #: libraries/plugins/export/ExportSql.class.php:1573 From 7b0b4482d807a4f46064f3fe82c7a93df079e0ff Mon Sep 17 00:00:00 2001 From: Yasitha Pandithawatta Date: Sat, 28 Jul 2012 00:00:10 +0530 Subject: [PATCH 05/19] Add test class for DbSearch.class.php --- test/classes/PMA_DbSearch_test.php | 189 +++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) create mode 100644 test/classes/PMA_DbSearch_test.php diff --git a/test/classes/PMA_DbSearch_test.php b/test/classes/PMA_DbSearch_test.php new file mode 100644 index 0000000000..5072b6fe77 --- /dev/null +++ b/test/classes/PMA_DbSearch_test.php @@ -0,0 +1,189 @@ +object = $this->getMockForAbstractClass('PMA_DbSearch', array('pma')); + } + + /** + * Tears down the fixture, for example, closes a network connection. + * This method is called after a test is executed. + * + * @access protected + * @return void + */ + protected function tearDown() + { + unset($this->object); + } + + /** + * Call protected functions by making the visibitlity to public. + * + * @param string $name method name + * @param array $params parameters for the invocation + * + * @return the output from the protected method. + */ + private function _callProtectedFunction($name, $params) + { + $class = new ReflectionClass('PMA_DbSearch'); + $method = $class->getMethod($name); + $method->setAccessible(true); + return $method->invokeArgs($this->object, $params); + } + + /** + * Test for getCommonFunctions + */ + public function testGetCommonFunctions(){ + $this->assertTrue($this->object->getCommonFunctions() instanceof PMA_CommonFunctions); + } + + /** + * Test for _getSearchSqls + */ + public function testGetSearchSqls(){ + + $GLOBALS['db'] = 'pma'; + if (! function_exists('PMA_DBI_get_columns')) { + function PMA_DBI_get_columns() + { + return array( + 'column1', + 'column2' + ); + } + } + + $this->assertEquals( + $this->_callProtectedFunction( + '_getSearchSqls', + array('table1') + ), + array ( + 'select_columns' => 'SELECT * FROM `pma`.`table1` WHERE FALSE', + 'select_count' => 'SELECT COUNT(*) AS `count` FROM `pma`.`table1` WHERE FALSE', + 'delete' => 'DELETE FROM `pma`.`table1` WHERE FALSE' + ) + ); + } + + /** + * Test for getSearchResults + */ + public function testGetSearchResults(){ + $this->assertEquals( + $this->object->getSearchResults(), + '
Search results for "" :
' + ); + } + + /** + * Test for _getResultsRow + * @param string $each_table Tables on which search is to be performed + * @param array $newsearchsqls Contains SQL queries + * @param bool $odd_row For displaying contrasting table rows + * @param $output + * + * @dataProvider providerForTestGetResultsRow + */ + public function testGetResultsRow($each_table, $newsearchsqls, $odd_row, $output){ + + if (! function_exists('PMA_DBI_fetch_value')) { + function PMA_DBI_fetch_value() + { + return 2; + } + } + $GLOBALS['cfg']['AjaxEnable'] = true; + $this->assertEquals( + $this->_callProtectedFunction( + '_getResultsRow', + array($each_table, $newsearchsqls, $odd_row) + ), + $output + ); + } + + /** + * @return array provider for testGetResultsRow + */ + public function providerForTestGetResultsRow(){ + return array( + array( + 'table1', + array( + 'SELECT * FROM `pma`.`table1` WHERE FALSE', + 'SELECT COUNT(*) AS `count` FROM `pma`.`table1` WHERE FALSE', + 'select_count' => 2, + 'select_columns' => 'column1', + 'delete' => 'column2' + ), + true, + '2 matches in table1BrowseDelete' + ) + ); + } + + /** + * Test for getSelectionForm + */ + public function testGetSelectionForm(){ + $_SESSION[' PMA_token '] = 'token'; + $_SESSION['PMA_Theme'] = new PMA_Theme(); + $GLOBALS['pmaThemeImage'] = 'themes/dot.gif'; + $url_params = array('param1', 'param2'); + $this->assertEquals( + $this->object->getSelectionForm($url_params), + '
Search in database
Words or values to search for (wildcard: "%"):
Find: +
+ +
+ +
+ +
+
Inside tables:
Select All  / Unselect All
Inside column:

' + ); + } +} From 42f011fc840cc042ae49f82342b2e5f3495bc148 Mon Sep 17 00:00:00 2001 From: Xavier Navarro Date: Sat, 28 Jul 2012 08:37:23 +0200 Subject: [PATCH 06/19] Translated using Weblate. --- po/ca.po | 186 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 141 insertions(+), 45 deletions(-) diff --git a/po/ca.po b/po/ca.po index 57576e0b8b..6df63c41e2 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-27 10:40+0200\n" -"PO-Revision-Date: 2012-07-26 17:20+0200\n" +"PO-Revision-Date: 2012-07-27 16:04+0200\n" "Last-Translator: Xavier Navarro \n" "Language-Team: catalan \n" "Language: ca\n" @@ -3266,7 +3266,7 @@ msgstr "Ordre del llistat:" #: libraries/TableSearch.class.php:856 msgid "Use this column to label each point" -msgstr "" +msgstr "Utilitza aquesta columna per etiquetar cada punt" #: libraries/TableSearch.class.php:877 msgid "Maximum rows to plot" @@ -3293,7 +3293,7 @@ msgstr "Fer una \"petició segons exemple\" (comodí: \"%\")" #: libraries/TableSearch.class.php:1198 msgid "Browse/Edit the points" -msgstr "" +msgstr "Veure/editar els punts" #: libraries/TableSearch.class.php:1205 msgid "How to use" @@ -10474,6 +10474,8 @@ msgid "" "The Advisor system can provide recommendations on server variables by " "analyzing the server status variables." msgstr "" +"El sistema de consells pot proporcionar recomanacions sobre les variables " +"del servidor mitjançant l'anàlisi de les variables d'estat del servidor." #: server_status.php:930 msgid "" @@ -10481,6 +10483,9 @@ msgid "" "calculations and by rule of thumb which may not necessarily apply to your " "system." msgstr "" +"Tingues en compte però que aquest sistema ofereix recomanacions basades en " +"càlculs senzills i regles generals que no necessàriament s'apliquen al seu " +"sistema." #: server_status.php:932 msgid "" @@ -10488,6 +10493,10 @@ msgid "" "changing (by reading the documentation) and how to undo the change. Wrong " "tuning can have a very negative effect on performance." msgstr "" +"Abans de canviar qualsevol configuració, assegura't de saber què estàs " +"canviant (mitjançant la lectura de la documentació) i cóm desfer el canvi. " +"Establir ajustaments incorrectes pot tenir un efecte molt negatiu en el " +"rendiment." #: server_status.php:934 msgid "" @@ -10495,6 +10504,9 @@ msgid "" "time, observe or benchmark your database, and undo the change if there was " "no clearly measurable improvement." msgstr "" +"La millor manera d'ajustar el sistema seria canviar només una configuració " +"al mateix temps, observar o mesurar la teva base de dades, i desfer el canvi " +"si no hi ha una millora clarament mesurable." #. l10n: Questions is the name of a MySQL Status variable #: server_status.php:957 @@ -11345,6 +11357,11 @@ msgid "" "enabled. Note however, that the general_log produces a lot of data and " "increases server load by up to 15%" msgstr "" +"El monitor de phpMyAdmin pot ajudar a optimitzar la configuració del " +"servidor i localitzar a temps les consultes intensives. En aquest darrer cas " +"s'haurà d'establir log_output a 'TABLE' i tenir el slow_query_log o " +"general_log habilitat. Noteu però, que la general_log produeix una gran " +"quantitat de dades i augmenta la càrrega del servidor fins en un 15%" #: server_status.php:1689 msgid "" @@ -11353,10 +11370,15 @@ msgid "" "table is supported by MySQL 5.1.6 and onwards. You may still use the server " "charting features however." msgstr "" +"Lamentablement, el teu servidor de bases de dades no és compatible amb el " +"registre a la taula, que és un requisit per a l'anàlisi dels registres de " +"base de dades amb phpMyAdmin. El registre a la taula se suporta a partir de " +"MySQL 5.1.6 i següents. Pots seguir utilitzant però les funcions de gràfics " +"de servidor." #: server_status.php:1702 msgid "Using the monitor:" -msgstr "" +msgstr "Utilitzant el monitor:" #: server_status.php:1704 msgid "" @@ -11364,6 +11386,10 @@ msgid "" "may add charts and change the refresh rate under 'Settings', or remove any " "chart using the cog icon on each respective chart." msgstr "" +"El teu navegador actualitzarà tots els gràfics que es mostren en un interval " +"regular. Pots afegir gràfics i canviar la freqüència d'actualització a la " +"secció 'Configuració', o eliminar qualsevol gràfic amb la icona d'engranatge " +"en cada gràfic corresponent." #: server_status.php:1706 msgid "" @@ -11372,10 +11398,15 @@ msgid "" "confirmed, this will load a table of grouped queries, there you may click on " "any occuring SELECT statements to further analyze them." msgstr "" +"Per mostrar les consultes dels registres, selecciona l'interval de temps " +"rellevant en qualsevol gràfic mantenint premut el botó esquerre del ratolí i " +"arrosegant sobre el gràfic. Un cop confirmat, això carregarà una taula de " +"consultes agrupades, on podràs clicar en qualsevol de les instruccions " +"SELECT per analitzar-la amb més detall." #: server_status.php:1713 msgid "Please note:" -msgstr "" +msgstr "Tingueu en compte:" #: server_status.php:1715 msgid "" @@ -11384,6 +11415,11 @@ msgid "" "it is advisable to select only a small time span and to disable the " "general_log and empty its table once monitoring is not required any more." msgstr "" +"Activar el general_log pot augmentar la càrrega del servidor en un 5-15%. " +"També tingues en compte que la generació d'estadístiques dels registres és " +"una tasca de càrrega intensiva, pel que és aconsellable seleccionar només un " +"lapse de temps petit i per desactivar el general_log i buidar la taula una " +"vegada que el monitoratge no es requereixi més." #: server_status.php:1729 msgid "Preset chart" @@ -11399,7 +11435,7 @@ msgstr "Seleccionar series:" #: server_status.php:1737 msgid "Commonly monitored" -msgstr "" +msgstr "Comunment monitoritzat" #: server_status.php:1752 msgid "or type variable name:" @@ -11407,15 +11443,15 @@ msgstr "o escriu el nom de variable:" #: server_status.php:1756 msgid "Display as differential value" -msgstr "" +msgstr "Mostra com a valor diferencial" #: server_status.php:1758 msgid "Apply a divisor" -msgstr "" +msgstr "Aplicar un divisor" #: server_status.php:1765 msgid "Append unit to data values" -msgstr "" +msgstr "Afegir unitat als valors" #: server_status.php:1771 msgid "Add this series" @@ -11423,7 +11459,7 @@ msgstr "Afegir aquesta serie" #: server_status.php:1773 msgid "Clear series" -msgstr "" +msgstr "Buidar sèrie" #: server_status.php:1776 msgid "Series in Chart:" @@ -11439,19 +11475,21 @@ msgstr "Rang de temps seleccionat:" #: server_status.php:1797 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements" -msgstr "" +msgstr "Només recuperar instruccions SELECT, INSERT, UPDATE i DELETE" #: server_status.php:1802 msgid "Remove variable data in INSERT statements for better grouping" msgstr "" +"Elimina dades variables en les instruccions INSERT per a una millor " +"agrupació" #: server_status.php:1807 msgid "Choose from which log you want the statistics to be generated from." -msgstr "" +msgstr "Tria de quin registre vols que es generin les estadístiques." #: server_status.php:1809 msgid "Results are grouped by query text." -msgstr "" +msgstr "Els resultats s'agrupen pel text de la consulta." #: server_status.php:1814 msgid "Query analyzer" @@ -11587,7 +11625,7 @@ msgstr "" #: server_variables.php:87 msgid "Setting variable failed" -msgstr "" +msgstr "Errada a la configuració de la variable" #: server_variables.php:100 msgid "Server variables and settings" @@ -11608,6 +11646,8 @@ msgstr "Descarrega" #: setup/frames/form.inc.php:25 msgid "Incorrect formset, check $formsets array in setup/frames/form.inc.php" msgstr "" +"Conjunt de formularis incorrecte, comprova l'array $formsets a l'arxiu " +"setup/frames/form.inc.php" #: setup/frames/index.inc.php:51 msgid "Cannot load or save configuration" @@ -11655,6 +11695,9 @@ msgid "" "Configuration saved to file config/config.inc.php in phpMyAdmin top level " "directory, copy it to top level one and delete directory config to use it." msgstr "" +"Configuració desada a l'arxiu config/config.inc.php dins el directori arrel " +"de phpMyAdmin, copia'l al nivell superior i elimina el directori de " +"configuració per utilitzar-lo." #: setup/frames/index.inc.php:107 setup/frames/menu.inc.php:16 msgid "Overview" @@ -11718,7 +11761,7 @@ msgstr "Afegir un nou servidor" #: setup/index.php:22 msgid "Wrong GET file attribute value" -msgstr "" +msgstr "Valor incorrecte d'atribut d'arxiu en GET" #: setup/lib/form_processing.lib.php:43 msgid "Warning" @@ -12016,7 +12059,7 @@ msgstr "Títol del gràfic" #: tbl_chart.php:106 msgid "X-Axis:" -msgstr "" +msgstr "Eix X:" #: tbl_chart.php:121 msgid "Series:" @@ -12278,7 +12321,7 @@ msgstr "Mida de fila" #: tbl_printview.php:406 tbl_structure.php:963 msgid "Next autoindex" -msgstr "" +msgstr "AUTOINDEX Següent" #: tbl_relation.php:281 #, php-format @@ -12304,7 +12347,7 @@ msgstr "Límit de clau externa" #: tbl_structure.php:154 tbl_structure.php:159 tbl_structure.php:601 msgid "Spatial" -msgstr "" +msgstr "Espacial" #: tbl_structure.php:161 tbl_structure.php:165 #, fuzzy @@ -12590,22 +12633,26 @@ msgstr "Reanomena la vista a" #: libraries/advisory_rules.txt:49 msgid "Uptime below one day" -msgstr "" +msgstr "Temps d'activitat per sota d'un dia" #: libraries/advisory_rules.txt:52 msgid "Uptime is less than 1 day, performance tuning may not be accurate." msgstr "" +"El temps d'activitat és inferior a 1 dia, l'optimització del rendiment pot " +"no ser exacta." #: libraries/advisory_rules.txt:53 msgid "" "To have more accurate averages it is recommended to let the server run for " "longer than a day before running this analyzer" msgstr "" +"Per tenir unes mitjanes més exactes, es recomana deixar que el servidor " +"funcioni durant més d'un dia abans d'executar aquest analitzador" #: libraries/advisory_rules.txt:54 #, php-format msgid "The uptime is only %s" -msgstr "" +msgstr "El temps d'activitat només és de %s" #: libraries/advisory_rules.txt:56 msgid "Questions below 1,000" @@ -12616,12 +12663,16 @@ msgid "" "Fewer than 1,000 questions have been run against this server. The " "recommendations may not be accurate." msgstr "" +"S'han fet menys de 1.000 consultes en aquest servidor. Les recomanacions " +"poden no ser exactes." #: libraries/advisory_rules.txt:60 msgid "" "Let the server run for a longer time until it has executed a greater amount " "of queries." msgstr "" +"Deixa que el servidor s'executi per més temps fins que s'hagi dut a terme " +"una major quantitat de consultes." #: libraries/advisory_rules.txt:61 #, php-format @@ -12636,17 +12687,22 @@ msgstr "Percentatge de consultes lentes" msgid "" "There is a lot of slow queries compared to the overall amount of Queries." msgstr "" +"Hi ha una gran quantitat de consultes lentes (slow-queries) en comparació " +"amb la quantitat total de consultes." #: libraries/advisory_rules.txt:67 libraries/advisory_rules.txt:74 msgid "" "You might want to increase {long_query_time} or optimize the queries listed " "in the slow query log" msgstr "" +"Podries augmentar la variable {long_query_time} o optimitzar les consultes " +"que figuren en el registre de consultes lentes" #: libraries/advisory_rules.txt:68 #, php-format msgid "The slow query rate should be below 5%%, your value is %s%%." msgstr "" +"La taxa de consultes lentes ha de ser inferior al 5%%, el teu valor és %s%%." #: libraries/advisory_rules.txt:70 msgid "Slow query rate" @@ -12656,6 +12712,8 @@ msgstr "Freqüència de consultes lentes" msgid "" "There is a high percentage of slow queries compared to the server uptime." msgstr "" +"Hi ha un alt percentatge de consultes lentes en comparació amb el temps " +"d'activitat del servidor." #: libraries/advisory_rules.txt:75 #, php-format @@ -12663,6 +12721,8 @@ msgid "" "You have a slow query rate of %s per hour, you should have less than 1%% per " "hour." msgstr "" +"Tens una taxa de consultes lentes de %s per hora, hauries de tenir menys de " +"l'1%% per hora." #: libraries/advisory_rules.txt:77 msgid "Long query time" @@ -12673,40 +12733,44 @@ msgid "" "long_query_time is set to 10 seconds or more, thus only slow queries that " "take above 10 seconds are logged." msgstr "" +"long_query_time s'estableix en 10 segons o més, per tant, només entrarà les " +"consultes lentes que triguin més de 10 segons." #: libraries/advisory_rules.txt:81 msgid "" "It is suggested to set {long_query_time} to a lower value, depending on your " "environment. Usually a value of 1-5 seconds is suggested." msgstr "" +"Es suggereix establir {long_query_time} a un valor inferior, depenent del " +"teu entorn. En general, es recomana un valor de 1-5 segons." #: libraries/advisory_rules.txt:82 -#, fuzzy, php-format +#, php-format #| msgid "long_query_time is set to %d second(s)." msgid "long_query_time is currently set to %ds." -msgstr "«long_query_time» està configurat a %d segon(s)." +msgstr "long_query_time està configurat a %ds." #: libraries/advisory_rules.txt:84 msgid "Slow query logging" msgstr "Registre de consultes lentes" #: libraries/advisory_rules.txt:87 -#, fuzzy #| msgid "slow_query_log is enabled." msgid "The slow query log is disabled." -msgstr "«slow_query_log» està actiu." +msgstr "El registre de consultes lentes està desactivat." #: libraries/advisory_rules.txt:88 msgid "" "Enable slow query logging by setting {log_slow_queries} to 'ON'. This will " "help troubleshooting badly performing queries." msgstr "" +"Habilita el registre de consultes lentes establint {log_slow_queries} a " +"'ON'. Això t'ajudarà a solucionar les consultes amb mal rendiment." #: libraries/advisory_rules.txt:89 -#, fuzzy #| msgid "long_query_time is set to %d second(s)." msgid "log_slow_queries is set to 'OFF'" -msgstr "«long_query_time» està configurat a %d segon(s)." +msgstr "log_slow_queries està a 'OFF'" #: libraries/advisory_rules.txt:93 msgid "Release Series" @@ -12714,13 +12778,15 @@ msgstr "Serie de versions" #: libraries/advisory_rules.txt:96 msgid "The MySQL server version less than 5.1." -msgstr "" +msgstr "La versió del servidor MySQL és inferior a 5.1." #: libraries/advisory_rules.txt:97 msgid "" "You should upgrade, as MySQL 5.1 has improved performance, and MySQL 5.5 " "even more so." msgstr "" +"Hauries d'actualitzar, ja que MySQL 5.1 té millor rendiment, i encara és " +"millor en MySQL 5.5." #: libraries/advisory_rules.txt:98 libraries/advisory_rules.txt:105 #: libraries/advisory_rules.txt:112 @@ -12734,17 +12800,19 @@ msgstr "Versió menor" #: libraries/advisory_rules.txt:103 msgid "Version less than 5.1.30 (the first GA release of 5.1)." -msgstr "" +msgstr "Versió inferior a 5.1.30 (la primera versió disponible pública de 5.1)." #: libraries/advisory_rules.txt:104 msgid "" "You should upgrade, as recent versions of MySQL 5.1 have improved " "performance and MySQL 5.5 even more so." msgstr "" +"Hauries d'actualitzar, ja que les darreres versions de MySQL 5.1 tenen " +"millor rendiment, i MySQL 5.05 encara més." #: libraries/advisory_rules.txt:110 msgid "Version less than 5.5.8 (the first GA release of 5.5)." -msgstr "" +msgstr "Versió inferior a 5.5.8 (la primera versió disponible pública de 5.5)." #: libraries/advisory_rules.txt:111 msgid "You should upgrade, to a stable version of MySQL 5.5" @@ -12757,7 +12825,7 @@ msgstr "Distribució" #: libraries/advisory_rules.txt:117 msgid "Version is compiled from source, not a MySQL official binary." -msgstr "" +msgstr "Versió compilada des del codi font, no és un binari oficial de MySQL." #: libraries/advisory_rules.txt:118 msgid "" @@ -12765,31 +12833,39 @@ msgid "" "distribution. The MySQL manual only is accurate for official MySQL binaries, " "not any package distributions (such as RedHat, Debian/Ubuntu etc)." msgstr "" +"Si no vas compilar des del codi font, potser estàs utilitzant un paquet " +"modificat per una distribució. El manual de MySQL només és exacte per als " +"binaris de MySQL oficials, no per els paquets de distribucions (com RedHat, " +"Debian/Ubuntu, etc)." #: libraries/advisory_rules.txt:119 msgid "'source' found in version_comment" msgstr "" +"S'ha trobat \"font\" (\"source\") en el comentari de la versió " +"(\"version_comment\")" #: libraries/advisory_rules.txt:124 libraries/advisory_rules.txt:131 msgid "The MySQL manual only is accurate for official MySQL binaries." -msgstr "" +msgstr "El manual de MySQL només és exacte per als binaris oficials de MySQL." #: libraries/advisory_rules.txt:125 msgid "Percona documentation is at http://www.percona.com/docs/wiki/" -msgstr "" +msgstr "La documentació de Percona es troba a http://www.percona.com/docs/wiki/" #: libraries/advisory_rules.txt:126 msgid "'percona' found in version_comment" -msgstr "" +msgstr "S'ha trobat 'percona' als comentaris de la versió (\"version_comment\")" #: libraries/advisory_rules.txt:132 msgid "Drizzle documentation is at http://docs.drizzle.org/" -msgstr "" +msgstr "La documentació de Drizzle es troba a http://docs.drizzle.org/" #: libraries/advisory_rules.txt:133 #, php-format msgid "Version string (%s) matches Drizzle versioning scheme" msgstr "" +"La cadena de la versió (%s) coincideix amb el sistema de control de versions " +"de Drizzle" #: libraries/advisory_rules.txt:135 msgid "MySQL Architecture" @@ -12797,7 +12873,7 @@ msgstr "Arquitectura MySQL" #: libraries/advisory_rules.txt:138 msgid "MySQL is not compiled as a 64-bit package." -msgstr "" +msgstr "MySQL no s'ha compilat com a paquet de 64 bits." #: libraries/advisory_rules.txt:139 msgid "" @@ -12805,11 +12881,15 @@ msgid "" "so MySQL might not be able to access all of your memory. You might want to " "consider installing the 64-bit version of MySQL." msgstr "" +"La teva capacitat de memòria és superior a 3 GiB (suposant que el servidor " +"està en localhost), de manera que MySQL no podria ser capaç d'accedir a la " +"totalitat de la seva memòria. És possible que vulgueu considerar la " +"instal·lació de la versió de 64 bits de MySQL." #: libraries/advisory_rules.txt:140 #, php-format msgid "Available memory on this host: %s" -msgstr "" +msgstr "Memòria disponible en aquest servidor: %s" #: libraries/advisory_rules.txt:146 msgid "Query cache disabled" @@ -12826,20 +12906,23 @@ msgid "" "and setting {query_cache_type} to 'ON'. Note: If you are using " "memcached, ignore this recommendation." msgstr "" +"Se sap que la memòria cau de consultes millora en gran mesura el rendiment " +"si s'ha configurat correctament. Activa'l mitjançant l'establiment de " +"{query_cache_size} a un valor MIB de 2 dígits i ajusta {query_cache_type} a " +"'ON'. Nota: Si utilitzes memcached, ignora aquesta recomanació." #: libraries/advisory_rules.txt:151 msgid "query_cache_size is set to 0 or query_cache_type is set to 'OFF'" -msgstr "" +msgstr "query_cache_size s'estableix a 0 o query_cache_type està a 'OFF'" #: libraries/advisory_rules.txt:153 msgid "Query caching method" msgstr "Mètode de cau de consultes" #: libraries/advisory_rules.txt:156 -#, fuzzy #| msgid "Query cache" msgid "Suboptimal caching method." -msgstr "Memòria cau de consultes" +msgstr "Mètode d'emmagatzematge en memòria cau subòptima." #: libraries/advisory_rules.txt:157 msgid "" @@ -12848,6 +12931,11 @@ msgid "" "refman/5.5/en/ha-memcached.html\">memcached instead of the MySQL Query " "cache, especially if you have multiple slaves." msgstr "" +"Estàs utilitzant la memòria cau de consultes de MySQL amb una base de dades " +"de força transit. Valdria la pena considerar l'ús memcached en lloc de la memòria cau de consultes de " +"MySQL, especialment si tens diversos servidors esclaus." #: libraries/advisory_rules.txt:158 #, php-format @@ -12855,6 +12943,8 @@ msgid "" "The query cache is enabled and the server receives %d queries per second. " "This rule fires if there is more than 100 queries per second." msgstr "" +"La memòria cau de consultes està activat i el servidor rep %d consultes per " +"segon. Aquesta regla es dispara si hi ha més de 100 consultes per segon." #: libraries/advisory_rules.txt:160 #, php-format @@ -12864,16 +12954,19 @@ msgstr "Eficiència del cau de consultes (%%)" #: libraries/advisory_rules.txt:163 msgid "Query cache not running efficiently, it has a low hit rate." msgstr "" +"La memòria cau de consulta no s'executa de manera eficient, té una taxa " +"d'èxit baixa." #: libraries/advisory_rules.txt:164 msgid "Consider increasing {query_cache_limit}." -msgstr "" +msgstr "Pensa en la possibilitat d'augmentar {query_cache_limit}." #: libraries/advisory_rules.txt:165 -#, fuzzy, php-format +#, php-format #| msgid "Sort buffer size" msgid "The current query cache hit rate of %s%% is below 20%%" -msgstr "Tamany de l'àrea de classificació" +msgstr "" +"L'actual taxa d'èxit de la memòria cau de consultes %s%% és inferior al 20%%" #: libraries/advisory_rules.txt:167 msgid "Query Cache usage" @@ -12882,13 +12975,15 @@ msgstr "Ús del cau de consultes" #: libraries/advisory_rules.txt:170 #, php-format msgid "Less than 80%% of the query cache is being utilized." -msgstr "" +msgstr "S'utilitza menys del 80%% de la memòria cau de consultes." #: libraries/advisory_rules.txt:171 msgid "" "This might be caused by {query_cache_limit} being too low. Flushing the " "query cache might help as well." msgstr "" +"Això pot ser causat perque el valor de {query_cache_limit} és massa baix. " +"Buidar la memòria cau de consulta també pot ajudar." #: libraries/advisory_rules.txt:172 #, php-format @@ -12896,16 +12991,17 @@ msgid "" "The current ratio of free query cache memory to total query cache size is %s" "%%. It should be above 80%%" msgstr "" +"La taxa actual de memòria lluire del cau de consultes respecte la mida total " +"és de %s%%. Hauria de estar per sobre de 80%%" #: libraries/advisory_rules.txt:174 msgid "Query cache fragmentation" msgstr "Fragmentació del cau de consultes" #: libraries/advisory_rules.txt:177 -#, fuzzy #| msgid "The server is not responding" msgid "The query cache is considerably fragmented." -msgstr "El servidor no respon" +msgstr "La memòria cau de consultes està bastant fragmentada." #: libraries/advisory_rules.txt:178 msgid "" From d57679696cfaaf6bff2cc6539aeb29ec3bdf8fa3 Mon Sep 17 00:00:00 2001 From: Xavier Navarro Date: Sat, 28 Jul 2012 13:41:35 +0200 Subject: [PATCH 07/19] Translated using Weblate. --- po/ca.po | 176 +++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 138 insertions(+), 38 deletions(-) diff --git a/po/ca.po b/po/ca.po index d63b98a034..2b28199b2a 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-04 13:42+0200\n" -"PO-Revision-Date: 2012-07-26 17:20+0200\n" +"PO-Revision-Date: 2012-07-27 16:04+0200\n" "Last-Translator: Xavier Navarro \n" "Language-Team: catalan \n" "Language: ca\n" @@ -9799,6 +9799,8 @@ msgid "" "The Advisor system can provide recommendations on server variables by " "analyzing the server status variables." msgstr "" +"El sistema de consells pot proporcionar recomanacions sobre les variables " +"del servidor mitjançant l'anàlisi de les variables d'estat del servidor." #: server_status.php:914 msgid "" @@ -9806,6 +9808,9 @@ msgid "" "calculations and by rule of thumb which may not necessarily apply to your " "system." msgstr "" +"Tingues en compte però que aquest sistema ofereix recomanacions basades en " +"càlculs senzills i regles generals que no necessàriament s'apliquen al seu " +"sistema." #: server_status.php:916 msgid "" @@ -9813,6 +9818,10 @@ msgid "" "changing (by reading the documentation) and how to undo the change. Wrong " "tuning can have a very negative effect on performance." msgstr "" +"Abans de canviar qualsevol configuració, assegura't de saber què estàs " +"canviant (mitjançant la lectura de la documentació) i cóm desfer el canvi. " +"Establir ajustaments incorrectes pot tenir un efecte molt negatiu en el " +"rendiment." #: server_status.php:918 msgid "" @@ -9820,6 +9829,9 @@ msgid "" "time, observe or benchmark your database, and undo the change if there was " "no clearly measurable improvement." msgstr "" +"La millor manera d'ajustar el sistema seria canviar només una configuració " +"al mateix temps, observar o mesurar la teva base de dades, i desfer el canvi " +"si no hi ha una millora clarament mesurable." #. l10n: Questions is the name of a MySQL Status variable #: server_status.php:940 @@ -10648,6 +10660,11 @@ msgid "" "enabled. Note however, that the general_log produces a lot of data and " "increases server load by up to 15%" msgstr "" +"El monitor de phpMyAdmin pot ajudar a optimitzar la configuració del " +"servidor i localitzar a temps les consultes intensives. En aquest darrer cas " +"s'haurà d'establir log_output a 'TABLE' i tenir el slow_query_log o " +"general_log habilitat. Noteu però, que la general_log produeix una gran " +"quantitat de dades i augmenta la càrrega del servidor fins en un 15%" #: server_status.php:1619 msgid "" @@ -10656,10 +10673,15 @@ msgid "" "table is supported by MySQL 5.1.6 and onwards. You may still use the server " "charting features however." msgstr "" +"Lamentablement, el teu servidor de bases de dades no és compatible amb el " +"registre a la taula, que és un requisit per a l'anàlisi dels registres de " +"base de dades amb phpMyAdmin. El registre a la taula se suporta a partir de " +"MySQL 5.1.6 i següents. Pots seguir utilitzant però les funcions de gràfics " +"de servidor." #: server_status.php:1632 msgid "Using the monitor:" -msgstr "" +msgstr "Utilitzant el monitor:" #: server_status.php:1634 msgid "" @@ -10667,6 +10689,10 @@ msgid "" "may add charts and change the refresh rate under 'Settings', or remove any " "chart using the cog icon on each respective chart." msgstr "" +"El teu navegador actualitzarà tots els gràfics que es mostren en un interval " +"regular. Pots afegir gràfics i canviar la freqüència d'actualització a la " +"secció 'Configuració', o eliminar qualsevol gràfic amb la icona d'engranatge " +"en cada gràfic corresponent." #: server_status.php:1636 msgid "" @@ -10675,10 +10701,15 @@ msgid "" "confirmed, this will load a table of grouped queries, there you may click on " "any occuring SELECT statements to further analyze them." msgstr "" +"Per mostrar les consultes dels registres, selecciona l'interval de temps " +"rellevant en qualsevol gràfic mantenint premut el botó esquerre del ratolí i " +"arrosegant sobre el gràfic. Un cop confirmat, això carregarà una taula de " +"consultes agrupades, on podràs clicar en qualsevol de les instruccions " +"SELECT per analitzar-la amb més detall." #: server_status.php:1643 msgid "Please note:" -msgstr "" +msgstr "Tingueu en compte:" #: server_status.php:1645 msgid "" @@ -10687,6 +10718,11 @@ msgid "" "it is advisable to select only a small time span and to disable the " "general_log and empty its table once monitoring is not required any more." msgstr "" +"Activar el general_log pot augmentar la càrrega del servidor en un 5-15%. " +"També tingues en compte que la generació d'estadístiques dels registres és " +"una tasca de càrrega intensiva, pel que és aconsellable seleccionar només un " +"lapse de temps petit i per desactivar el general_log i buidar la taula una " +"vegada que el monitoratge no es requereixi més." #: server_status.php:1657 msgid "Preset chart" @@ -10702,7 +10738,7 @@ msgstr "Seleccionar series:" #: server_status.php:1665 msgid "Commonly monitored" -msgstr "" +msgstr "Comunment monitoritzat" #: server_status.php:1680 msgid "or type variable name:" @@ -10710,15 +10746,15 @@ msgstr "o escriu el nom de variable:" #: server_status.php:1684 msgid "Display as differential value" -msgstr "" +msgstr "Mostra com a valor diferencial" #: server_status.php:1686 msgid "Apply a divisor" -msgstr "" +msgstr "Aplicar un divisor" #: server_status.php:1693 msgid "Append unit to data values" -msgstr "" +msgstr "Afegir unitat als valors" #: server_status.php:1699 msgid "Add this series" @@ -10726,7 +10762,7 @@ msgstr "Afegir aquesta serie" #: server_status.php:1701 msgid "Clear series" -msgstr "" +msgstr "Buidar sèrie" #: server_status.php:1704 msgid "Series in Chart:" @@ -10742,19 +10778,21 @@ msgstr "Rang de temps seleccionat:" #: server_status.php:1723 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements" -msgstr "" +msgstr "Només recuperar instruccions SELECT, INSERT, UPDATE i DELETE" #: server_status.php:1728 msgid "Remove variable data in INSERT statements for better grouping" msgstr "" +"Elimina dades variables en les instruccions INSERT per a una millor " +"agrupació" #: server_status.php:1733 msgid "Choose from which log you want the statistics to be generated from." -msgstr "" +msgstr "Tria de quin registre vols que es generin les estadístiques." #: server_status.php:1735 msgid "Results are grouped by query text." -msgstr "" +msgstr "Els resultats s'agrupen pel text de la consulta." #: server_status.php:1740 msgid "Query analyzer" @@ -10890,7 +10928,7 @@ msgstr "" #: server_variables.php:80 msgid "Setting variable failed" -msgstr "" +msgstr "Errada a la configuració de la variable" #: server_variables.php:99 msgid "Server variables and settings" @@ -10911,6 +10949,8 @@ msgstr "Descarrega" #: setup/frames/form.inc.php:25 msgid "Incorrect formset, check $formsets array in setup/frames/form.inc.php" msgstr "" +"Conjunt de formularis incorrecte, comprova l'array $formsets a l'arxiu " +"setup/frames/form.inc.php" #: setup/frames/index.inc.php:49 msgid "Cannot load or save configuration" @@ -10958,6 +10998,9 @@ msgid "" "Configuration saved to file config/config.inc.php in phpMyAdmin top level " "directory, copy it to top level one and delete directory config to use it." msgstr "" +"Configuració desada a l'arxiu config/config.inc.php dins el directori arrel " +"de phpMyAdmin, copia'l al nivell superior i elimina el directori de " +"configuració per utilitzar-lo." #: setup/frames/index.inc.php:102 setup/frames/menu.inc.php:15 msgid "Overview" @@ -11021,7 +11064,7 @@ msgstr "Afegir un nou servidor" #: setup/index.php:22 msgid "Wrong GET file attribute value" -msgstr "" +msgstr "Valor incorrecte d'atribut d'arxiu en GET" #: setup/lib/form_processing.lib.php:43 msgid "Warning" @@ -11373,7 +11416,7 @@ msgstr "Títol del gràfic" #: tbl_chart.php:109 msgid "X-Axis:" -msgstr "" +msgstr "Eix X:" #: tbl_chart.php:124 msgid "Series:" @@ -11639,7 +11682,7 @@ msgstr "Mida de fila" #: tbl_printview.php:375 tbl_structure.php:910 msgid "Next autoindex" -msgstr "" +msgstr "AUTOINDEX Següent" #: tbl_relation.php:271 #, php-format @@ -11685,7 +11728,7 @@ msgstr "Ordre del llistat:" #: tbl_structure.php:155 tbl_structure.php:160 tbl_structure.php:597 msgid "Spatial" -msgstr "" +msgstr "Espacial" #: tbl_structure.php:162 tbl_structure.php:166 msgid "Browse distinct values" @@ -11929,7 +11972,7 @@ msgstr "Criteri de cerca addicionals" #: tbl_zoom_select.php:283 msgid "Use this column to label each point" -msgstr "" +msgstr "Utilitza aquesta columna per etiquetar cada punt" #: tbl_zoom_select.php:303 msgid "Maximum rows to plot" @@ -11937,7 +11980,7 @@ msgstr "Màxim nombre de files a dibuixar" #: tbl_zoom_select.php:417 msgid "Browse/Edit the points" -msgstr "" +msgstr "Veure/editar els punts" #: tbl_zoom_select.php:424 msgid "How to use" @@ -11988,22 +12031,26 @@ msgstr "Reanomena la vista a" #: po/advisory_rules.php:5 msgid "Uptime below one day" -msgstr "" +msgstr "Temps d'activitat per sota d'un dia" #: po/advisory_rules.php:6 msgid "Uptime is less than 1 day, performance tuning may not be accurate." msgstr "" +"El temps d'activitat és inferior a 1 dia, l'optimització del rendiment pot " +"no ser exacta." #: po/advisory_rules.php:7 msgid "" "To have more accurate averages it is recommended to let the server run for " "longer than a day before running this analyzer" msgstr "" +"Per tenir unes mitjanes més exactes, es recomana deixar que el servidor " +"funcioni durant més d'un dia abans d'executar aquest analitzador" #: po/advisory_rules.php:8 #, php-format msgid "The uptime is only %s" -msgstr "" +msgstr "El temps d'activitat només és de %s" #: po/advisory_rules.php:10 msgid "Questions below 1,000" @@ -12014,12 +12061,16 @@ msgid "" "Fewer than 1,000 questions have been run against this server. The " "recommendations may not be accurate." msgstr "" +"S'han fet menys de 1.000 consultes en aquest servidor. Les recomanacions " +"poden no ser exactes." #: po/advisory_rules.php:12 msgid "" "Let the server run for a longer time until it has executed a greater amount " "of queries." msgstr "" +"Deixa que el servidor s'executi per més temps fins que s'hagi dut a terme " +"una major quantitat de consultes." #: po/advisory_rules.php:13 #, php-format @@ -12034,17 +12085,22 @@ msgstr "Percentatge de consultes lentes" msgid "" "There is a lot of slow queries compared to the overall amount of Queries." msgstr "" +"Hi ha una gran quantitat de consultes lentes (slow-queries) en comparació " +"amb la quantitat total de consultes." #: po/advisory_rules.php:17 po/advisory_rules.php:22 msgid "" "You might want to increase {long_query_time} or optimize the queries listed " "in the slow query log" msgstr "" +"Podries augmentar la variable {long_query_time} o optimitzar les consultes " +"que figuren en el registre de consultes lentes" #: po/advisory_rules.php:18 #, php-format msgid "The slow query rate should be below 5%%, your value is %s%%." msgstr "" +"La taxa de consultes lentes ha de ser inferior al 5%%, el teu valor és %s%%." #: po/advisory_rules.php:20 msgid "Slow query rate" @@ -12054,6 +12110,8 @@ msgstr "Freqüència de consultes lentes" msgid "" "There is a high percentage of slow queries compared to the server uptime." msgstr "" +"Hi ha un alt percentatge de consultes lentes en comparació amb el temps " +"d'activitat del servidor." #: po/advisory_rules.php:23 #, php-format @@ -12061,6 +12119,8 @@ msgid "" "You have a slow query rate of %s per hour, you should have less than 1%% per " "hour." msgstr "" +"Tens una taxa de consultes lentes de %s per hora, hauries de tenir menys de " +"l'1%% per hora." #: po/advisory_rules.php:25 msgid "Long query time" @@ -12071,17 +12131,21 @@ msgid "" "long_query_time is set to 10 seconds or more, thus only slow queries that " "take above 10 seconds are logged." msgstr "" +"long_query_time s'estableix en 10 segons o més, per tant, només entrarà les " +"consultes lentes que triguin més de 10 segons." #: po/advisory_rules.php:27 msgid "" "It is suggested to set {long_query_time} to a lower value, depending on your " "environment. Usually a value of 1-5 seconds is suggested." msgstr "" +"Es suggereix establir {long_query_time} a un valor inferior, depenent del " +"teu entorn. En general, es recomana un valor de 1-5 segons." #: po/advisory_rules.php:28 #, php-format msgid "long_query_time is currently set to %ds." -msgstr "" +msgstr "long_query_time està configurat a %ds." #: po/advisory_rules.php:30 msgid "Slow query logging" @@ -12089,17 +12153,19 @@ msgstr "Registre de consultes lentes" #: po/advisory_rules.php:31 msgid "The slow query log is disabled." -msgstr "" +msgstr "El registre de consultes lentes està desactivat." #: po/advisory_rules.php:32 msgid "" "Enable slow query logging by setting {log_slow_queries} to 'ON'. This will " "help troubleshooting badly performing queries." msgstr "" +"Habilita el registre de consultes lentes establint {log_slow_queries} a " +"'ON'. Això t'ajudarà a solucionar les consultes amb mal rendiment." #: po/advisory_rules.php:33 msgid "log_slow_queries is set to 'OFF'" -msgstr "" +msgstr "log_slow_queries està a 'OFF'" #: po/advisory_rules.php:35 msgid "Release Series" @@ -12107,13 +12173,15 @@ msgstr "Serie de versions" #: po/advisory_rules.php:36 msgid "The MySQL server version less than 5.1." -msgstr "" +msgstr "La versió del servidor MySQL és inferior a 5.1." #: po/advisory_rules.php:37 msgid "" "You should upgrade, as MySQL 5.1 has improved performance, and MySQL 5.5 " "even more so." msgstr "" +"Hauries d'actualitzar, ja que MySQL 5.1 té millor rendiment, i encara és " +"millor en MySQL 5.5." #: po/advisory_rules.php:38 po/advisory_rules.php:43 po/advisory_rules.php:48 #, php-format @@ -12126,17 +12194,19 @@ msgstr "Versió menor" #: po/advisory_rules.php:41 msgid "Version less than 5.1.30 (the first GA release of 5.1)." -msgstr "" +msgstr "Versió inferior a 5.1.30 (la primera versió disponible pública de 5.1)." #: po/advisory_rules.php:42 msgid "" "You should upgrade, as recent versions of MySQL 5.1 have improved " "performance and MySQL 5.5 even more so." msgstr "" +"Hauries d'actualitzar, ja que les darreres versions de MySQL 5.1 tenen " +"millor rendiment, i MySQL 5.05 encara més." #: po/advisory_rules.php:46 msgid "Version less than 5.5.8 (the first GA release of 5.5)." -msgstr "" +msgstr "Versió inferior a 5.5.8 (la primera versió disponible pública de 5.5)." #: po/advisory_rules.php:47 msgid "You should upgrade, to a stable version of MySQL 5.5" @@ -12148,7 +12218,7 @@ msgstr "Distribució" #: po/advisory_rules.php:51 msgid "Version is compiled from source, not a MySQL official binary." -msgstr "" +msgstr "Versió compilada des del codi font, no és un binari oficial de MySQL." #: po/advisory_rules.php:52 msgid "" @@ -12156,31 +12226,39 @@ msgid "" "distribution. The MySQL manual only is accurate for official MySQL binaries, " "not any package distributions (such as RedHat, Debian/Ubuntu etc)." msgstr "" +"Si no vas compilar des del codi font, potser estàs utilitzant un paquet " +"modificat per una distribució. El manual de MySQL només és exacte per als " +"binaris de MySQL oficials, no per els paquets de distribucions (com RedHat, " +"Debian/Ubuntu, etc)." #: po/advisory_rules.php:53 msgid "'source' found in version_comment" msgstr "" +"S'ha trobat \"font\" (\"source\") en el comentari de la versió " +"(\"version_comment\")" #: po/advisory_rules.php:56 po/advisory_rules.php:61 msgid "The MySQL manual only is accurate for official MySQL binaries." -msgstr "" +msgstr "El manual de MySQL només és exacte per als binaris oficials de MySQL." #: po/advisory_rules.php:57 msgid "Percona documentation is at http://www.percona.com/docs/wiki/" -msgstr "" +msgstr "La documentació de Percona es troba a http://www.percona.com/docs/wiki/" #: po/advisory_rules.php:58 msgid "'percona' found in version_comment" -msgstr "" +msgstr "S'ha trobat 'percona' als comentaris de la versió (\"version_comment\")" #: po/advisory_rules.php:62 msgid "Drizzle documentation is at http://docs.drizzle.org/" -msgstr "" +msgstr "La documentació de Drizzle es troba a http://docs.drizzle.org/" #: po/advisory_rules.php:63 #, php-format msgid "Version string (%s) matches Drizzle versioning scheme" msgstr "" +"La cadena de la versió (%s) coincideix amb el sistema de control de versions " +"de Drizzle" #: po/advisory_rules.php:65 msgid "MySQL Architecture" @@ -12188,7 +12266,7 @@ msgstr "Arquitectura MySQL" #: po/advisory_rules.php:66 msgid "MySQL is not compiled as a 64-bit package." -msgstr "" +msgstr "MySQL no s'ha compilat com a paquet de 64 bits." #: po/advisory_rules.php:67 msgid "" @@ -12196,11 +12274,15 @@ msgid "" "so MySQL might not be able to access all of your memory. You might want to " "consider installing the 64-bit version of MySQL." msgstr "" +"La teva capacitat de memòria és superior a 3 GiB (suposant que el servidor " +"està en localhost), de manera que MySQL no podria ser capaç d'accedir a la " +"totalitat de la seva memòria. És possible que vulgueu considerar la " +"instal·lació de la versió de 64 bits de MySQL." #: po/advisory_rules.php:68 #, php-format msgid "Available memory on this host: %s" -msgstr "" +msgstr "Memòria disponible en aquest servidor: %s" #: po/advisory_rules.php:70 msgid "Query cache disabled" @@ -12218,10 +12300,14 @@ msgid "" "and setting {query_cache_type} to 'ON'. Note: If you are using " "memcached, ignore this recommendation." msgstr "" +"Se sap que la memòria cau de consultes millora en gran mesura el rendiment " +"si s'ha configurat correctament. Activa'l mitjançant l'establiment de " +"{query_cache_size} a un valor MIB de 2 dígits i ajusta {query_cache_type} a " +"'ON'. Nota: Si utilitzes memcached, ignora aquesta recomanació." #: po/advisory_rules.php:73 msgid "query_cache_size is set to 0 or query_cache_type is set to 'OFF'" -msgstr "" +msgstr "query_cache_size s'estableix a 0 o query_cache_type està a 'OFF'" #: po/advisory_rules.php:75 #| msgid "Query cache" @@ -12230,7 +12316,7 @@ msgstr "Mètode de cau de consultes" #: po/advisory_rules.php:76 msgid "Suboptimal caching method." -msgstr "" +msgstr "Mètode d'emmagatzematge en memòria cau subòptima." #: po/advisory_rules.php:77 msgid "" @@ -12239,6 +12325,11 @@ msgid "" "refman/5.5/en/ha-memcached.html\">memcached instead of the MySQL Query " "cache, especially if you have multiple slaves." msgstr "" +"Estàs utilitzant la memòria cau de consultes de MySQL amb una base de dades " +"de força transit. Valdria la pena considerar l'ús memcached en lloc de la memòria cau de consultes de " +"MySQL, especialment si tens diversos servidors esclaus." #: po/advisory_rules.php:78 #, php-format @@ -12246,6 +12337,8 @@ msgid "" "The query cache is enabled and the server receives %d queries per second. " "This rule fires if there is more than 100 queries per second." msgstr "" +"La memòria cau de consultes està activat i el servidor rep %d consultes per " +"segon. Aquesta regla es dispara si hi ha més de 100 consultes per segon." #: po/advisory_rules.php:80 #, php-format @@ -12256,15 +12349,18 @@ msgstr "Eficiència del cau de consultes (%%)" #: po/advisory_rules.php:81 msgid "Query cache not running efficiently, it has a low hit rate." msgstr "" +"La memòria cau de consulta no s'executa de manera eficient, té una taxa " +"d'èxit baixa." #: po/advisory_rules.php:82 msgid "Consider increasing {query_cache_limit}." -msgstr "" +msgstr "Pensa en la possibilitat d'augmentar {query_cache_limit}." #: po/advisory_rules.php:83 #, php-format msgid "The current query cache hit rate of %s%% is below 20%%" msgstr "" +"L'actual taxa d'èxit de la memòria cau de consultes %s%% és inferior al 20%%" #: po/advisory_rules.php:85 msgid "Query Cache usage" @@ -12273,13 +12369,15 @@ msgstr "Ús del cau de consultes" #: po/advisory_rules.php:86 #, php-format msgid "Less than 80%% of the query cache is being utilized." -msgstr "" +msgstr "S'utilitza menys del 80%% de la memòria cau de consultes." #: po/advisory_rules.php:87 msgid "" "This might be caused by {query_cache_limit} being too low. Flushing the " "query cache might help as well." msgstr "" +"Això pot ser causat perque el valor de {query_cache_limit} és massa baix. " +"Buidar la memòria cau de consulta també pot ajudar." #: po/advisory_rules.php:88 #, php-format @@ -12287,6 +12385,8 @@ msgid "" "The current ratio of free query cache memory to total query cache size is %s" "%%. It should be above 80%%" msgstr "" +"La taxa actual de memòria lluire del cau de consultes respecte la mida total " +"és de %s%%. Hauria de estar per sobre de 80%%" #: po/advisory_rules.php:90 #| msgid "Query cache" @@ -12295,7 +12395,7 @@ msgstr "Fragmentació del cau de consultes" #: po/advisory_rules.php:91 msgid "The query cache is considerably fragmented." -msgstr "" +msgstr "La memòria cau de consultes està bastant fragmentada." #: po/advisory_rules.php:92 msgid "" From 5d2d529671496af7e456e60133bcd174f41e2250 Mon Sep 17 00:00:00 2001 From: Stian Berg Date: Sat, 28 Jul 2012 15:46:19 +0200 Subject: [PATCH 08/19] Translated using Weblate. --- po/nb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/nb.po b/po/nb.po index 64499874c8..97459562bd 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-04 13:42+0200\n" -"PO-Revision-Date: 2012-07-09 16:04+0200\n" -"Last-Translator: Nicholas Arnesen \n" +"PO-Revision-Date: 2012-07-28 15:32+0200\n" +"Last-Translator: Stian Berg \n" "Language-Team: norwegian \n" "Language: nb\n" "MIME-Version: 1.0\n" @@ -11592,7 +11592,7 @@ msgstr "Navn" #: tbl_addfield.php:185 tbl_alter.php:99 tbl_indexes.php:98 #, php-format msgid "Table %1$s has been altered successfully" -msgstr "Tabellen %1$s har blitt endrett" +msgstr "Tabellen %1$s har blitt endret" #: tbl_change.php:699 msgid "Because of its length,
this column might not be editable" From 01341ea7bb397123f130ff22e239667deea1e3cb Mon Sep 17 00:00:00 2001 From: Stian Berg Date: Sat, 28 Jul 2012 15:47:39 +0200 Subject: [PATCH 09/19] Translated using Weblate. --- po/nb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/nb.po b/po/nb.po index 22997803bc..a5eb7bcd8a 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-27 10:40+0200\n" -"PO-Revision-Date: 2012-07-09 16:04+0200\n" -"Last-Translator: Nicholas Arnesen \n" +"PO-Revision-Date: 2012-07-28 15:32+0200\n" +"Last-Translator: Stian Berg \n" "Language-Team: norwegian \n" "Language: nb\n" "MIME-Version: 1.0\n" @@ -12245,7 +12245,7 @@ msgstr "Navn" #: tbl_addfield.php:190 tbl_alter.php:216 tbl_indexes.php:107 #, php-format msgid "Table %1$s has been altered successfully" -msgstr "Tabellen %1$s har blitt endrett" +msgstr "Tabellen %1$s har blitt endret" #: tbl_alter.php:133 #, fuzzy From 7b992b0bcedafa7c737a35e6e76e9e4868c92c6b Mon Sep 17 00:00:00 2001 From: Stian Berg Date: Sat, 28 Jul 2012 16:54:16 +0200 Subject: [PATCH 10/19] Translated using Weblate. --- po/nb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/po/nb.po b/po/nb.po index a5eb7bcd8a..df2e00bc40 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-27 10:40+0200\n" -"PO-Revision-Date: 2012-07-28 15:32+0200\n" +"PO-Revision-Date: 2012-07-28 16:33+0200\n" "Last-Translator: Stian Berg \n" "Language-Team: norwegian \n" "Language: nb\n" @@ -5185,6 +5185,8 @@ msgid "" "Structure page if any of the required tables for the phpMyAdmin " "configuration storage could not be found" msgstr "" +"Deaktiver varselet som vises på databasedetaljsiden Struktur om det er noen " +"påkrevde tabeller for phpMyAdmins konfigurasjonslager som ikke ble funnet" #: libraries/config/messages.inc.php:338 msgid "Missing phpMyAdmin configuration storage tables" @@ -5240,10 +5242,9 @@ msgid "Query window height" msgstr "Høyde på spørringsvindu" #: libraries/config/messages.inc.php:352 -#, fuzzy #| msgid "Query window" msgid "Query window width (in pixels)" -msgstr "Spørringsvindu" +msgstr "Bredde på spørringsvindu (i piksler)" #: libraries/config/messages.inc.php:353 msgid "Query window width" From 876a9704afc966e77e05a3dc37d43f5575b50eae Mon Sep 17 00:00:00 2001 From: Stian Berg Date: Sun, 29 Jul 2012 04:36:29 +0200 Subject: [PATCH 11/19] Translated using Weblate. --- po/nb.po | 88 +++++++++++++++++++++++--------------------------------- 1 file changed, 36 insertions(+), 52 deletions(-) diff --git a/po/nb.po b/po/nb.po index 97459562bd..8245cfe597 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-04 13:42+0200\n" -"PO-Revision-Date: 2012-07-28 15:32+0200\n" +"PO-Revision-Date: 2012-07-28 19:19+0200\n" "Last-Translator: Stian Berg \n" "Language-Team: norwegian \n" "Language: nb\n" @@ -2788,10 +2788,9 @@ msgid "PBMS get BLOB info failed:" msgstr "PBMS get BLOB info feilet:" #: libraries/blobstreaming.lib.php:373 -#, fuzzy #| msgid "get BLOB Content-Type failed" msgid "PBMS get BLOB Content-Type failed" -msgstr "get BLOB Content-Type feilet:" +msgstr "PBMS hent BLOB Content-Type feilet" #: libraries/blobstreaming.lib.php:401 msgid "View image" @@ -4534,6 +4533,8 @@ msgid "" "Structure page if any of the required tables for the phpMyAdmin " "configuration storage could not be found" msgstr "" +"Deaktiver varselet som vises på databasedetaljsiden Struktur om det er noen " +"påkrevde tabeller for phpMyAdmins konfigurasjonslager som ikke ble funnet" #: libraries/config/messages.inc.php:334 msgid "Missing phpMyAdmin configuration storage tables" @@ -4592,10 +4593,9 @@ msgid "Query window height" msgstr "Høyde på spørringsvindu" #: libraries/config/messages.inc.php:348 -#, fuzzy #| msgid "Query window" msgid "Query window width (in pixels)" -msgstr "Spørringsvindu" +msgstr "Bredde på spørringsvindu (i piksler)" #: libraries/config/messages.inc.php:349 msgid "Query window width" @@ -4638,7 +4638,7 @@ msgstr "" #: libraries/config/messages.inc.php:359 msgid "Save all edited cells at once" -msgstr "" +msgstr "Ikke lagre endrede celler umiddelbart" #: libraries/config/messages.inc.php:360 msgid "Directory where exports can be saved on server" @@ -4653,20 +4653,18 @@ msgid "Leave blank if not used" msgstr "La stå tom hvis ikke brukt" #: libraries/config/messages.inc.php:363 -#, fuzzy #| msgid "Host authentication order" msgid "Host authorization order" -msgstr "Rekkefølge for vertsautentisering" +msgstr "Rekkefølge for vertsautorisering" #: libraries/config/messages.inc.php:364 msgid "Leave blank for defaults" msgstr "La stå tom for standard" #: libraries/config/messages.inc.php:365 -#, fuzzy #| msgid "Host authentication rules" msgid "Host authorization rules" -msgstr "Vertsautentiseringsregler" +msgstr "Regler for vertsautorisering" #: libraries/config/messages.inc.php:366 msgid "Allow logins without a password" @@ -4934,10 +4932,9 @@ msgstr "" "La stå tom for ingen SQL spørringshistorie, anbefalt: [kbd]pma_tracking[/kbd]" #: libraries/config/messages.inc.php:417 -#, fuzzy #| msgid "Recall user name" msgid "Recently used table" -msgstr "Husk brukernavn" +msgstr "Nylig brukt tabell" #: libraries/config/messages.inc.php:418 msgid "" @@ -5200,10 +5197,9 @@ msgid "Whether to show hint or not" msgstr "" #: libraries/config/messages.inc.php:467 -#, fuzzy #| msgid "Show grid" msgid "Show hint" -msgstr "Vis rutenett" +msgstr "Vis hint" #: libraries/config/messages.inc.php:468 msgid "" @@ -5482,10 +5478,9 @@ msgid "Cookie authentication" msgstr "Autentisering informasjonskapsler" #: libraries/config/setup.forms.php:48 -#, fuzzy #| msgid "Host authentication order" msgid "HTTP authentication" -msgstr "Rekkefølge for vertsautentisering" +msgstr "HTTP autentisering" #: libraries/config/setup.forms.php:51 #, fuzzy @@ -5508,7 +5503,7 @@ msgstr "Open Document regneark" #: libraries/config/setup.forms.php:267 #: libraries/config/user_preferences.forms.php:166 msgid "Quick" -msgstr "" +msgstr "Rask" #: libraries/config/setup.forms.php:271 #: libraries/config/user_preferences.forms.php:170 @@ -5542,10 +5537,9 @@ msgid "Could not initialize Drizzle connection library" msgstr "" #: libraries/config/validate.lib.php:205 libraries/config/validate.lib.php:212 -#, fuzzy #| msgid "Could not connect to MySQL server" msgid "Could not connect to Drizzle server" -msgstr "Kunne ikke koble til MySQL tjener" +msgstr "Kunne ikke koble til Drizzle tjener" #: libraries/config/validate.lib.php:223 libraries/config/validate.lib.php:230 msgid "Could not connect to MySQL server" @@ -5592,18 +5586,18 @@ msgid "possible deep recursion attack" msgstr "" #: libraries/database_interface.lib.php:1813 -#, fuzzy #| msgid " the local MySQL server's socket is not correctly configured)" msgid "" "The server is not responding (or the local server's socket is not correctly " "configured)." -msgstr "(eller den lokale MySQL tjenerens sokkel er ikke korrekt konfigurert)" +msgstr "" +"Tjeneren svarer ikke (eller den lokale MySQL tjenerens sokkel er ikke " +"korrekt konfigurert)." #: libraries/database_interface.lib.php:1816 -#, fuzzy #| msgid "The server is not responding" msgid "The server is not responding." -msgstr "Tjeneren svarer ikke" +msgstr "Tjeneren svarer ikke." #: libraries/database_interface.lib.php:1820 msgid "Please check privileges of directory containing database." @@ -5689,7 +5683,6 @@ msgstr "MySQL 4.0 kompatibel" #: libraries/display_create_database.lib.php:21 #: libraries/display_create_database.lib.php:39 -#, fuzzy #| msgid "Create new database" msgid "Create database" msgstr "Opprett ny database" @@ -5780,7 +5773,7 @@ msgstr "Dump alle rader" #: libraries/display_export.lib.php:176 libraries/display_export.lib.php:197 msgid "Output:" -msgstr "" +msgstr "Utskrift:" #: libraries/display_export.lib.php:183 libraries/display_export.lib.php:209 #, php-format @@ -5840,10 +5833,9 @@ msgid "zipped" msgstr "Pakket (zip)" #: libraries/display_export.lib.php:312 -#, fuzzy #| msgid "\"gzipped\"" msgid "gzipped" -msgstr "Komprimert (gz)" +msgstr "gzippet" #: libraries/display_export.lib.php:314 #, fuzzy @@ -5852,17 +5844,15 @@ msgid "bzipped" msgstr "Komprimert (bz2)" #: libraries/display_export.lib.php:323 -#, fuzzy #| msgid "Save as file" msgid "View output as text" -msgstr "Lagre som fil" +msgstr "Vis utskrift som tekst" #: libraries/display_export.lib.php:328 libraries/display_import.lib.php:244 #: libraries/export/codegen.php:38 -#, fuzzy #| msgid "Format" msgid "Format:" -msgstr "Format" +msgstr "Format:" #: libraries/display_export.lib.php:333 msgid "Format-specific options:" @@ -5873,12 +5863,13 @@ msgid "" "Scroll down to fill in the options for the selected format and ignore the " "options for other formats." msgstr "" +"Bla ned for å fylle ut valgene for det valgte formatet og ignorere valgene " +"for andre formater." #: libraries/display_export.lib.php:342 libraries/display_import.lib.php:260 -#, fuzzy #| msgid "Encoding conversion" msgid "Encoding Conversion:" -msgstr "Kodingskonvertering" +msgstr "Kodingskonvertering:" #: libraries/display_import.lib.php:66 msgid "" @@ -5935,10 +5926,9 @@ msgid "File uploads are not allowed on this server." msgstr "Filopplastinger er ikke tillatt på denne tjeneren." #: libraries/display_import.lib.php:208 -#, fuzzy #| msgid "Partial import" msgid "Partial Import:" -msgstr "Delvis importering" +msgstr "Delvis importering:" #: libraries/display_import.lib.php:214 #, php-format @@ -5969,7 +5959,7 @@ msgstr "Antall rader å hoppe over, fra første rad:" #: libraries/display_import.lib.php:250 msgid "Format-Specific Options:" -msgstr "" +msgstr "Format-spesifikke valg:" #: libraries/display_select_lang.lib.php:46 #: libraries/display_select_lang.lib.php:47 setup/frames/index.inc.php:72 @@ -5977,16 +5967,14 @@ msgid "Language" msgstr "Språk" #: libraries/display_tbl.lib.php:406 -#, fuzzy #| msgid "Save directory" msgid "Save edited data" -msgstr "Lagringsmappe" +msgstr "Lagre redigerte data" #: libraries/display_tbl.lib.php:412 -#, fuzzy #| msgid "CHAR textarea columns" msgid "Restore column order" -msgstr "CHAR textarea kolonner" +msgstr "Tilbakestill kolonnerekkefølge" #: libraries/display_tbl.lib.php:428 #, fuzzy @@ -5995,16 +5983,14 @@ msgid "Start row" msgstr "CHAR textarea rader" #: libraries/display_tbl.lib.php:430 -#, fuzzy #| msgid "Number of rows:" msgid "Number of rows" -msgstr "Antall rader:" +msgstr "Antall rader" #: libraries/display_tbl.lib.php:435 -#, fuzzy #| msgid "More" msgid "Mode" -msgstr "Mer" +msgstr "Modus" #: libraries/display_tbl.lib.php:437 msgid "horizontal" @@ -6021,7 +6007,7 @@ msgstr "loddrett" #: libraries/display_tbl.lib.php:445 #, php-format msgid "Headers every %s rows" -msgstr "" +msgstr "Topptekst hver %s. rad" #: libraries/display_tbl.lib.php:548 msgid "Sort by key" @@ -6045,10 +6031,9 @@ msgid "Options" msgstr "Innstillinger" #: libraries/display_tbl.lib.php:632 libraries/display_tbl.lib.php:650 -#, fuzzy #| msgid "Partial Texts" msgid "Partial texts" -msgstr "Delvis tekst" +msgstr "Delvise tekster" #: libraries/display_tbl.lib.php:633 libraries/display_tbl.lib.php:654 #, fuzzy @@ -6080,11 +6065,11 @@ msgstr "Nettvisertransformasjon" #: libraries/display_tbl.lib.php:694 msgid "Well Known Text" -msgstr "" +msgstr "Velkjent Tekst" #: libraries/display_tbl.lib.php:695 msgid "Well Known Binary" -msgstr "" +msgstr "Velkjent Binær" #: libraries/display_tbl.lib.php:1406 libraries/display_tbl.lib.php:1418 msgid "The row has been deleted" @@ -6128,13 +6113,12 @@ msgstr "Vis PDF-skjema" #: libraries/display_tbl.lib.php:2680 msgid "Visualize GIS data" -msgstr "" +msgstr "Visualiser GIS data" #: libraries/display_tbl.lib.php:2701 -#, fuzzy #| msgid "Create User" msgid "Create view" -msgstr "Opprett bruker" +msgstr "Opprett view" #: libraries/display_tbl.lib.php:2808 msgid "Link not found" From 8bad09a3ec58704e7f9542cb2533a23fe7d28d63 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 29 Jul 2012 04:36:31 +0200 Subject: [PATCH 12/19] Translated using Weblate. --- po/si.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/si.po b/po/si.po index 9084a4df06..b3d0830996 100644 --- a/po/si.po +++ b/po/si.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-04 13:42+0200\n" -"PO-Revision-Date: 2012-06-26 18:41+0200\n" +"PO-Revision-Date: 2012-07-28 18:20+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 1.0\n" +"X-Generator: Weblate 1.1\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:353 #: libraries/display_tbl.lib.php:359 server_privileges.php:1677 @@ -952,7 +952,7 @@ msgid "" "Chose \"GeomFromText\" from the \"Function\" column and paste the below " "string into the \"Value\" field" msgstr "" -"\"Function\" තීරුවෙන් \"GeomFromText\" තෝරා පහත ඇති දේ \"Value\" ක්ෂේත්‍රයට පිටපත් " +"\"ශ්‍රිතය\" තීරුවෙන් \"GeomFromText\" තෝරා පහත ඇති දේ \"අගය\" ක්ෂේත්‍රයට පිටපත් " "කරන්න" #: import.php:57 From 9b35fc53daeb497417838f56243f391620737abf Mon Sep 17 00:00:00 2001 From: Stian Berg Date: Sun, 29 Jul 2012 04:42:34 +0200 Subject: [PATCH 13/19] Translated using Weblate. --- po/nb.po | 80 +++++++++++++++++++++++--------------------------------- 1 file changed, 32 insertions(+), 48 deletions(-) diff --git a/po/nb.po b/po/nb.po index df2e00bc40..82969de2b3 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-27 10:40+0200\n" -"PO-Revision-Date: 2012-07-28 16:33+0200\n" +"PO-Revision-Date: 2012-07-28 19:19+0200\n" "Last-Translator: Stian Berg \n" "Language-Team: norwegian \n" "Language: nb\n" @@ -2708,16 +2708,14 @@ msgid "Inside column:" msgstr "I kolonne:" #: libraries/DisplayResults.class.php:683 -#, fuzzy #| msgid "Save directory" msgid "Save edited data" -msgstr "Lagringsmappe" +msgstr "Lagre redigerte data" #: libraries/DisplayResults.class.php:689 -#, fuzzy #| msgid "CHAR textarea columns" msgid "Restore column order" -msgstr "CHAR textarea kolonner" +msgstr "Tilbakestill kolonnerekkefølge" #: libraries/DisplayResults.class.php:889 #, fuzzy @@ -2726,16 +2724,14 @@ msgid "Start row" msgstr "CHAR textarea rader" #: libraries/DisplayResults.class.php:893 -#, fuzzy #| msgid "Number of rows:" msgid "Number of rows" -msgstr "Antall rader:" +msgstr "Antall rader" #: libraries/DisplayResults.class.php:902 -#, fuzzy #| msgid "More" msgid "Mode" -msgstr "Mer" +msgstr "Modus" #: libraries/DisplayResults.class.php:904 msgid "horizontal" @@ -2752,7 +2748,7 @@ msgstr "loddrett" #: libraries/DisplayResults.class.php:918 #, php-format msgid "Headers every %s rows" -msgstr "" +msgstr "Topptekst hver %s. rad" #: libraries/DisplayResults.class.php:1214 msgid "Sort by key" @@ -2789,10 +2785,9 @@ msgstr "Innstillinger" #: libraries/DisplayResults.class.php:1567 #: libraries/DisplayResults.class.php:1673 -#, fuzzy #| msgid "Partial Texts" msgid "Partial texts" -msgstr "Delvis tekst" +msgstr "Delvise tekster" #: libraries/DisplayResults.class.php:1568 #: libraries/DisplayResults.class.php:1677 @@ -2830,11 +2825,11 @@ msgstr "Nettvisertransformasjon" #: libraries/DisplayResults.class.php:1625 msgid "Well Known Text" -msgstr "" +msgstr "Velkjent Tekst" #: libraries/DisplayResults.class.php:1626 msgid "Well Known Binary" -msgstr "" +msgstr "Velkjent Binær" #: libraries/DisplayResults.class.php:3157 #: libraries/DisplayResults.class.php:3173 @@ -2885,13 +2880,12 @@ msgstr "Vis PDF-skjema" #: libraries/DisplayResults.class.php:5109 msgid "Visualize GIS data" -msgstr "" +msgstr "Visualiser GIS data" #: libraries/DisplayResults.class.php:5142 view_create.php:122 -#, fuzzy #| msgid "Create User" msgid "Create view" -msgstr "Opprett bruker" +msgstr "Opprett view" #: libraries/DisplayResults.class.php:5335 msgid "Link not found" @@ -5279,7 +5273,7 @@ msgstr "Gjenta topptekst" #: libraries/config/messages.inc.php:361 msgid "Save all edited cells at once" -msgstr "" +msgstr "Ikke lagre endrede celler umiddelbart" #: libraries/config/messages.inc.php:362 msgid "Directory where exports can be saved on server" @@ -5294,20 +5288,18 @@ msgid "Leave blank if not used" msgstr "La stå tom hvis ikke brukt" #: libraries/config/messages.inc.php:365 -#, fuzzy #| msgid "Host authentication order" msgid "Host authorization order" -msgstr "Rekkefølge for vertsautentisering" +msgstr "Rekkefølge for vertsautorisering" #: libraries/config/messages.inc.php:366 msgid "Leave blank for defaults" msgstr "La stå tom for standard" #: libraries/config/messages.inc.php:367 -#, fuzzy #| msgid "Host authentication rules" msgid "Host authorization rules" -msgstr "Vertsautentiseringsregler" +msgstr "Regler for vertsautorisering" #: libraries/config/messages.inc.php:368 msgid "Allow logins without a password" @@ -5575,10 +5567,9 @@ msgstr "" "La stå tom for ingen SQL spørringshistorie, anbefalt: [kbd]pma_tracking[/kbd]" #: libraries/config/messages.inc.php:419 -#, fuzzy #| msgid "Recall user name" msgid "Recently used table" -msgstr "Husk brukernavn" +msgstr "Nylig brukt tabell" #: libraries/config/messages.inc.php:420 msgid "" @@ -5859,10 +5850,9 @@ msgid "Whether to show hint or not" msgstr "" #: libraries/config/messages.inc.php:473 -#, fuzzy #| msgid "Show grid" msgid "Show hint" -msgstr "Vis rutenett" +msgstr "Vis hint" #: libraries/config/messages.inc.php:474 msgid "" @@ -6117,10 +6107,9 @@ msgid "Cookie authentication" msgstr "Autentisering informasjonskapsler" #: libraries/config/setup.forms.php:48 -#, fuzzy #| msgid "Host authentication order" msgid "HTTP authentication" -msgstr "Rekkefølge for vertsautentisering" +msgstr "HTTP autentisering" #: libraries/config/setup.forms.php:51 #, fuzzy @@ -6144,7 +6133,7 @@ msgstr "Open Document regneark" #: libraries/config/setup.forms.php:266 #: libraries/config/user_preferences.forms.php:168 msgid "Quick" -msgstr "" +msgstr "Rask" #: libraries/config/setup.forms.php:270 #: libraries/config/user_preferences.forms.php:172 @@ -6176,10 +6165,9 @@ msgid "Could not initialize Drizzle connection library" msgstr "" #: libraries/config/validate.lib.php:221 libraries/config/validate.lib.php:229 -#, fuzzy #| msgid "Could not connect to MySQL server" msgid "Could not connect to Drizzle server" -msgstr "Kunne ikke koble til MySQL tjener" +msgstr "Kunne ikke koble til Drizzle tjener" #: libraries/config/validate.lib.php:240 libraries/config/validate.lib.php:247 msgid "Could not connect to MySQL server" @@ -6226,18 +6214,18 @@ msgid "possible deep recursion attack" msgstr "" #: libraries/database_interface.lib.php:1989 -#, fuzzy #| msgid " the local MySQL server's socket is not correctly configured)" msgid "" "The server is not responding (or the local server's socket is not correctly " "configured)." -msgstr "(eller den lokale MySQL tjenerens sokkel er ikke korrekt konfigurert)" +msgstr "" +"Tjeneren svarer ikke (eller den lokale MySQL tjenerens sokkel er ikke " +"korrekt konfigurert)." #: libraries/database_interface.lib.php:1992 -#, fuzzy #| msgid "The server is not responding" msgid "The server is not responding." -msgstr "Tjeneren svarer ikke" +msgstr "Tjeneren svarer ikke." #: libraries/database_interface.lib.php:1997 msgid "Please check privileges of directory containing database." @@ -6281,7 +6269,6 @@ msgstr "MySQL 4.0 kompatibel" #: libraries/display_create_database.lib.php:21 #: libraries/display_create_database.lib.php:39 -#, fuzzy #| msgid "Create new database" msgid "Create database" msgstr "Opprett ny database" @@ -6376,7 +6363,7 @@ msgstr "Dump alle rader" #: libraries/display_export.lib.php:189 libraries/display_export.lib.php:210 msgid "Output:" -msgstr "" +msgstr "Utskrift:" #: libraries/display_export.lib.php:196 libraries/display_export.lib.php:222 #, php-format @@ -6436,10 +6423,9 @@ msgid "zipped" msgstr "Pakket (zip)" #: libraries/display_export.lib.php:337 -#, fuzzy #| msgid "\"gzipped\"" msgid "gzipped" -msgstr "Komprimert (gz)" +msgstr "gzippet" #: libraries/display_export.lib.php:339 #, fuzzy @@ -6448,17 +6434,15 @@ msgid "bzipped" msgstr "Komprimert (bz2)" #: libraries/display_export.lib.php:348 -#, fuzzy #| msgid "Save as file" msgid "View output as text" -msgstr "Lagre som fil" +msgstr "Vis utskrift som tekst" #: libraries/display_export.lib.php:353 libraries/display_import.lib.php:311 #: libraries/plugins/export/ExportCodegen.class.php:106 -#, fuzzy #| msgid "Format" msgid "Format:" -msgstr "Format" +msgstr "Format:" #: libraries/display_export.lib.php:358 msgid "Format-specific options:" @@ -6469,12 +6453,13 @@ msgid "" "Scroll down to fill in the options for the selected format and ignore the " "options for other formats." msgstr "" +"Bla ned for å fylle ut valgene for det valgte formatet og ignorere valgene " +"for andre formater." #: libraries/display_export.lib.php:367 libraries/display_import.lib.php:326 -#, fuzzy #| msgid "Encoding conversion" msgid "Encoding Conversion:" -msgstr "Kodingskonvertering" +msgstr "Kodingskonvertering:" #: libraries/display_git_revision.lib.php:59 #, php-format @@ -6580,10 +6565,9 @@ msgid "File uploads are not allowed on this server." msgstr "Filopplastinger er ikke tillatt på denne tjeneren." #: libraries/display_import.lib.php:275 -#, fuzzy #| msgid "Partial import" msgid "Partial Import:" -msgstr "Delvis importering" +msgstr "Delvis importering:" #: libraries/display_import.lib.php:281 #, php-format @@ -6614,7 +6598,7 @@ msgstr "Antall rader å hoppe over, fra første rad:" #: libraries/display_import.lib.php:317 msgid "Format-Specific Options:" -msgstr "" +msgstr "Format-spesifikke valg:" #: libraries/display_select_lang.lib.php:52 #: libraries/display_select_lang.lib.php:53 setup/frames/index.inc.php:75 From 75d8c484612409d7f06a03e24012845b153a2784 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 29 Jul 2012 04:42:38 +0200 Subject: [PATCH 14/19] Translated using Weblate. --- po/si.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/si.po b/po/si.po index d34418b682..3ca2b2505b 100644 --- a/po/si.po +++ b/po/si.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-27 10:40+0200\n" -"PO-Revision-Date: 2012-06-26 19:00+0200\n" +"PO-Revision-Date: 2012-07-28 18:20+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 1.0\n" +"X-Generator: Weblate 1.1\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354 #: libraries/DisplayResults.class.php:794 @@ -815,7 +815,7 @@ msgid "" "Chose \"GeomFromText\" from the \"Function\" column and paste the below " "string into the \"Value\" field" msgstr "" -"\"Function\" තීරුවෙන් \"GeomFromText\" තෝරා පහත ඇති දේ \"Value\" ක්ෂේත්‍රයට පිටපත් " +"\"ශ්‍රිතය\" තීරුවෙන් \"GeomFromText\" තෝරා පහත ඇති දේ \"අගය\" ක්ෂේත්‍රයට පිටපත් " "කරන්න" #: import.php:94 From 3e9a5f69dcbadd15ad848aec567b512456bd8dca Mon Sep 17 00:00:00 2001 From: Yasitha Pandithawatta Date: Sun, 29 Jul 2012 10:37:23 +0530 Subject: [PATCH 15/19] Test class for PMA_DBQbe --- test/classes/PMA_DBQbe_test.php | 400 +++++++++++++++++++++++++++++ test/classes/PMA_DbSearch_test.php | 14 + 2 files changed, 414 insertions(+) create mode 100644 test/classes/PMA_DBQbe_test.php diff --git a/test/classes/PMA_DBQbe_test.php b/test/classes/PMA_DBQbe_test.php new file mode 100644 index 0000000000..55ffb4a1b7 --- /dev/null +++ b/test/classes/PMA_DBQbe_test.php @@ -0,0 +1,400 @@ +object = $this->getMockForAbstractClass('PMA_DBQbe', array('pma')); + } + + /** + * Tears down the fixture, for example, closes a network connection. + * This method is called after a test is executed. + * + * @access protected + * @return void + */ + protected function tearDown() + { + unset($this->object); + } + + /** + * Call protected functions by making the visibitlity to public. + * + * @param string $name method name + * @param array $params parameters for the invocation + * + * @return the output from the protected method. + */ + private function _callProtectedFunction($name, $params) + { + $class = new ReflectionClass('PMA_DBQbe'); + $method = $class->getMethod($name); + $method->setAccessible(true); + return $method->invokeArgs($this->object, $params); + } + + /** + * Test for getCommonFunctions + */ + public function testGetCommonFunctions(){ + $this->assertTrue($this->object->getCommonFunctions() instanceof PMA_CommonFunctions); + } + + /** + * Test for _getSortSelectCell + */ + public function testGetSortSelectCell(){ + $this->assertEquals( + $this->_callProtectedFunction( + '_getSortSelectCell', + array(1) + ), + '' + ); + } + + /** + * Test for _getSortRow + */ + public function testGetSortRow(){ + $this->assertEquals( + $this->_callProtectedFunction( + '_getSortRow', + array() + ), + 'Sort:' + ); + } + + /** + * Test for _getShowRow + */ + public function testGetShowRow(){ + $this->assertEquals( + $this->_callProtectedFunction( + '_getShowRow', + array() + ), + 'Show:' + ); + } + + /** + * Test for _getCriteriaInputboxRow + */ + public function testGetCriteriaInputboxRow(){ + $this->assertEquals( + $this->_callProtectedFunction( + '_getCriteriaInputboxRow', + array() + ), + 'Criteria:' + ); + } + + /** + * Test for _getFootersOptions + */ + public function testGetFootersOptions(){ + $this->assertEquals( + $this->_callProtectedFunction( + '_getFootersOptions', + array('row') + ), + '
Add/Delete criteria rows:
' + ); + } + + /** + * Test for _getTableFooters + */ + public function testGetTableFooters(){ + $this->assertEquals( + $this->_callProtectedFunction( + '_getTableFooters', + array() + ), + '
Add/Delete criteria rows:
Add/Delete columns:
' + ); + } + + /** + * Test for _getAndOrColCell + */ + public function testGetAndOrColCell(){ + $this->assertEquals( + $this->_callProtectedFunction( + '_getAndOrColCell', + array(1) + ), + 'Or:  And:
Ins  Del' + ); + } + + /** + * Test for _getModifyColumnsRow + */ + public function testGetModifyColumnsRow(){ + $this->assertEquals( + $this->_callProtectedFunction( + '_getModifyColumnsRow', + array() + ), + 'Modify:Or:  And:
Ins  DelOr:  And:
Ins  DelOr:  And:
Ins  Del' + ); + } + + /** + * Test for _getInsDelAndOrCell + */ + public function testGetInsDelAndOrCell(){ + $GLOBALS['cell_align_right'] = 'cellAlign'; + $this->assertEquals( + $this->_callProtectedFunction( + '_getInsDelAndOrCell', + array(3, 'checked') + ), + '
Ins:And:
Del:Or:
' + ); + } + + /** + * Test for _getInputboxRow + */ + public function testGetInputboxRow(){ + $this->assertEquals( + $this->_callProtectedFunction( + '_getInputboxRow', + array(2,3) + ), + '' + ); + } + + /** + * Test for _getInsDelAndOrCriteriaRows + */ + public function testGetInsDelAndOrCriteriaRows(){ + $this->assertEquals( + $this->_callProtectedFunction( + '_getInsDelAndOrCriteriaRows', + array(2,3) + ), + '
Ins:And:
Del:Or:
' + ); + } + + /** + * Test for _getSelectClause + */ + public function testGetSelectClause(){ + $this->assertEquals( + $this->_callProtectedFunction( + '_getSelectClause', + array() + ), + '' + ); + } + + /** + * Test for _getWhereClause + */ + public function testGetWhereClause(){ + $this->assertEquals( + $this->_callProtectedFunction( + '_getWhereClause', + array() + ), + '' + ); + } + + /** + * Test for _getOrderByClause + */ + public function testGetOrderByClause(){ + $this->assertEquals( + $this->_callProtectedFunction( + '_getOrderByClause', + array() + ), + '' + ); + } + + /** + * Test for _getIndexes + */ + public function testGetIndexes(){ + if (! function_exists('PMA_DBI_get_table_indexes')) { + function PMA_DBI_get_table_indexes() + { + return array(2,3); + } + } + $this->assertEquals( + $this->_callProtectedFunction( + '_getIndexes', + array( + array('table1','table2'), + array('column1', 'column2', 'column3'), + array('column2') + ) + ), + array( + 'unique' => array(), + 'index' => array() + ) + ); + } + + /** + * Test for _getLeftJoinColumnCandidates + */ + public function test_getLeftJoinColumnCandidates(){ + if (! function_exists('PMA_DBI_select_db')) { + function PMA_DBI_select_db() + { + return 'pma'; + } + } + $this->assertEquals( + $this->_callProtectedFunction( + '_getLeftJoinColumnCandidates', + array( + array('table1','table2'), + array('column1', 'column2', 'column3'), + array('column2') + ) + ), + array( + 0 => 'column2' + ) + ); + } + + /** + * Test for _getMasterTable + */ + public function test_getMasterTable(){ + $this->assertEquals( + $this->_callProtectedFunction( + '_getMasterTable', + array( + array('table1','table2'), + array('column1', 'column2', 'column3'), + array('column2'), + array('pma') + ) + ), + 0 + ); + } + + /** + * Test for _getWhereClauseTablesAndColumns + */ + public function test_getWhereClauseTablesAndColumns(){ + $_POST['criteriaColumn'] = array('table1.id', 'table1.value', 'table1.name', 'table1.deleted'); + $this->assertEquals( + $this->_callProtectedFunction( + '_getWhereClauseTablesAndColumns', + array() + ), + array( + 'where_clause_tables' => array(), + 'where_clause_columns' => array() + ) + ); + } + + /** + * Test for _getFromClause + */ + public function testGetFromClause(){ + $this->assertEquals( + $this->_callProtectedFunction( + '_getFromClause', + array('relation') + ), + '`table1`' + ); + } + + /** + * Test for _getSQLQuery + */ + public function test_getSQLQuery(){ + $this->assertEquals( + $this->_callProtectedFunction( + '_getSQLQuery', + array('relation') + ), + 'FROM `table1` +' + ); + } +} diff --git a/test/classes/PMA_DbSearch_test.php b/test/classes/PMA_DbSearch_test.php index 5072b6fe77..cf88afc0fb 100644 --- a/test/classes/PMA_DbSearch_test.php +++ b/test/classes/PMA_DbSearch_test.php @@ -186,4 +186,18 @@ class PMA_DbSearch_test extends PHPUnit_Framework_TestCase Inside tables:Select All  / Unselect AllInside column:

' ); } + + /** + * Test for _getResultDivs + */ + public function testGetResultDivs(){ + $this->assertEquals( + $this->_callProtectedFunction( + '_getResultDivs', + array() + ), + '

' + ); + } + } From e03c14d3e1d9734035d577826ffde89b2abca15a Mon Sep 17 00:00:00 2001 From: ProUser Date: Sun, 29 Jul 2012 13:55:20 +0200 Subject: [PATCH 16/19] Translated using Weblate. --- po/sv.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/sv.po b/po/sv.po index 0fe9e12760..8ba351c3aa 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-07-27 10:40+0200\n" -"PO-Revision-Date: 2012-07-01 18:04+0200\n" +"PO-Revision-Date: 2012-07-29 13:55+0200\n" "Last-Translator: ProUser \n" "Language-Team: swedish \n" "Language: sv\n" @@ -7627,10 +7627,9 @@ msgstr "" "tabellnamn skapade med specialtecken eller nyckelord)" #: libraries/plugins/export/ExportSql.class.php:354 -#, fuzzy #| msgid "Object creation options" msgid "Data creation options" -msgstr "Alternativ för skapande av objekt" +msgstr "Valmöjligheter vid skapande av data" #: libraries/plugins/export/ExportSql.class.php:358 #: libraries/plugins/export/ExportSql.class.php:1573 From 8183c9deafdc39d673767a1257b8a0a2ff5c792d Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 29 Jul 2012 18:27:37 +0530 Subject: [PATCH 17/19] Disallow grid editing binary content when cfg['ProtectBinary'] == 'noblob' --- libraries/DisplayResults.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 0045bfb7a9..1966ff6064 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -3652,7 +3652,8 @@ class PMA_DisplayResults $is_analyse = $this->__get('_is_analyse'); $field_flags = PMA_DBI_field_flags($dt_result, $col_index); if (stristr($field_flags, self::BINARY_FIELD) - && $GLOBALS['cfg']['ProtectBinary'] === 'all' + && ($GLOBALS['cfg']['ProtectBinary'] == 'all' + || $GLOBALS['cfg']['ProtectBinary'] == 'noblob') ) { $class = str_replace('grid_edit', '', $class); } From 21b89133e05e94885f63bb295b0ea3430549e3e1 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 29 Jul 2012 18:52:16 +0530 Subject: [PATCH 18/19] Some coding style improvements --- libraries/DisplayResults.class.php | 5 ++++- pmd_pdf.php | 15 +++++++++++---- pmd_relation_new.php | 18 ++++++++---------- pmd_save_pos.php | 9 ++++++--- 4 files changed, 29 insertions(+), 18 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 1966ff6064..f5a0af3383 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -1431,7 +1431,10 @@ class PMA_DisplayResults && ($direction != self::DISP_DIR_HORIZONTAL_FLIPPED) ) { $comments_map = array(); - if (isset($analyzed_sql[0]) && is_array($analyzed_sql[0]) && isset($analyzed_sql[0]['table_ref'])) { + if (isset($analyzed_sql[0]) + && is_array($analyzed_sql[0]) + && isset($analyzed_sql[0]['table_ref']) + ) { foreach ($analyzed_sql[0]['table_ref'] as $tbl) { $tb = $tbl['table_true_name']; $comments_map[$tb] = PMA_getComments($this->__get('_db'), $tb); diff --git a/pmd_pdf.php b/pmd_pdf.php index d5a1055261..69260da7cd 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -40,8 +40,10 @@ if (isset($mode)) { die(""); } - $pmd_table = $common_functions->backquote($GLOBALS['cfgRelation']['db']) . '.' . $common_functions->backquote($GLOBALS['cfgRelation']['designer_coords']); - $pma_table = $common_functions->backquote($GLOBALS['cfgRelation']['db']) . '.' . $common_functions->backquote($cfgRelation['table_coords']); + $pmd_table = $common_functions->backquote($GLOBALS['cfgRelation']['db']) . '.' + . $common_functions->backquote($GLOBALS['cfgRelation']['designer_coords']); + $pma_table = $common_functions->backquote($GLOBALS['cfgRelation']['db']) . '.' + . $common_functions->backquote($cfgRelation['table_coords']); $scale_q = $common_functions->sqlAddSlashes($scale); if ('create_export' == $mode) { @@ -57,7 +59,12 @@ if (isset($mode)) { $pdf_page_number_q = $common_functions->sqlAddSlashes($pdf_page_number); if ('export' == $mode) { - $sql = "REPLACE INTO " . $pma_table . " (db_name, table_name, pdf_page_number, x, y) SELECT db_name, table_name, " . $pdf_page_number_q . ", ROUND(x/" . $scale_q . ") , ROUND(y/" . $scale_q . ") y FROM " . $pmd_table . " WHERE db_name = '" . $common_functions->sqlAddSlashes($db) . "'"; + $sql = "REPLACE INTO " . $pma_table + . " (db_name, table_name, pdf_page_number, x, y)" + . " SELECT db_name, table_name, " . $pdf_page_number_q . "," + . " ROUND(x/" . $scale_q . ") , ROUND(y/" . $scale_q . ") y" + . " FROM " . $pmd_table + . " WHERE db_name = '" . $common_functions->sqlAddSlashes($db) . "'"; PMA_queryAsControlUser($sql, true, PMA_DBI_QUERY_STORE); } @@ -72,7 +79,7 @@ if (isset($mode)) { AND ' . $pmd_table . '.`table_name` = ' . $pma_table . '.`table_name` AND - ' . $pmd_table . '.`db_name`=\''. $common_functions->sqlAddSlashes($db) .'\' + ' . $pmd_table . '.`db_name`=\''. $common_functions->sqlAddSlashes($db) . '\' AND pdf_page_number = ' . $pdf_page_number_q . ';', true, PMA_DBI_QUERY_STORE ); diff --git a/pmd_relation_new.php b/pmd_relation_new.php index bb8cb8b1cd..d78a8eb77e 100644 --- a/pmd_relation_new.php +++ b/pmd_relation_new.php @@ -35,14 +35,14 @@ if ($common_functions->isForeignKeySupported($type_T1) ) { PMD_return_new(0, __('Error: relation already exists.')); } -// note: in InnoDB, the index does not requires to be on a PRIMARY -// or UNIQUE key -// improve: check all other requirements for InnoDB relations + // note: in InnoDB, the index does not requires to be on a PRIMARY + // or UNIQUE key + // improve: check all other requirements for InnoDB relations $result = PMA_DBI_query( 'SHOW INDEX FROM ' . $common_functions->backquote($db) . '.' . $common_functions->backquote($T1) . ';' ); - $index_array1 = array(); // will be use to emphasis prim. keys in the table view + $index_array1 = array(); // will be use to emphasis prim. keys in the table view while ($row = PMA_DBI_fetch_assoc($result)) { $index_array1[$row['Column_name']] = 1; } @@ -52,7 +52,7 @@ if ($common_functions->isForeignKeySupported($type_T1) 'SHOW INDEX FROM ' . $common_functions->backquote($db) . '.' . $common_functions->backquote($T2) . ';' ); - $index_array2 = array(); // will be used to emphasis prim. keys in the table view + $index_array2 = array(); // will be used to emphasis prim. keys in the table view while ($row = PMA_DBI_fetch_assoc($result)) { $index_array2[$row['Column_name']] = 1; } @@ -76,11 +76,9 @@ if ($common_functions->isForeignKeySupported($type_T1) } $upd_query .= ';'; PMA_DBI_try_query($upd_query) or PMD_return_new(0, __('Error: Relation not added.')); - PMD_return_new(1, __('FOREIGN KEY relation added')); + PMD_return_new(1, __('FOREIGN KEY relation added')); } - -// internal (pmadb) relation -} else { +} else { // internal (pmadb) relation if ($GLOBALS['cfgRelation']['relwork'] == false) { PMD_return_new(0, _('General relation features') . ':' . _('Disabled')); } else { @@ -102,7 +100,7 @@ if ($common_functions->isForeignKeySupported($type_T1) } else { PMD_return_new(0, __('Error: Relation not added.')); } - } + } } function PMD_return_new($b,$ret) diff --git a/pmd_save_pos.php b/pmd_save_pos.php index a0cfc944ea..a009ef146a 100644 --- a/pmd_save_pos.php +++ b/pmd_save_pos.php @@ -38,17 +38,20 @@ foreach ($post_params as $one_post_param) { } foreach ($t_x as $key => $value) { - $KEY = empty($IS_AJAX) ? urldecode($key) : $key; // table name decode (post PDF exp/imp) + // table name decode (post PDF exp/imp) + $KEY = empty($IS_AJAX) ? urldecode($key) : $key; list($DB,$TAB) = explode(".", $KEY); PMA_queryAsControlUser( - 'DELETE FROM ' . $common_functions->backquote($GLOBALS['cfgRelation']['db']) . '.' . $common_functions->backquote($GLOBALS['cfgRelation']['designer_coords']) + 'DELETE FROM ' . $common_functions->backquote($GLOBALS['cfgRelation']['db']) + . '.' . $common_functions->backquote($GLOBALS['cfgRelation']['designer_coords']) . ' WHERE `db_name` = \'' . $common_functions->sqlAddSlashes($DB) . '\'' . ' AND `table_name` = \'' . $common_functions->sqlAddSlashes($TAB) . '\'', true, PMA_DBI_QUERY_STORE ); PMA_queryAsControlUser( - 'INSERT INTO ' . $common_functions->backquote($GLOBALS['cfgRelation']['db']) . '.' . $common_functions->backquote($GLOBALS['cfgRelation']['designer_coords']) + 'INSERT INTO ' . $common_functions->backquote($GLOBALS['cfgRelation']['db']) + . '.' . $common_functions->backquote($GLOBALS['cfgRelation']['designer_coords']) . ' (db_name, table_name, x, y, v, h)' . ' VALUES (' . '\'' . $common_functions->sqlAddSlashes($DB) . '\', ' From 9a47688dc6b3fe185159a9d5afc7492e5a1e7c17 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 29 Jul 2012 19:25:52 +0530 Subject: [PATCH 19/19] Various coding style improvements --- prefs_manage.php | 11 +++++-- querywindow.php | 6 ++-- schema_export.php | 6 +++- server_binlog.php | 4 ++- tbl_get_field.php | 4 ++- tbl_gis_visualization.php | 7 ++-- tbl_indexes.php | 67 ++++++++++++++++++++------------------- tbl_move_copy.php | 10 ++++-- tbl_relation.php | 29 +++++++++++------ tbl_structure.php | 5 +-- tbl_tracking.php | 8 ++--- 11 files changed, 96 insertions(+), 61 deletions(-) diff --git a/prefs_manage.php b/prefs_manage.php index c15311598e..6de37a9033 100644 --- a/prefs_manage.php +++ b/prefs_manage.php @@ -21,7 +21,9 @@ require 'libraries/config/user_preferences.forms.php'; PMA_userprefs_pageinit(); $error = ''; -if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') == 'text_file') { +if (isset($_POST['submit_export']) + && filter_input(INPUT_POST, 'export_type') == 'text_file' +) { // export to JSON file PMA_Response::getInstance()->disable(); $filename = 'phpMyAdmin-config-' . urlencode(PMA_getenv('HTTP_HOST')) . '.json'; @@ -78,7 +80,8 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') == if (! is_array($config)) { $error = __('Could not import configuration'); } else { - // sanitize input values: treat them as though they came from HTTP POST request + // sanitize input values: treat them as though + // they came from HTTP POST request $form_display = new FormDisplay(); foreach ($forms as $formset_id => $formset) { foreach ($formset as $form_name => $form) { @@ -192,7 +195,9 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') == if ($result === true) { $params = array(); if ($_SESSION['PMA_Theme_Manager']->theme->getId() != 'original') { - $GLOBALS['PMA_Config']->removeCookie($_SESSION['PMA_Theme_Manager']->getThemeCookieName()); + $GLOBALS['PMA_Config']->removeCookie( + $_SESSION['PMA_Theme_Manager']->getThemeCookieName() + ); unset($_SESSION['PMA_Theme_Manager']); unset($_SESSION['PMA_Theme']); $params['reload_left_frame'] = true; diff --git a/querywindow.php b/querywindow.php index 62d5854e9b..0f872994d7 100644 --- a/querywindow.php +++ b/querywindow.php @@ -124,14 +124,14 @@ $scripts->addFile('common.js'); $scripts->addFile('querywindow.js'); if (PMA_isValid($_REQUEST['auto_commit'], 'identical', 'true')) { - $scripts->addEvent('load','PMA_queryAutoCommit'); + $scripts->addEvent('load', 'PMA_queryAutoCommit'); } if (PMA_isValid($_REQUEST['init'])) { - $scripts->addEvent('load','PMA_querywindowResize'); + $scripts->addEvent('load', 'PMA_querywindowResize'); } // always set focus to the textarea if ($querydisplay_tab == 'sql' || $querydisplay_tab == 'full') { - $scripts->addEvent('load','PMA_querywindowSetFocus'); + $scripts->addEvent('load', 'PMA_querywindowSetFocus'); } echo '
'; diff --git a/schema_export.php b/schema_export.php index 26d2c6e6ae..ac399a2131 100644 --- a/schema_export.php +++ b/schema_export.php @@ -56,7 +56,11 @@ PMA_DBI_select_db($db); $path = PMA_securePath(ucfirst($export_type)); if (!file_exists('libraries/schema/' . $path . '_Relation_Schema.class.php')) { - PMA_Export_Relation_Schema::dieSchema($_POST['chpage'], $export_type, __('File doesn\'t exist')); + PMA_Export_Relation_Schema::dieSchema( + $_POST['chpage'], + $export_type, + __('File doesn\'t exist') + ); } require "libraries/schema/".$path."_Relation_Schema.class.php"; $obj_schema = eval("new PMA_".$path."_Relation_Schema();"); diff --git a/server_binlog.php b/server_binlog.php index ee616f35c3..e3d25dcd07 100644 --- a/server_binlog.php +++ b/server_binlog.php @@ -29,7 +29,9 @@ if (! isset($_REQUEST['pos'])) { $pos = (int) $_REQUEST['pos']; } -if (! isset($_REQUEST['log']) || ! array_key_exists($_REQUEST['log'], $binary_logs)) { +if (! isset($_REQUEST['log']) + || ! array_key_exists($_REQUEST['log'], $binary_logs) +) { $_REQUEST['log'] = ''; } else { $url_params['log'] = $_REQUEST['log']; diff --git a/tbl_get_field.php b/tbl_get_field.php index 8d6d80aa3c..76d75f7c4f 100644 --- a/tbl_get_field.php +++ b/tbl_get_field.php @@ -32,7 +32,9 @@ if (!PMA_DBI_get_columns($db, $table)) { } /* Grab data */ -$sql = 'SELECT ' . $common_functions->backquote($transform_key) . ' FROM ' . $common_functions->backquote($table) . ' WHERE ' . $where_clause . ';'; +$sql = 'SELECT ' . $common_functions->backquote($transform_key) + . ' FROM ' . $common_functions->backquote($table) + . ' WHERE ' . $where_clause . ';'; $result = PMA_DBI_fetch_value($sql); /* Check return code */ diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php index 73ea8210ab..3f05989c77 100644 --- a/tbl_gis_visualization.php +++ b/tbl_gis_visualization.php @@ -90,11 +90,14 @@ if (isset($_REQUEST['saveToFile'])) { exit(); } -$svg_support = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER <= 8) ? false : true; +$svg_support = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER <= 8) + ? false : true; $format = $svg_support ? 'svg' : 'png'; // get the chart and settings after chart generation -$visualization = PMA_GIS_visualizationResults($data, $visualizationSettings, $format); +$visualization = PMA_GIS_visualizationResults( + $data, $visualizationSettings, $format +); /** * Displays the page diff --git a/tbl_indexes.php b/tbl_indexes.php index 2f5fd72fe2..d569f7443f 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -22,7 +22,7 @@ foreach (PMA_DBI_get_columns_full($db, $table) as $row) { $tmp[2] = substr( preg_replace('@([^,])\'\'@', '\\1\\\'', ',' . $tmp[2]), 1 ); - $fields[$row['Field']] = $tmp[1] . '(' + $fields[$row['Field']] = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')'; } else { $fields[$row['Field']] = $row['Type']; @@ -50,39 +50,41 @@ if (isset($_REQUEST['do_save_data'])) { $error = false; // $sql_query is the one displayed in the query box - $sql_query = 'ALTER TABLE ' . $common_functions->backquote($db) . '.' . $common_functions->backquote($table); + $sql_query = 'ALTER TABLE ' . $common_functions->backquote($db) + . '.' . $common_functions->backquote($table); // Drops the old index if (! empty($_REQUEST['old_index'])) { if ($_REQUEST['old_index'] == 'PRIMARY') { $sql_query .= ' DROP PRIMARY KEY,'; } else { - $sql_query .= ' DROP INDEX ' + $sql_query .= ' DROP INDEX ' . $common_functions->backquote($_REQUEST['old_index']) . ','; } } // end if // Builds the new one switch ($index->getType()) { - case 'PRIMARY': - if ($index->getName() == '') { - $index->setName('PRIMARY'); - } elseif ($index->getName() != 'PRIMARY') { - $error = PMA_Message::error(__( - 'The name of the primary key must be "PRIMARY"!')); - } - $sql_query .= ' ADD PRIMARY KEY'; - break; - case 'FULLTEXT': - case 'UNIQUE': - case 'INDEX': - case 'SPATIAL': - if ($index->getName() == 'PRIMARY') { - $error = PMA_Message::error(__('Can\'t rename index to PRIMARY!')); - } - $sql_query .= ' ADD ' . $index->getType() . ' ' - . ($index->getName() ? $common_functions->backquote($index->getName()) : ''); - break; + case 'PRIMARY': + if ($index->getName() == '') { + $index->setName('PRIMARY'); + } elseif ($index->getName() != 'PRIMARY') { + $error = PMA_Message::error( + __('The name of the primary key must be "PRIMARY"!') + ); + } + $sql_query .= ' ADD PRIMARY KEY'; + break; + case 'FULLTEXT': + case 'UNIQUE': + case 'INDEX': + case 'SPATIAL': + if ($index->getName() == 'PRIMARY') { + $error = PMA_Message::error(__('Can\'t rename index to PRIMARY!')); + } + $sql_query .= ' ADD ' . $index->getType() . ' ' + . ($index->getName() ? $common_functions->backquote($index->getName()) : ''); + break; } // end switch $index_fields = array(); @@ -103,8 +105,9 @@ if (isset($_REQUEST['do_save_data'])) { if (! $error) { PMA_DBI_query($sql_query); - $message = PMA_Message::success(__( - 'Table %1$s has been altered successfully')); + $message = PMA_Message::success( + __('Table %1$s has been altered successfully') + ); $message->addParam($table); if ($GLOBALS['is_ajax_request'] == true) { @@ -161,8 +164,8 @@ if (isset($_REQUEST['index']) && is_array($_REQUEST['index'])) { ?>
onsubmit="if (typeof(this.elements['index[Key_name]'].disabled) != 'undefined') { this.elements['index[Key_name]'].disabled = false}"> @@ -249,16 +252,16 @@ foreach ($index->getColumns() as $column) { $field_type) { - if (($index->getType() != 'FULLTEXT' + if (($index->getType() != 'FULLTEXT' || preg_match('/(char|text)/i', $field_type)) - && ($index->getType() != 'SPATIAL' + && ($index->getType() != 'SPATIAL' || in_array($field_type, $spatial_types)) ) { echo '' . "\n"; } @@ -285,7 +288,7 @@ for ($i = 0; $i < $add_fields; $i++) { $field_type) { echo '' . "\n"; } // end foreach $fields diff --git a/tbl_move_copy.php b/tbl_move_copy.php index 5309fa689d..1947144bf8 100644 --- a/tbl_move_copy.php +++ b/tbl_move_copy.php @@ -58,13 +58,17 @@ if (PMA_isValid($_REQUEST['new_name'])) { } else { $message = PMA_Message::success(__('Table %s has been copied to %s.')); } - $old = $common_functions->backquote($db) . '.' . $common_functions->backquote($table); + $old = $common_functions->backquote($db) . '.' + . $common_functions->backquote($table); $message->addParam($old); - $new = $common_functions->backquote($_REQUEST['target_db']) . '.' . $common_functions->backquote($_REQUEST['new_name']); + $new = $common_functions->backquote($_REQUEST['target_db']) . '.' + . $common_functions->backquote($_REQUEST['new_name']); $message->addParam($new); /* Check: Work on new table or on old table? */ - if (isset($_REQUEST['submit_move']) || PMA_isValid($_REQUEST['switch_to_new'])) { + if (isset($_REQUEST['submit_move']) + || PMA_isValid($_REQUEST['switch_to_new']) + ) { $db = $_REQUEST['target_db']; $table = $_REQUEST['new_name']; } diff --git a/tbl_relation.php b/tbl_relation.php index 96e7942a0e..21106a297a 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -5,11 +5,14 @@ * * includes phpMyAdmin relations and InnoDB relations * - * @todo fix name handling: currently names with dots (.) are not properly handled for internal relations (but foreign keys relations are correct) + * @todo fix name handling: currently names with dots (.) are not properly handled + * for internal relations (but foreign keys relations are correct) * @todo foreign key constraints require both fields being of equal type and size * @todo check foreign fields to be from same type and size, all other makes no sense - * @todo add an link to create an index required for constraints, or an option to do automatically - * @todo if above todos are fullfilled we can add all fields meet requirements in the select dropdown + * @todo add an link to create an index required for constraints, + * or an option to do automatically + * @todo if above todos are fullfilled we can add all fields meet requirements + * in the select dropdown * @package PhpMyAdmin */ @@ -108,7 +111,9 @@ function PMA_backquote_split($text) if (false === $first_backquote || false === $second_backquote) { break; } - $elements[] = substr($text, $first_backquote, $second_backquote - $first_backquote + 1); + $elements[] = substr( + $text, $first_backquote, $second_backquote - $first_backquote + 1 + ); $pos = $second_backquote + 1; } return($elements); @@ -361,15 +366,15 @@ if ($cfgRelation['relwork'] // same engine. if ($common_functions->isForeignKeySupported($tbl_storage_engine)) { - $tab_query = 'SHOW TABLE STATUS FROM ' . $common_functions->backquote($db); + $tab_query = 'SHOW TABLE STATUS FROM ' . $common_functions->backquote($db); // [0] of the row is the name // [1] is the type } else { - $tab_query = 'SHOW TABLES FROM ' . $common_functions->backquote($db); + $tab_query = 'SHOW TABLES FROM ' . $common_functions->backquote($db); // [0] of the row is the name } - $tab_rs = PMA_DBI_query($tab_query, null, PMA_DBI_QUERY_STORE); + $tab_rs = PMA_DBI_query($tab_query, null, PMA_DBI_QUERY_STORE); $selectboxall[] = ''; $selectboxall_foreign[] = ''; @@ -377,7 +382,10 @@ if ($cfgRelation['relwork'] $current_table = new PMA_Table($curr_table[0], $db); // explicitely ask for non-quoted list of indexed columns - $selectboxall = array_merge($selectboxall, $current_table->getUniqueColumns($backquoted = false)); + $selectboxall = array_merge( + $selectboxall, + $current_table->getUniqueColumns($backquoted = false) + ); // if foreign keys are supported, collect all keys from other // tables of the same engine @@ -387,7 +395,10 @@ if ($cfgRelation['relwork'] ) { // explicitely ask for non-quoted list of indexed columns // need to obtain backquoted values to support dots inside values - $selectboxall_foreign = array_merge($selectboxall_foreign, $current_table->getIndexedColumns($backquoted = true)); + $selectboxall_foreign = array_merge( + $selectboxall_foreign, + $current_table->getIndexedColumns($backquoted = true) + ); } } // end while over tables } // end if diff --git a/tbl_structure.php b/tbl_structure.php index 92ad9e1473..c84c9cf56a 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -65,7 +65,8 @@ if (! empty($submit_mult) && isset($_REQUEST['selected_fld'])) { // what is this htmlspecialchars() for?? //$sql_query .= ' FROM ' . backquote(htmlspecialchars($table)); - $sql_query .= ' FROM ' . $common_functions->backquote($db) . '.' . $common_functions->backquote($table); + $sql_query .= ' FROM ' . $common_functions->backquote($db) + . '.' . $common_functions->backquote($table); include 'sql.php'; exit; } else { @@ -733,7 +734,7 @@ if (! $tbl_is_view && 'ARCHIVE' != $tbl_storage_engine ) { echo $common_functions->getDivForSliderEffect('indexes', __('Indexes')); - + /** * Display indexes */ diff --git a/tbl_tracking.php b/tbl_tracking.php index 962ce22738..da28b99b7b 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -55,10 +55,10 @@ if (isset($_REQUEST['report_export'])) { /** * Filters tracking entries * - * @param array the entries to filter - * @param string "from" date - * @param string "to" date - * @param string users + * @param array $data the entries to filter + * @param string $filter_ts_from "from" date + * @param string $filter_ts_to "to" date + * @param string $filter_users users * * @return array filtered entries */