From 2e1d1474115313bce9bde0ae455032ebf2241589 Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Wed, 25 Jul 2012 11:27:14 +0100 Subject: [PATCH 01/28] Autoselect username input on cookie login page --- ChangeLog | 1 + js/functions.js | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7f30c2356d..f3e77b5369 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,7 @@ VerboseMultiSubmit, ReplaceHelpImg + Add Ajax support to Fast filter in order to search the term in all database tables - bug #3535015 [navi] DbFilter, TableFilter clear button hidden on Chrome + rfe #3528994 [interface] Allow wrapping possibly long values in replication-status table ++ [interface] Autoselect username input on cookie login page 3.5.3.0 (not yet released) - bug #3539044 [interface] Browse mode "Show" button gives blank page if no results anymore diff --git a/js/functions.js b/js/functions.js index b6195c13bf..cb84e9afc7 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3868,4 +3868,5 @@ $(function () { */ $(function () { $('.js-show').show(); + $('#loginform #input_username').select(); }); From d3c06829e800bd11ee46ddc069ee4da54d48f960 Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Wed, 25 Jul 2012 13:04:27 +0100 Subject: [PATCH 02/28] Speed up selectors --- js/functions.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/js/functions.js b/js/functions.js index cb84e9afc7..321ba71832 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3867,6 +3867,7 @@ $(function () { * Reveal the login form to users with JS enabled */ $(function () { - $('.js-show').show(); - $('#loginform #input_username').select(); + var $loginform = $('#loginform'); + $loginform.find('.js-show').show(); + $loginform.find('#input_username').select(); }); From b246878717a7c414bfce4cdccdf1e1b30cb547ef Mon Sep 17 00:00:00 2001 From: Alex Marin Date: Fri, 3 Aug 2012 16:55:51 +0300 Subject: [PATCH 03/28] oop: check for undefined variables --- libraries/plugin_interface.lib.php | 19 +++++++++++-------- libraries/plugins/export/ExportOdt.class.php | 1 + 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index 2a83cf0a67..dd98bcbd88 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -246,7 +246,7 @@ function PMA_pluginGetOneOption( } - if ($properties == null) { + if (! isset($properties)) { $not_subgroup_header = true; $properties = $propertyGroup->getProperties(); } @@ -385,8 +385,9 @@ function PMA_pluginGetOneOption( $ret .= ''; } else { // end main group - if ($not_subgroup_header) + if (! empty($not_subgroup_header)) { $ret .= ''; + } } if (method_exists($propertyGroup, "getDoc")){ @@ -411,12 +412,14 @@ function PMA_pluginGetOneOption( } // Close the list element after $doc link is displayed - if ($property_class == 'BoolPropertyItem' - || $property_class == 'MessageOnlyPropertyItem' - || $property_class == 'SelectPropertyItem' - || $property_class == 'TextPropertyItem' - ) { - $ret .= ''; + if (isset($property_class)) { + if ($property_class == 'BoolPropertyItem' + || $property_class == 'MessageOnlyPropertyItem' + || $property_class == 'SelectPropertyItem' + || $property_class == 'TextPropertyItem' + ) { + $ret .= ''; + } } $ret .= "\n"; return $ret; diff --git a/libraries/plugins/export/ExportOdt.class.php b/libraries/plugins/export/ExportOdt.class.php index 2556514928..e01f57f499 100644 --- a/libraries/plugins/export/ExportOdt.class.php +++ b/libraries/plugins/export/ExportOdt.class.php @@ -53,6 +53,7 @@ class ExportOdt extends ExportPlugin include_once "$props/options/items/TextPropertyItem.class.php"; include_once "$props/options/items/BoolPropertyItem.class.php"; include_once "$props/options/items/HiddenPropertyItem.class.php"; + include_once "$props/options/items/RadioPropertyItem.class.php"; $exportPluginProperties = new ExportPluginProperties(); $exportPluginProperties->setText('Open Document Text'); From c2b54f62b178f9c7b034895af88934e2a5b040fb Mon Sep 17 00:00:00 2001 From: Alex Marin Date: Fri, 3 Aug 2012 17:12:20 +0300 Subject: [PATCH 04/28] oop: fix properties for ExportTexytext --- libraries/plugins/export/ExportTexytext.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/plugins/export/ExportTexytext.class.php b/libraries/plugins/export/ExportTexytext.class.php index 4907b4e73b..df5414a91f 100644 --- a/libraries/plugins/export/ExportTexytext.class.php +++ b/libraries/plugins/export/ExportTexytext.class.php @@ -73,10 +73,6 @@ class ExportTexytext extends ExportPlugin // add the main group to the root group $exportSpecificOptions->addProperty($dumpWhat); - // set the options for the export plugin property item - $exportPluginProperties->setOptions($exportSpecificOptions); - $this->properties = $exportPluginProperties; - // data options main group $dataOptions = new OptionsPropertyMainGroup(); $dataOptions->setName("data"); @@ -93,6 +89,10 @@ class ExportTexytext extends ExportPlugin $dataOptions->addProperty($leaf); // add the main group to the root group $exportSpecificOptions->addProperty($dataOptions); + + // set the options for the export plugin property item + $exportPluginProperties->setOptions($exportSpecificOptions); + $this->properties = $exportPluginProperties; } /** From b00ae196dbd7b645fabc1a0223e58e43eb8278a5 Mon Sep 17 00:00:00 2001 From: shanyan baishui Date: Sat, 4 Aug 2012 06:39:43 +0200 Subject: [PATCH 05/28] Translated using Weblate. --- po/zh_CN.po | 76 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 25 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 92149f7a64..8861c9a550 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,15 +4,16 @@ 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-23 19:45+0200\n" +"PO-Revision-Date: 2012-08-04 06:39+0200\n" "Last-Translator: shanyan baishui \n" -"Language-Team: chinese_simplified \n" +"Language-Team: Chinese (China) " +"\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 1.1\n" +"X-Generator: Weblate 1.2\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:353 #: libraries/display_tbl.lib.php:359 server_privileges.php:1677 @@ -1974,7 +1975,7 @@ msgstr "点击下箭头以设置显示的字段" msgid "" "This table does not contain a unique column. Features related to the grid " "edit, checkbox, Edit, Copy and Delete links may not work after saving." -msgstr "" +msgstr "该表没有唯一字段。单元格编辑、复选框、编辑、复制和删除链接相关功能可能无法正常使用。" #: js/messages.php:355 msgid "" @@ -6544,7 +6545,7 @@ msgstr "未找到用于 GIS 可视化的数据。" #: libraries/header_http.inc.php:15 libraries/header_meta_style.inc.php:15 msgid "GLOBALS overwrite attempt" -msgstr "" +msgstr "企图覆盖 GLOBALS" #: libraries/header_printview.inc.php:49 libraries/header_printview.inc.php:57 msgid "SQL result" @@ -11725,7 +11726,7 @@ msgstr "查询缓存模式" #: po/advisory_rules.php:76 msgid "Suboptimal caching method." -msgstr "" +msgstr "最佳缓存模式。" #: po/advisory_rules.php:77 msgid "" @@ -11804,6 +11805,10 @@ msgid "" "using this formula: (query_cache_size - qcache_free_memory) / " "qcache_queries_in_cache" msgstr "" +"大量碎片很可能会增加 Qcache_lowmem_prunes 。这可能由 {query_cache_size} " +"过小而导致大量查询缓存低内存清理。刷新查询缓存 (可能锁住查询缓存很长时间) 可以临时解决这个问题。仔细调整 " +"{query_cache_min_res_unit} 到一个更小的值将会有所帮助，如您可以使用下列公式来计算并设置您查询缓存大小平均值: (查询缓存大小 " +"- 查询缓存剩余大小) / 查询缓存中的查询数量" #: po/advisory_rules.php:93 #, php-format @@ -11815,22 +11820,21 @@ msgstr "" #: po/advisory_rules.php:95 msgid "Query cache low memory prunes" -msgstr "" +msgstr "查询缓存低内存清理" #: po/advisory_rules.php:96 -#, fuzzy #| msgid "The amount of free memory for query cache." msgid "" "Cached queries are removed due to low query cache memory from the query " "cache." -msgstr "查询缓存中空闲的内存总数。" +msgstr "在查询缓存内存过低时会清理已缓存的查询。" #: po/advisory_rules.php:97 msgid "" "You might want to increase {query_cache_size}, however keep in mind that the " "overhead of maintaining the cache is likely to increase with its size, so do " "this in small increments and monitor the results." -msgstr "" +msgstr "您可能需要增加 {query_cache_size}，但请注意增加它可能会导致的维护开销，所以请慢慢增加并观察结果。" #: po/advisory_rules.php:98 #, php-format @@ -11847,7 +11851,7 @@ msgstr "查询缓存最大值" msgid "" "The query cache size is above 128 MiB. Big query caches may cause " "significant overhead that is required to maintain the cache." -msgstr "" +msgstr "查询缓存超过 128 MB 。过大的查询缓存可能会引起额外的维护开销。" #: po/advisory_rules.php:102 msgid "" @@ -11868,7 +11872,7 @@ msgstr "查询缓存结果最小大小" #: po/advisory_rules.php:106 msgid "" "The max size of the result set in the query cache is the default of 1 MiB." -msgstr "" +msgstr "查询缓存结果最大大小已设为默认值 1 MB 。" #: po/advisory_rules.php:107 msgid "" @@ -11881,6 +11885,9 @@ msgid "" "(often invalidated due to table updates) increasing {query_cache_limit} " "might reduce efficiency." msgstr "" +"修改 {query_cache_limit} (通常是增加) 可能提升效率。该变量决定可能要插入到查询缓存中查询结果的最大大小。若多数超过 1 MB " +"的查询结果能很好的缓存 (多读、少写) 则增加 {query_cache_limit} 将会提升效率。若多数超过 1 MB 的查询结果不能很好的缓存 " +"(通常因为表更新而失效) 增加 {query_cache_limit} 将会降低效率。" #: po/advisory_rules.php:108 msgid "query_cache_limit is set to 1 MiB" @@ -12028,7 +12035,7 @@ msgstr "这说明很多查询都需要全表扫描。请在合适的地方添加 #, php-format msgid "" "Rate of reading next table row: %s, this value should be less than 1 per hour" -msgstr "" +msgstr "下一行读取率: %s，该值应低于 1 每小时" #: po/advisory_rules.php:145 msgid "tmp_table_size vs. max_heap_table_size" @@ -12044,7 +12051,7 @@ msgid "" "value of either to determine the maximum size of in-memory tables. So if you " "wish to increase the in-memory table limit you will have to increase the " "other value as well." -msgstr "" +msgstr "若您故意改变了其中一个值: 服务器使用较低的值来确定内存表的最大大小。如果您想增加内存表的大小您应该同时修改另一个值。" #: po/advisory_rules.php:148 #, php-format @@ -12071,6 +12078,10 @@ msgid "" "mentioned in the beginning of an Article by the Pythian Group" msgstr "" +"增加 {max_heap_table_size} 和 {tmp_table_size} " +"可能会有帮助。但有些临时表总是会写入硬盘，和这些变量无关。要避免这些，您需要重写您的查询来避免 Pythian " +"小组的文章开头所提到的这些条件 (临时表内: 具有 BLOB 或 TEXT 字段或具有大于 512 字节的字段)" #: po/advisory_rules.php:153 #, php-format @@ -12095,13 +12106,17 @@ msgid "" "mentioned in the MySQL Documentation" msgstr "" +"增加 {max_heap_table_size} 和 {tmp_table_size} " +"可能会有帮助。但有些临时表总是会写入硬盘，和这些变量无关。要避免这些，您需要重写您的查询来避免 MySQL 文档中所提到的这些条件 (临时表内: 具有 BLOB 或 TEXT 字段或具有大于 512 字节的字段)" #: po/advisory_rules.php:158 #, php-format msgid "" "Rate of temporary tables being written to disk: %s, this value should be " "less than 1 per hour" -msgstr "" +msgstr "临时表硬盘写入率: %s，该值应低于 1 每小时" #: po/advisory_rules.php:160 msgid "MyISAM key buffer size" @@ -12122,36 +12137,35 @@ msgid "key_buffer_size is 0" msgstr "key_buffer_size 为 0" #: po/advisory_rules.php:165 -#, fuzzy, php-format +#, php-format #| msgid "Sort buffer size" msgid "Max %% MyISAM key buffer ever used" -msgstr "排序缓存大小" +msgstr "最大 %% MyISAM 索引缓存从未使用" #: po/advisory_rules.php:166 po/advisory_rules.php:171 -#, fuzzy, php-format +#, php-format #| msgid "Sort buffer size" msgid "MyISAM key buffer (index cache) %% used is low." -msgstr "排序缓存大小" +msgstr "MyISAM 索引缓存 %% 使用率低。" #: po/advisory_rules.php:167 po/advisory_rules.php:172 msgid "" "You may need to decrease the size of {key_buffer_size}, re-examine your " "tables to see if indexes have been removed, or examine queries and " "expectations about what indexes are being used." -msgstr "" +msgstr "您可能需要减小 {key_buffer_size} 的大小，重新检查您的表是否删除了索引或检查查询期望使用的索引。" #: po/advisory_rules.php:168 -#, fuzzy, php-format +#, php-format #| msgid "Sort buffer size" msgid "" "max %% MyISAM key buffer ever used: %s%%, this value should be above 95%%" -msgstr "排序缓存大小" +msgstr "最大 %% MyISAM 索引缓存从未使用: %s%%，该值应高于 95%%" #: po/advisory_rules.php:170 -#, fuzzy #| msgid "Sort buffer size" msgid "Percentage of MyISAM key buffer used" -msgstr "排序缓存大小" +msgstr "MyISAM 索引缓存使用百分比" #: po/advisory_rules.php:173 #, php-format @@ -12374,6 +12388,8 @@ msgid "" "source-of-aborted_connects/\">This article might help you track down the " "source." msgstr "" +"连接通常因为无法被授权而中止。这篇文章对您追踪来源可能有所帮助。" #: po/advisory_rules.php:233 #, php-format @@ -12389,7 +12405,7 @@ msgstr "已中止连接的比例" #, php-format msgid "" "Aborted connections rate is at %s, this value should be less than 1 per hour" -msgstr "" +msgstr "已中止连接率为 %s，该值应低于 1 每小时" #: po/advisory_rules.php:240 #| msgid "Format of imported file" @@ -12460,6 +12476,11 @@ msgid "" "fine. See also this blog entry" msgstr "" +"在一个 InnoDB 表写入很多的系统上您应该将 innodb_log_file_size 设为 {innodb_buffer_pool_size} 的 " +"25%% 。因为该值越大，当数据库崩溃时恢复的时间就越长，所以该值不应高于 256 MB 。请注意您不能简单的修改该变量的值。您需要关闭服务器，删除 " +"InnoDB 日志文件，在 my.cnf 中设置新的值，启动服务器，一切正常后再检查错误日志。参见这篇博客" #: po/advisory_rules.php:258 #, php-format @@ -12533,6 +12554,8 @@ msgid "" "perfectly adequate for your system if you don't have much InnoDB tables or " "other services running on the same machine." msgstr "" +"您当前的 InnoDB 缓冲池使用了内存的 %s%% 。此规则在您分配少于 60%% 时被触发，然而这也可能因为您没有太多 InnoDB " +"表所以这样足够或者服务器上还运行了其它服务。" #: po/advisory_rules.php:270 msgid "MyISAM concurrent inserts" @@ -12548,6 +12571,9 @@ msgid "" "writers for a given table. See also MySQL Documentation" msgstr "" +"设置 {concurrent_insert} 为 1 可以减少在相同表上的读取和写入冲突。参见 MySQL " +"文档" #: po/advisory_rules.php:273 msgid "concurrent_insert is set to 0" From 9fe91fbec21dc025cfa1e722595da62972793240 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 3 Aug 2012 20:24:54 +0200 Subject: [PATCH 06/28] Translated using Weblate. --- po/tr.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/tr.po b/po/tr.po index 344f077ab2..71aaa3128c 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,15 +4,15 @@ 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 02:11+0200\n" +"PO-Revision-Date: 2012-08-03 20:24+0200\n" "Last-Translator: Burak Yavuz \n" -"Language-Team: turkish \n" +"Language-Team: Turkish \n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 1.1\n" +"X-Generator: Weblate 1.2\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:353 #: libraries/display_tbl.lib.php:359 server_privileges.php:1677 @@ -1736,7 +1736,7 @@ msgstr "Kullanılan değişken / formül" #: js/messages.php:231 msgid "Test" -msgstr "Sınama" +msgstr "Deneme" #: js/messages.php:236 pmd_general.php:382 pmd_general.php:419 #: pmd_general.php:539 pmd_general.php:587 pmd_general.php:663 @@ -12625,7 +12625,7 @@ msgstr "tmp_table_size 'a karşı max_heap_table_size" #: po/advisory_rules.php:146 msgid "tmp_table_size and max_heap_table_size are not the same." -msgstr "tmp_table_size ve max_heap_table_size aynı şey değildir." +msgstr "tmp_table_size ve max_heap_table_size aynı değiller." #: po/advisory_rules.php:147 msgid "" From c5f0f8618226a16720e7c73ecb5073082790db87 Mon Sep 17 00:00:00 2001 From: Chanaka Indrajith Date: Sun, 5 Aug 2012 01:39:48 +0530 Subject: [PATCH 07/28] Support for transformations inside VIEWs created using create view link --- view_create.php | 109 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/view_create.php b/view_create.php index 2764adb77c..76e4d88c1d 100644 --- a/view_create.php +++ b/view_create.php @@ -63,6 +63,113 @@ if (isset($_REQUEST['createview'])) { } if (PMA_DBI_try_query($sql_query)) { + + // If different column names defined for VIEW + $view_columns = array(); + if (isset($_REQUEST['view']['column_names'])) { + $view_columns = explode(',', $_REQUEST['view']['column_names']); + } + + $column_map = array(); + // Select query which give results for VIEW + $real_source_result = PMA_DBI_try_query($_REQUEST['view']['as']); + + if ($real_source_result !== false) { + + $real_source_fields_meta = PMA_DBI_get_fields_meta($real_source_result); + + if (count($real_source_fields_meta) > 0) { + + for ($i=0; $itable; + $map['refering_column'] = $real_source_fields_meta[$i]->name; + + if (count($view_columns) > 1) { + $map['real_column'] = $view_columns[$i]; + } + + $column_map[] = $map; + + } + + } + + } + unset($real_source_result); + + // Get the existing transformation details of the same database + // from pma_column_info table + $pma_transformation_sql = 'SELECT * FROM ' + . $common_functions->backquote($cfgRelation['db']) . '.' + . $common_functions->backquote($cfgRelation['column_info']) + . ' WHERE `db_name` = \'' + . $common_functions->sqlAddSlashes($GLOBALS['db']) . '\''; + + $pma_tranformation_data = PMA_DBI_try_query($pma_transformation_sql); + + if ($pma_tranformation_data !== false) { + + // Need to store new transformation details for VIEW + $new_transformations_sql = 'INSERT INTO ' + . $common_functions->backquote($cfgRelation['db']) . '.' + . $common_functions->backquote($cfgRelation['column_info']) + . ' (`db_name`, `table_name`, `column_name`, `comment`, ' + . '`mimetype`, `transformation`, `transformation_options`)' + . ' VALUES '; + + $column_count = 0; + $add_comma = false; + + while ($data_row = PMA_DBI_fetch_assoc($pma_tranformation_data)) { + + foreach ($column_map as $column) { + + if ($data_row['table_name'] == $column['table_name'] + && $data_row['column_name'] == $column['refering_column'] + ) { + + $new_transformations_sql .= $add_comma ? ', ' : ''; + + $new_transformations_sql .= '(' + . '\'' . $GLOBALS['db'] . '\', ' + . '\'' . $_REQUEST['view']['name'] . '\', ' + . '\''; + + $new_transformations_sql .= (isset($column['real_column'])) + ? $column['real_column'] + : $column['refering_column']; + + $new_transformations_sql .= '\', ' + . '\'' . $data_row['comment'] . '\', ' + . '\'' . $data_row['mimetype'] . '\', ' + . '\'' . $data_row['transformation'] . '\', ' + . '\'' + . $common_functions->sqlAddSlashes( + $data_row['transformation_options'] + ) + . '\')'; + + $add_comma = true; + $column_count++; + break; + + } + + } + + if ($column_count == count($column_map)) { + break; + } + + } + + // Store new transformations + PMA_DBI_try_query($new_transformations_sql); + + } + if ($GLOBALS['is_ajax_request'] != true) { $message = PMA_Message::success(); include './' . $cfg['DefaultTabDatabase']; @@ -75,7 +182,9 @@ if (isset($_REQUEST['createview'])) { ) ); } + exit; + } else { if ($GLOBALS['is_ajax_request'] != true) { $message = PMA_Message::rawError(PMA_DBI_getError()); From 9c16007d00725bdc8b4a268db3b23b367c952ff7 Mon Sep 17 00:00:00 2001 From: Aputsiaq Niels Janussen Date: Sun, 5 Aug 2012 01:36:20 +0200 Subject: [PATCH 08/28] Translated using Weblate. --- po/da.po | 128 +++++++++++++++++++++++++++---------------------------- 1 file changed, 63 insertions(+), 65 deletions(-) diff --git a/po/da.po b/po/da.po index eeec414b4d..3d47785aaf 100644 --- a/po/da.po +++ b/po/da.po @@ -4,15 +4,15 @@ 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-23 04:24+0200\n" +"PO-Revision-Date: 2012-08-05 01:36+0200\n" "Last-Translator: Aputsiaq Niels Janussen \n" -"Language-Team: danish \n" +"Language-Team: Danish \n" "Language: da\n" "MIME-Version: 1.0\n" "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.1\n" +"X-Generator: Weblate 1.2\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:353 #: libraries/display_tbl.lib.php:359 server_privileges.php:1677 @@ -827,10 +827,9 @@ msgid "Enter each value in a separate field" msgstr "Indtast hver værdi i et separat felt" #: enum_editor.php:123 -#, fuzzy #| msgid "+ Add a value" msgid "Add a value" -msgstr "+ Tilføj en værdi" +msgstr "Tilføj en værdi" #: enum_editor.php:129 gis_data_editor.php:317 msgid "Output" @@ -3399,6 +3398,8 @@ msgid "" "Defines the minimum size for input fields generated for CHAR and VARCHAR " "columns" msgstr "" +"Definerer den mindste størrelse på input-felter som genereres for CHAR- og " +"VARCHAR-kolonner" #: libraries/config/messages.inc.php:35 #| msgid "Customize text input fields" @@ -3410,6 +3411,8 @@ msgid "" "Defines the maximum size for input fields generated for CHAR and VARCHAR " "columns" msgstr "" +"Definerer den maksimale størrelse på input-felter som genereres for CHAR- og " +"VARCHAR-kolonner" #: libraries/config/messages.inc.php:37 #| msgid "Maximum size for temporary sort files" @@ -4725,6 +4728,8 @@ msgid "" "An alternate host to hold the configuration storage; leave blank to use the " "already defined host" msgstr "" +"En alternativ vært til lageropbevaring af konfiguration; lad stå tom for at " +"benytte den vært som allerede er defineret" #: libraries/config/messages.inc.php:386 #| msgid "Control user" @@ -4809,6 +4814,8 @@ msgid "" "Limits number of table preferences which are stored in database, the oldest " "records are automatically removed" msgstr "" +"Begrænser antallet af tabel-præferencer som lagres i databasen. De ældte " +"poster fjernes automatisk" #: libraries/config/messages.inc.php:403 #| msgid "Maximum number of tables displayed in table list" @@ -5182,6 +5189,7 @@ msgstr "Vis SQL-forespørgsler" msgid "" "Defines whether the query box should stay on-screen after its submission" msgstr "" +"Definerer som forespørgselsboksen skal forblive på siden efter indsendelse" #: libraries/config/messages.inc.php:474 libraries/sql_query_form.lib.php:352 #| msgid "Hide query box" @@ -5557,7 +5565,7 @@ msgstr "Serveren svarer ikke." #: libraries/database_interface.lib.php:1820 msgid "Please check privileges of directory containing database." -msgstr "" +msgstr "Tjek venligst privilegier for mappen som indeholder databasen." #: libraries/database_interface.lib.php:1828 msgid "Details..." @@ -6504,7 +6512,7 @@ msgstr "" #: libraries/engines/pbxt.lib.php:129 msgid "The PrimeBase XT Blog by Paul McCullagh" -msgstr "" +msgstr "Bloggen The PrimeBase XT af Paul McCullagh" #: libraries/engines/pbxt.lib.php:130 msgid "The PrimeBase Media Streaming (PBMS) home page" @@ -7735,7 +7743,6 @@ msgid "Trigger name" msgstr "Triggernavn" #: libraries/rte/rte_triggers.lib.php:326 -#, fuzzy #| msgid "Time" msgctxt "Trigger action time" msgid "Time" @@ -8284,7 +8291,7 @@ msgstr "Datalager" #: libraries/tbl_properties.inc.php:692 msgid "PARTITION definition" -msgstr "" +msgstr "PARTITION-definition" #: libraries/tbl_select.lib.php:86 pmd_general.php:481 pmd_general.php:501 #: pmd_general.php:623 pmd_general.php:636 pmd_general.php:699 @@ -10650,7 +10657,6 @@ msgid "Using the monitor:" msgstr "Brug af monitor:" #: server_status.php:1634 -#, fuzzy #| msgid "" #| "Ok, you are good to go! Once you click 'Start monitor' your browser will " #| "refresh all displayed charts in a regular interval. You may add charts " @@ -10661,10 +10667,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 "" -"Når du klikker på 'Start monitor' vil din browser opdatere alle viste " -"diagrammer regelmæssigt. Du kan tilføje diagrammer og ændre " -"opdateringsfrekvensen under 'Indstilinger' eller fjerne diagrammer ved at " -"bruge ikonet cog på det relevante diagram. " +"Din browser vil opdatere alle viste diagrammer i et regelmæssigt interval. " +"Du kan tilføje diagrammer og ændre opdateringsfrekvensen under " +"'Indstillinger', eller fjerne hvilket som helst diagram ved at bruge ikonet " +"cog på det relevante diagram." #: server_status.php:1636 msgid "" @@ -11216,10 +11222,10 @@ msgstr "" "dette system." #: setup/lib/index.lib.php:324 -#, fuzzy #| msgid "You should use SSL connections if your web server supports it." msgid "You should use SSL connections if your database server supports it." -msgstr "Du bør bruge en SSL-forbindelse, hvis din webserver understøtter det. " +msgstr "" +"Du bør bruge SSL-forbindelser, hvis din database-server understøtter det." #: setup/lib/index.lib.php:337 msgid "You should use mysqli for performance reasons." @@ -11342,39 +11348,34 @@ msgid "Continue insertion with %s rows" msgstr "Fortsæt indsættelse med %s rækker" #: tbl_chart.php:89 -#, fuzzy #| msgid "Bar" msgctxt "Chart type" msgid "Bar" -msgstr "Søjle" +msgstr "Bjælke" #: tbl_chart.php:91 -#, fuzzy #| msgid "Column" msgctxt "Chart type" msgid "Column" -msgstr "Kolonnenavn" +msgstr "Kolonne" #: tbl_chart.php:93 -#, fuzzy #| msgid "Line" msgctxt "Chart type" msgid "Line" msgstr "Linje" #: tbl_chart.php:95 -#, fuzzy #| msgid "Spline" msgctxt "Chart type" msgid "Spline" msgstr "Spline" #: tbl_chart.php:97 -#, fuzzy #| msgid "Pie" msgctxt "Chart type" msgid "Pie" -msgstr "Lagkage" +msgstr "Cirkel" #: tbl_chart.php:100 msgid "Stacked" @@ -11415,7 +11416,7 @@ msgstr "Y-værdier" #: tbl_create.php:31 #, php-format msgid "Table %s already exists!" -msgstr "" +msgstr "Tabellen %s eksisterer allerede!" #: tbl_create.php:227 #, php-format @@ -11479,10 +11480,9 @@ msgid "Add index" msgstr "Tilføj indeks" #: tbl_indexes.php:175 -#, fuzzy #| msgid "Edit mode" msgid "Edit index" -msgstr "Redigeringstilstand" +msgstr "Redigér indeks" #: tbl_indexes.php:187 msgid "Index name:" @@ -11620,10 +11620,9 @@ msgid "Check referential integrity:" msgstr "Check reference-integriteten:" #: tbl_printview.php:72 -#, fuzzy #| msgid "Show tables" msgid "Showing tables" -msgstr "Vis tabeller" +msgstr "Viser tabeller" #: tbl_printview.php:269 tbl_structure.php:780 msgid "Space usage" @@ -12309,10 +12308,10 @@ msgstr "" "sekund." #: po/advisory_rules.php:80 -#, fuzzy, php-format +#, php-format #| msgid "Query cache efficiency (%)" msgid "Query cache efficiency (%%)" -msgstr "Effektivitet (%) af forespørgselsmellemlager " +msgstr "Effektiviteten af forespørgselsmellemlager (%%)" #: po/advisory_rules.php:81 msgid "Query cache not running efficiently, it has a low hit rate." @@ -12416,7 +12415,7 @@ msgstr "" "og check resultatet." #: po/advisory_rules.php:98 -#, fuzzy, php-format +#, php-format #| msgid "" #| "The ratio of removed queries to inserted queries is %s%%. The lower this " #| "value is, the better (This rules firing limit: 0.1%)" @@ -12425,7 +12424,7 @@ msgid "" "value is, the better (This rules firing limit: 0.1%%)" msgstr "" "Andelen af fjernede forespørgsler til indsatte forespørgsler er %s%%. Jo " -"mindre denne værdi er des bedre. (Denne regel aktiveres ved 0,1%)" +"mindre denne værdi er des bedre. (Denne regels aktiveringsgrænse: 0.1%%)" #: po/advisory_rules.php:100 msgid "Query cache max size" @@ -12533,7 +12532,6 @@ msgid "There are lots of rows being sorted." msgstr "Der er mange rækker, der sorteres." #: po/advisory_rules.php:122 -#, fuzzy #| msgid "" #| "there is nothing wrong with a high amount of row sorting, you might t to " #| "e sure that the queries which require a lot of sorting use exed fields " @@ -12544,9 +12542,10 @@ msgid "" "indexed columns in the ORDER BY clause, as this will result in much faster " "sorting" msgstr "" -"Selvom der intet er galt med en stor del rækkesorteringer, så bør " -"forespørgsler, som har brug for meget sortering bruge indekserede felter i " -"ORDER BY, da dette vil resultere i en meget hurtigere sortering." +"Selvom der intet er galt med en stor del rækkesorteringer, så bør du " +"eventuelt sikre, at forespørgsler som kræver meget sortering bruger " +"indekserede kolonner i klausulen ORDER BY, da dette vil resultere i en meget " +"hurtigere sortering" #: po/advisory_rules.php:123 #, php-format @@ -12562,7 +12561,6 @@ msgid "There are too many joins without indexes." msgstr "Der er for mange joins uden indeks." #: po/advisory_rules.php:127 -#, fuzzy #| msgid "" #| "eans that joins are doing full table scans. Adding indexes for the lds ng " #| "used in the join conditions will greatly speed up table joins" @@ -12571,8 +12569,8 @@ msgid "" "columns being used in the join conditions will greatly speed up table joins" msgstr "" "Dette betyder, at joins foretager en fuld tabelskanning. Oprettelse af " -"indeks for felter, der bruges i join-betingelserne vil forøge hastigheden af " -"joins." +"indeks for kolonner, der bruges i join-betingelserne vil forøge hastigheden " +"af tabel-joins" #: po/advisory_rules.php:128 #, php-format @@ -12728,7 +12726,6 @@ msgid "Temp disk rate" msgstr "Frekvens af midlertidig disk" #: po/advisory_rules.php:157 -#, fuzzy #| msgid "" #| "sing {max_heap_table_size} and {tmp_table_size} might help. However e " #| "porary tables are always being written to disk, independent of value of " @@ -12750,12 +12747,12 @@ msgstr "" "skrives nogle midlertidige tabeller altid til disk uafhængig af disse " "variable. For at undgå disse skal man omskrive sine forespørgsler for at " "undgå disse betingelser (inden for en midlertidig tabel: Tilstedeværelse af " -"BLOB eller TEXT felter eller et felt større end 512 bytes) som nævnt i MySQL Documentation" +"BLOB eller TEXT-kolonne eller en kolonne større end 512 bytes) som nævnt i " +"MySQL Documentation" #: po/advisory_rules.php:158 -#, fuzzy, php-format +#, php-format #| msgid "" #| "f temporay tables being written to disk: %s, this value should be s than " #| "er hour" @@ -12763,8 +12760,8 @@ msgid "" "Rate of temporary tables being written to disk: %s, this value should be " "less than 1 per hour" msgstr "" -"Frekvens af midlertidige tabeller skrevet til disk: %s. Denne værdi bør være " -"mindre end 1 pr time" +"Frekvens af midlertidige tabeller som skrives til disk: %s. Denne værdi bør " +"være mindre end 1 pr time" #: po/advisory_rules.php:160 msgid "MyISAM key buffer size" @@ -12809,24 +12806,24 @@ msgstr "" "indeks der bruges." #: po/advisory_rules.php:168 -#, fuzzy, php-format +#, php-format #| msgid "" #| "max %% MyISAM key buffer ever used: %s, this value should be above 95%%" msgid "" "max %% MyISAM key buffer ever used: %s%%, this value should be above 95%%" msgstr "" -"maksimal %% MyISAM nøglebuffer nogensinde brugt: %s. Denne værdi bør være " -"over 95%%" +"maksimal %% MyISAM-nøglebuffer som nogensinde bruges: %s%%. Denne værdi bør " +"være over 95%%" #: po/advisory_rules.php:170 msgid "Percentage of MyISAM key buffer used" msgstr "Procentdel brugt af MyISAM nøglebuffer" #: po/advisory_rules.php:173 -#, fuzzy, php-format +#, php-format #| msgid "%% MyISAM key buffer used: %s, this value should be above 95%%" msgid "%% MyISAM key buffer used: %s%%, this value should be above 95%%" -msgstr "%% MyISAM nøglebuffer brugt: %s. Denne værdi bør være over 95%%" +msgstr "%% MyISAM-nøglebuffer som bruges: %s%%. Denne værdi bør være over 95%%" #: po/advisory_rules.php:175 msgid "Percentage of index reads from memory" @@ -13146,7 +13143,7 @@ msgstr "" "buffer poolen." #: po/advisory_rules.php:257 -#, fuzzy, php-format +#, php-format #| msgid "" #| "ally one a system with a lot of writes to InnoDB tables you should " #| "odb_log_file_size to 25%% of {innodb_buffer_pool_size}. However bigger s " @@ -13168,12 +13165,13 @@ msgid "" "fine. See also this blog entry" msgstr "" -"Særligt på et system med mange skrivninger til InnoDB tabeller bør " -"innodb_log_file_size sættes til 25%% af{innodb_buffer_pool_size}. Dog jo " +"Særligt på et system med mange skrivninger til InnoDB-tabeller bør " +"innodb_log_file_size sættes til 25%% af {innodb_buffer_pool_size}. Dog jo " "større værdi, jo længere er genoprettelsestiden ved databasenedbrud. Derfor " "bør værdien ikke være højere end 256 MiB. Bemærk, at man ikke bare kan ændre " -"denne værdi. Man skal lukke serveren ned, fjerne InnoDB logfiler, sætte den " -"nye værdi i my.cnf, starte serveren og checke logfiler for fejl. Se også dette blogindlæg" @@ -13195,7 +13193,7 @@ msgid "The InnoDB log file size is inadequately large." msgstr "InnoDB logfilen er utilstrækkelig stor." #: po/advisory_rules.php:262 -#, fuzzy, php-format +#, php-format #| msgid "" #| "usually sufficient to set innodb_log_file_size to 25%% of the size " #| "nodb_buffer_pool_size}. A very innodb_log_file_size slows down the overy " @@ -13221,17 +13219,17 @@ msgstr "" "størrelsen af {innodb_buffer_pool_size}. En meget høj innodb_log_file_size " "reducerer genoprettelsestiden betydeligt efter et databasenedbrud. Se også " "denne artikel.Man skal lukke serveren ned, " -"fjerne InnoDB logfiler, sætte den nye værdi i my.cnf, starte serveren og " -"checke logfiler for fejl. Se også dette blogindlæg" +"innodb_log_file_size/\">denne artikel.Man skal lukke serveren ned, fjerne " +"InnoDB-logfiler, sætte den nye værdi i my.cnf, starte serveren og tjekke at " +"alt gik godt i fejllogene. Se også dette blogindlæg" #: po/advisory_rules.php:263 -#, fuzzy, php-format +#, php-format #| msgid "Your absolute InnoD log size is %s MiB" msgid "Your absolute InnoDB log size is %s MiB" -msgstr "Din absolutte InnoDB logstørrelse er %s MiB" +msgstr "Din absolutte InnoDB-logstørrelse er %s MiB" #: po/advisory_rules.php:265 msgid "InnoDB buffer pool size" From 78129140fd3d49510089c2d6311d01ffbbef5f7c Mon Sep 17 00:00:00 2001 From: Chanaka Indrajith Date: Sun, 5 Aug 2012 09:53:16 +0530 Subject: [PATCH 09/28] Code improvements related to VIEW transformations --- libraries/tbl_views.lib.php | 161 ++++++++++++++++++++++++++++++++++++ view_create.php | 105 +++-------------------- 2 files changed, 174 insertions(+), 92 deletions(-) create mode 100644 libraries/tbl_views.lib.php diff --git a/libraries/tbl_views.lib.php b/libraries/tbl_views.lib.php new file mode 100644 index 0000000000..4b94439e2e --- /dev/null +++ b/libraries/tbl_views.lib.php @@ -0,0 +1,161 @@ + 0) { + + for ($i=0; $itable; + $map['refering_column'] = $real_source_fields_meta[$i]->name; + + if (count($view_columns) > 1) { + $map['real_column'] = $view_columns[$i]; + } + + $column_map[] = $map; + + } + + } + + } + unset($real_source_result); + + return $column_map; + +} + + +/** + * Get existing data on tranformations applyed for + * columns in a particular table + * + * @param string $db Database name looking for + * + * @return mysqli_result Result of executed SQL query + */ +function PMA_getExistingTranformationData($db) +{ + + $common_functions = PMA_CommonFunctions::getInstance(); + $cfgRelation = PMA_getRelationsParam(); + + // Get the existing transformation details of the same database + // from pma_column_info table + $pma_transformation_sql = 'SELECT * FROM ' + . $common_functions->backquote($cfgRelation['db']) . '.' + . $common_functions->backquote($cfgRelation['column_info']) + . ' WHERE `db_name` = \'' + . $common_functions->sqlAddSlashes($db) . '\''; + + return PMA_DBI_try_query($pma_transformation_sql); + +} + + +/** + * Get SQL query for store new transformation details of a VIEW + * + * @param mysqli_result $pma_tranformation_data Result set of SQL execution + * @param array $column_map Details of VIEW columns + * @param string $view_name Name of the VIEW + * @param string $db Database name of the VIEW + * + * @return string $new_transformations_sql SQL query for new tranformations + */ +function PMA_getNewTransformationDataSql( + $pma_tranformation_data, $column_map, $view_name, $db +) { + + $common_functions = PMA_CommonFunctions::getInstance(); + $cfgRelation = PMA_getRelationsParam(); + + // Need to store new transformation details for VIEW + $new_transformations_sql = 'INSERT INTO ' + . $common_functions->backquote($cfgRelation['db']) . '.' + . $common_functions->backquote($cfgRelation['column_info']) + . ' (`db_name`, `table_name`, `column_name`, `comment`, ' + . '`mimetype`, `transformation`, `transformation_options`)' + . ' VALUES '; + + $column_count = 0; + $add_comma = false; + + while ($data_row = PMA_DBI_fetch_assoc($pma_tranformation_data)) { + + foreach ($column_map as $column) { + + if ($data_row['table_name'] == $column['table_name'] + && $data_row['column_name'] == $column['refering_column'] + ) { + + $new_transformations_sql .= $add_comma ? ', ' : ''; + + $new_transformations_sql .= '(' + . '\'' . $db . '\', ' + . '\'' . $view_name . '\', ' + . '\''; + + $new_transformations_sql .= (isset($column['real_column'])) + ? $column['real_column'] + : $column['refering_column']; + + $new_transformations_sql .= '\', ' + . '\'' . $data_row['comment'] . '\', ' + . '\'' . $data_row['mimetype'] . '\', ' + . '\'' . $data_row['transformation'] . '\', ' + . '\'' + . $common_functions->sqlAddSlashes( + $data_row['transformation_options'] + ) + . '\')'; + + $add_comma = true; + $column_count++; + break; + + } + + } + + if ($column_count == count($column_map)) { + break; + } + + } + + return ($column_count > 0) ? $new_transformations_sql : ''; + +} + + +?> diff --git a/view_create.php b/view_create.php index 76e4d88c1d..d5644fb275 100644 --- a/view_create.php +++ b/view_create.php @@ -64,111 +64,32 @@ if (isset($_REQUEST['createview'])) { if (PMA_DBI_try_query($sql_query)) { + require_once './libraries/tbl_views.lib.php'; + // If different column names defined for VIEW $view_columns = array(); if (isset($_REQUEST['view']['column_names'])) { $view_columns = explode(',', $_REQUEST['view']['column_names']); } - $column_map = array(); - // Select query which give results for VIEW - $real_source_result = PMA_DBI_try_query($_REQUEST['view']['as']); - - if ($real_source_result !== false) { - - $real_source_fields_meta = PMA_DBI_get_fields_meta($real_source_result); - - if (count($real_source_fields_meta) > 0) { - - for ($i=0; $itable; - $map['refering_column'] = $real_source_fields_meta[$i]->name; - - if (count($view_columns) > 1) { - $map['real_column'] = $view_columns[$i]; - } - - $column_map[] = $map; - - } - - } - - } - unset($real_source_result); - - // Get the existing transformation details of the same database - // from pma_column_info table - $pma_transformation_sql = 'SELECT * FROM ' - . $common_functions->backquote($cfgRelation['db']) . '.' - . $common_functions->backquote($cfgRelation['column_info']) - . ' WHERE `db_name` = \'' - . $common_functions->sqlAddSlashes($GLOBALS['db']) . '\''; - - $pma_tranformation_data = PMA_DBI_try_query($pma_transformation_sql); + $column_map = PMA_getColumnMap($_REQUEST['view']['as'], $view_columns); + $pma_tranformation_data = PMA_getExistingTranformationData($GLOBALS['db']); if ($pma_tranformation_data !== false) { - // Need to store new transformation details for VIEW - $new_transformations_sql = 'INSERT INTO ' - . $common_functions->backquote($cfgRelation['db']) . '.' - . $common_functions->backquote($cfgRelation['column_info']) - . ' (`db_name`, `table_name`, `column_name`, `comment`, ' - . '`mimetype`, `transformation`, `transformation_options`)' - . ' VALUES '; - - $column_count = 0; - $add_comma = false; - - while ($data_row = PMA_DBI_fetch_assoc($pma_tranformation_data)) { - - foreach ($column_map as $column) { - - if ($data_row['table_name'] == $column['table_name'] - && $data_row['column_name'] == $column['refering_column'] - ) { - - $new_transformations_sql .= $add_comma ? ', ' : ''; - - $new_transformations_sql .= '(' - . '\'' . $GLOBALS['db'] . '\', ' - . '\'' . $_REQUEST['view']['name'] . '\', ' - . '\''; - - $new_transformations_sql .= (isset($column['real_column'])) - ? $column['real_column'] - : $column['refering_column']; - - $new_transformations_sql .= '\', ' - . '\'' . $data_row['comment'] . '\', ' - . '\'' . $data_row['mimetype'] . '\', ' - . '\'' . $data_row['transformation'] . '\', ' - . '\'' - . $common_functions->sqlAddSlashes( - $data_row['transformation_options'] - ) - . '\')'; - - $add_comma = true; - $column_count++; - break; - - } - - } - - if ($column_count == count($column_map)) { - break; - } - - } + // SQL for store new transformation details of VIEW + $new_transformations_sql = PMA_getNewTransformationDataSql( + $pma_tranformation_data, $column_map, $_REQUEST['view']['name'], + $GLOBALS['db'] + ); // Store new transformations - PMA_DBI_try_query($new_transformations_sql); + if ($new_transformations_sql != '') { + PMA_DBI_try_query($new_transformations_sql); + } } + unset($pma_tranformation_data); if ($GLOBALS['is_ajax_request'] != true) { $message = PMA_Message::success(); From 4beb0442aee72ee1f2bfe3500acbfbc661fa7218 Mon Sep 17 00:00:00 2001 From: Chanaka Indrajith Date: Mon, 6 Aug 2012 06:43:16 +0530 Subject: [PATCH 10/28] Clear tranformation information when deleting Columns, VIEWs, Tables and Databses --- libraries/database_interface.lib.php | 27 +++++++++++++ libraries/mult_submits.inc.php | 12 ++++++ libraries/transformations.lib.php | 42 ++++++++++++++++++++ sql.php | 57 ++++++++++++++++++++++++++++ 4 files changed, 138 insertions(+) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 30b934a697..9902cf1e90 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -743,6 +743,33 @@ function PMA_DBI_get_tables_full($database, $table = false, } } + +/** + * Get VIEWs in a particular database + * + * @param string $db Database name to look in + * + * @return array $views Set of VIEWs inside the database + */ +function PMA_DBI_getVirtualTables($db) +{ + + $tables_full = PMA_DBI_get_tables_full($db); + $views = array(); + + foreach ($tables_full as $table=>$tmp) { + + if (PMA_Table::isView($db, $table)) { + $views[] = $table; + } + + } + + return $views; + +} + + /** * returns array with databases containing extended infos about them * diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 680db4d2ac..3008805431 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -8,6 +8,8 @@ if (! defined('PHPMYADMIN')) { exit; } +require_once 'libraries/transformations.lib.php'; + $common_functions = PMA_CommonFunctions::getInstance(); $request_params = array( @@ -137,6 +139,7 @@ if (! empty($submit_mult) } } // end if +$views = PMA_DBI_getVirtualTables($db); /** * Displays the confirmation form if required @@ -487,6 +490,15 @@ if (!empty($submit_mult) && !empty($what)) { PMA_DBI_select_db($db); } $result = PMA_DBI_query($a_query); + + if ($query_type == 'drop_db') { + PMA_clearTransformations($selected[$i]); + } elseif ($query_type == 'drop_tbl') { + PMA_clearTransformations($db, $selected[$i]); + } else if ($query_type == 'drop_fld') { + PMA_clearTransformations($db, $table ,$selected[$i]); + } + } // end if } // end for diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php index a653570d93..561406e0eb 100644 --- a/libraries/transformations.lib.php +++ b/libraries/transformations.lib.php @@ -365,4 +365,46 @@ function PMA_transformation_global_html_replace($buffer, $options = array()) $return = str_replace("[__BUFFER__]", $buffer, $options['string']); return $return; } + + +/** + * Delete related transformation details + * after deleting database. table or column + * + * @param string $db Database name + * @param string $table Table name + * @param string $column Column name + * + * @return boolean State of the query execution + */ +function PMA_clearTransformations($db, $table = '', $column = '') +{ + + $common_functions = PMA_CommonFunctions::getInstance(); + $cfgRelation = PMA_getRelationsParam(); + + $delete_sql = 'DELETE FROM ' + . $common_functions->backquote($cfgRelation['db']) . '.' + . $common_functions->backquote($cfgRelation['column_info']) + . ' WHERE '; + + if (($column != '') && ($table != '')) { + + $delete_sql .= '`db_name` = \'' . $db . '\' AND ' + . '`table_name` = \'' . $table . '\' AND ' + . '`column_name` = \'' . $column . '\' '; + + } else if ($table != '') { + + $delete_sql .= '`db_name` = \'' . $db . '\' AND ' + . '`table_name` = \'' . $table . '\' '; + + } else { + $delete_sql .= '`db_name` = \'' . $db . '\' '; + } + + return PMA_DBI_try_query($delete_sql); + +} + ?> diff --git a/sql.php b/sql.php index 5c2344e681..ac2e362823 100644 --- a/sql.php +++ b/sql.php @@ -766,6 +766,34 @@ if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) { // No rows returned -> move back to the calling page if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { + + // Delete related tranformation information + if (!empty($analyzed_sql[0]['querytype']) + && (($analyzed_sql[0]['querytype'] == 'ALTER') + || ($analyzed_sql[0]['querytype'] == 'DROP')) + ) { + + require_once 'libraries/transformations.lib.php'; + if ($analyzed_sql[0]['querytype'] == 'ALTER') { + + if (stripos($analyzed_sql[0]['unsorted_query'], 'DROP') !== false) { + + $drop_column = PMA_getColumnNameInColumnDropSql( + $analyzed_sql[0]['unsorted_query'] + ); + + if ($drop_column != '') { + PMA_clearTransformations($db, $table, $drop_column); + } + + } + + } else if (($analyzed_sql[0]['querytype'] == 'DROP') && ($table != '')) { + PMA_clearTransformations($db, $table); + } + + } + if ($is_delete) { $message = PMA_Message::deleted_rows($num_rows); } elseif ($is_insert) { @@ -1472,5 +1500,34 @@ function PMA_getSqlWithLimitClause($full_sql_query, $analyzed_sql, $sql_limit_to return $analyzed_sql[0]['section_before_limit'] . "\n" . $sql_limit_to_append . $analyzed_sql[0]['section_after_limit']; } + + +/** + * Get column name from a drop SQL statement + * + * @param string $sql SQL query + * + * @return string $drop_column Name of the column + */ +function PMA_getColumnNameInColumnDropSql($sql) +{ + + $tmpArray1 = explode('DROP', $sql); + $str_to_check = trim($tmpArray1[1]); + + if (stripos($str_to_check, 'COLUMN') !== false) { + $tmpArray2 = explode('COLUMN', $str_to_check); + $str_to_check = trim($tmpArray2[1]); + } + + $tmpArray3 = explode(' ', $str_to_check); + $str_to_check = trim($tmpArray3[0]); + + $drop_column = str_replace(';', '', trim($str_to_check)); + $drop_column = str_replace('`', '', $drop_column); + + return $drop_column; + +} ?> From 53f96bd760ee1b1a89db397f71962152764c9a07 Mon Sep 17 00:00:00 2001 From: "J.M" Date: Mon, 6 Aug 2012 09:20:07 +0200 Subject: [PATCH 11/28] bug #3546277 [core] Call to undefined function __() when config file has wrong permissions --- ChangeLog | 3 ++- libraries/Config.class.php | 2 -- libraries/common.inc.php | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 00919acfc1..452ff5e1a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,7 +12,8 @@ phpMyAdmin - ChangeLog - bug #3547825 [edit] BLOB download no longer works - bug #3541966 [config] Error in generated configuration arrray - bug #3553551 [GUI] Invalid HTML code in multi submits confirmation form -[interface] Designer sometimes places tables on the top menu +- [interface] Designer sometimes places tables on the top menu +- bug #3546277 [core] Call to undefined function __() when config file has wrong permissions 3.5.2.1 (2012-08-03) - [security] Fixed local path disclosure vulnerability, see PMASA-2012-3 diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 7244312db6..ac67f39725 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -445,8 +445,6 @@ class PMA_Config $this->checkPmaAbsoluteUri(); $this->checkFontsize(); - $this->checkPermissions(); - // Handling of the collation must be done after merging of $cfg // (from config.inc.php) so that $cfg['DefaultConnectionCollation'] // can have an effect. Note that the presence of collation diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 72368b7e5d..c0d52dea43 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -618,6 +618,8 @@ require './libraries/select_lang.lib.php'; * check for errors occurred while loading configuration * this check is done here after loading language files to present errors in locale */ +$GLOBALS['PMA_Config']->checkPermissions(); + if ($GLOBALS['PMA_Config']->error_config_file) { $error = '

' . __('Failed to read configuration file') . '

' . _('This usually means there is a syntax error in it, please check any errors shown below.') From b024d858b8062b4ae0b0544dab3b9fa70207b413 Mon Sep 17 00:00:00 2001 From: Aputsiaq Niels Janussen Date: Sun, 5 Aug 2012 01:39:37 +0200 Subject: [PATCH 12/28] Translated using Weblate. --- po/da.po | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/po/da.po b/po/da.po index 3d47785aaf..0ca8df410f 100644 --- a/po/da.po +++ b/po/da.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-08-05 01:36+0200\n" +"PO-Revision-Date: 2012-08-05 01:39+0200\n" "Last-Translator: Aputsiaq Niels Janussen \n" "Language-Team: Danish \n" "Language: da\n" @@ -5291,7 +5291,7 @@ msgid "" "possible) or keep the text field empty" msgstr "" "Foreslå et databasenavn på formularen for "Opret database" (hvis " -"muligt) eller lad feltet være tomt " +"muligt) eller lad feltet være tomt" #: libraries/config/messages.inc.php:496 msgid "Suggest new database name" @@ -6248,7 +6248,7 @@ msgstr "" #: libraries/engines/pbms.lib.php:30 msgid "Garbage Threshold" -msgstr "Tærskel for garbage " +msgstr "Tærskel for garbage" #: libraries/engines/pbms.lib.php:31 msgid "The percentage of garbage in a repository file before it is compacted." @@ -6267,7 +6267,7 @@ msgid "" "will disable HTTP communication with the daemon." msgstr "" "Porten for PBMS stream-baseret kommunikation. Sættes denne værdi til 0 vil " -"HTTP-kommunikation med dæmonen deaktiveres. " +"HTTP-kommunikation med dæmonen deaktiveres." #: libraries/engines/pbms.lib.php:40 msgid "Repository Threshold" @@ -6281,7 +6281,7 @@ msgid "" msgstr "" "Den maksimale størrelse af en BLOB repositoryfil. Du kan bruge Kb, MB eller " "GB for at angive værdiens enhed. En værdi i bytes antages, når ingen enhed " -"angives" +"angives." #: libraries/engines/pbms.lib.php:45 msgid "Temp Blob Timeout" @@ -6307,7 +6307,7 @@ msgid "" msgstr "" "Den maksimale størrelse af en midlertidig BLOB logfil. Du kan bruge Kb, MB " "eller GB for at angive værdiens enhed. En værdi i bytes antages, når ingen " -"enhed angives" +"enhed angives." #: libraries/engines/pbms.lib.php:55 msgid "Max Keep Alive" @@ -8597,10 +8597,11 @@ msgid "" "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" -"Din PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] er mindre end cooki " -"gyldighed konfigureret i phpMyAdmin; på grund af dette vil din login session " -"udløbe tidligere end konfigureret i phpMyAdmin" +"Din PHP parameter " +"[a@http://php.net/manual/en/session.configuration.php#ini.session.gc-" +"maxlifetime@_blank]session.gc_maxlifetime[/a] er mindre end cooki gyldighed " +"konfigureret i phpMyAdmin; på grund af dette vil din login session udløbe " +"tidligere end konfigureret i phpMyAdmin." #: main.php:299 msgid "" From 7e0028e4afab115a89a18c1257c6132aa123fd25 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 6 Aug 2012 21:44:16 +0530 Subject: [PATCH 13/28] bug #3540922 [edit] Error searching table with many fields --- ChangeLog | 1 + js/tbl_select.js | 34 +++++++++++++++++++++++++++++++++- tbl_select.php | 6 +++--- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 452ff5e1a7..b88ef558a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ phpMyAdmin - ChangeLog - bug #3553551 [GUI] Invalid HTML code in multi submits confirmation form - [interface] Designer sometimes places tables on the top menu - bug #3546277 [core] Call to undefined function __() when config file has wrong permissions +- bug #3540922 [edit] Error searching table with many fields 3.5.2.1 (2012-08-03) - [security] Fixed local path disclosure vulnerability, see PMASA-2012-3 diff --git a/js/tbl_select.js b/js/tbl_select.js index ba144959a4..f0558dcae1 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -53,7 +53,39 @@ $(document).ready(function() { PMA_prepareForAjaxRequest($search_form); - $.post($search_form.attr('action'), $search_form.serialize(), function(response) { + var values = {}; + $search_form.find(':input').each(function() { + var $input = $(this); + if ($input.attr('type') == 'checkbox' || $input.attr('type') == 'radio') { + if ($input.is(':checked')) { + values[this.name] = $input.val(); + } + } else { + values[this.name] = $input.val(); + } + }); + var columnCount = $('select[name="param[]"] option').length; + // Submit values only for the columns that have a search criteria + for (var a = 0; a < columnCount; a++) { + if (values['fields[' + a + ']'] == '') { + delete values['fields[' + a + ']']; + delete values['func[' + a + ']']; + delete values['names[' + a + ']']; + delete values['types[' + a + ']']; + delete values['collations[' + a + ']']; + } + } + // If all columns are selected, use a single parameter to indicate that + if (values['param[]'] != null) { + if (values['param[]'].length == columnCount) { + delete values['param[]']; + values['displayAllColumns'] = true; + } + } else { + values['displayAllColumns'] = true; + } + + $.post($search_form.attr('action'), values, function(response) { PMA_ajaxRemoveMessage($msgbox); if (typeof response == 'string') { // found results diff --git a/tbl_select.php b/tbl_select.php index 81ca73403a..5e5114feee 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -33,7 +33,7 @@ $geom_types = PMA_getGISDatatypes(); /** * Not selection yet required -> displays the selection form */ -if (! isset($param) || $param[0] == '') { +if ((! isset($param) || $param[0] == '') && ! isset($displayAllColumns)) { // Gets some core libraries include_once './libraries/tbl_common.php'; //$err_url = 'tbl_select.php' . $err_url; @@ -117,7 +117,7 @@ echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params, '', 'topmenu2'); - Date: Mon, 6 Aug 2012 09:31:47 +0200 Subject: [PATCH 14/28] Translated using Weblate. --- po/de.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index b5782d0bfd..ff6e0fdb3d 100644 --- a/po/de.po +++ b/po/de.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 3.5.1-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-13 00:19+0200\n" -"Last-Translator: Maxi Lampert \n" -"Language-Team: none\n" +"PO-Revision-Date: 2012-08-06 09:31+0200\n" +"Last-Translator: J. M. \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "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.1\n" +"X-Generator: Weblate 1.2\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:353 #: libraries/display_tbl.lib.php:359 server_privileges.php:1677 @@ -3107,7 +3107,7 @@ msgstr "Operationen" #: libraries/common.lib.php:3281 libraries/sql_query_form.lib.php:443 #: prefs_manage.php:239 msgid "Browse your computer:" -msgstr "Durchsuchen Sie ihren Computer:" +msgstr "Durchsuchen Sie Ihren Computer:" #: libraries/common.lib.php:3300 #, php-format From 7a3d7f8fb407a7dbfa4d655db102d6750cce4727 Mon Sep 17 00:00:00 2001 From: "J. M" Date: Mon, 6 Aug 2012 09:31:48 +0200 Subject: [PATCH 15/28] Translated using Weblate. --- po/de.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index 629c30b671..a02a114e22 100644 --- a/po/de.po +++ b/po/de.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 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-13 00:19+0200\n" -"Last-Translator: Maxi Lampert \n" -"Language-Team: none\n" +"PO-Revision-Date: 2012-08-06 09:31+0200\n" +"Last-Translator: J. M. \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "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.1\n" +"X-Generator: Weblate 1.2\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354 #: libraries/DisplayResults.class.php:794 @@ -2539,7 +2539,7 @@ msgstr "Operationen" #: libraries/CommonFunctions.class.php:3506 #: libraries/sql_query_form.lib.php:473 prefs_manage.php:245 msgid "Browse your computer:" -msgstr "Durchsuchen Sie ihren Computer:" +msgstr "Durchsuchen Sie Ihren Computer:" #: libraries/CommonFunctions.class.php:3534 #, php-format From e12267958784feaae207c66d2f11112aacf54443 Mon Sep 17 00:00:00 2001 From: jaideejung007 Date: Tue, 7 Aug 2012 09:12:46 +0200 Subject: [PATCH 16/28] Translated using Weblate. --- po/th.po | 62 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/po/th.po b/po/th.po index 638a294c15..d87a04fd01 100644 --- a/po/th.po +++ b/po/th.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-04-21 15:20+0200\n" -"Last-Translator: Setthawut Sawaengkit \n" -"Language-Team: thai \n" +"PO-Revision-Date: 2012-08-07 09:12+0200\n" +"Last-Translator: jaideejung007 \n" +"Language-Team: Thai \n" "Language: th\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 0.10\n" +"X-Generator: Weblate 1.2\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354 #: libraries/DisplayResults.class.php:794 @@ -1751,7 +1751,7 @@ msgstr "เวลาที่ทำคำสั่ง" #: libraries/DisplayResults.class.php:714 #, php-format msgid "%d is not valid row number." -msgstr "" +msgstr "%d ไม่ใช่หมายเลขแถวที่ถูกต้อง" #: js/messages.php:291 libraries/config/FormDisplay.tpl.php:387 #: libraries/insert_edit.lib.php:1483 @@ -1783,8 +1783,9 @@ msgid "Hovering over a point will show its label." msgstr "นำตัวชี้วางเพื่อแสดงคำกำกับ" #: js/messages.php:304 +#, fuzzy msgid "To zoom in, select a section of the plot with the mouse." -msgstr "" +msgstr "เมื่อต้องการย่อ/ขยาย เลือกส่วนของจุดโดยใช้เมาส์" #: js/messages.php:306 #, fuzzy @@ -1797,8 +1798,9 @@ msgid "Click a data point to view and possibly edit the data row." msgstr "คลิก จุดข้อมูล เพื่อดูหรือแก้ไขแถวข้อมูล" #: js/messages.php:310 +#, fuzzy msgid "The plot can be resized by dragging it along the bottom right corner." -msgstr "ขนาดจุดสามารถเปลี่ยนได้ที่ขวาล่าง" +msgstr "จุดสามารถปรับขนาดได้ โดยการลากไปมุมขวาด้านล่าง" #: js/messages.php:312 msgid "Select two columns" @@ -2921,8 +2923,8 @@ msgid "" "Error moving the uploaded file, see [a@./Documentation." "html#faq1_11@Documentation]FAQ 1.11[/a]" msgstr "" -"มีข้อผิดพลาดขนาดย้ายไฟล์อัพหลด กรุณาดู [a@./Documentation.html#faq1_11@Documentation]" -"FAQ 1.11[/a]" +"มีข้อผิดพลาดระหว่างการอัพโหลด กรุณาดู " +"[a@./Documentation.html#faq1_11@Documentation]FAQ 1.11[/a]" #: libraries/File.class.php:485 msgid "Error while moving uploaded file." @@ -3189,12 +3191,14 @@ msgstr "" "['MaxTableUiprefs'] %s)" #: libraries/Table.class.php:1563 -#, php-format +#, fuzzy, php-format msgid "" "Cannot save UI property \"%s\". The changes made will not be persistent " "after you refresh this page. Please check if the table structure has been " "changed." msgstr "" +"ไม่สามารถบันทึกคุณสมบัติ UI \"% s\" ได้ การเปลี่ยนแปลงจะมีผล " +"หลังจากคุณรีเฟรชหน้านี้ โปรดตรวจสอบหากมีการเปลี่ยนโครงสร้างของตาราง" #: libraries/TableSearch.class.php:194 libraries/insert_edit.lib.php:231 #: libraries/insert_edit.lib.php:237 libraries/rte/rte_routines.lib.php:1488 @@ -3291,7 +3295,7 @@ msgstr "เริ่มใหม่" #: libraries/Theme.class.php:169 #, php-format msgid "No valid image path for theme %s found!" -msgstr "" +msgstr "ไม่มีเส้นทางรูปภาพที่ถูกต้องสำหรับชุดรูปแบบ %s ที่พบ" #: libraries/Theme.class.php:458 msgid "No preview available." @@ -3299,26 +3303,26 @@ msgstr "ไม่สามารถแสดงตัวอย่างได้ #: libraries/Theme.class.php:460 msgid "take it" -msgstr "" +msgstr "ลงมือ" #: libraries/Theme_Manager.class.php:137 -#, php-format +#, fuzzy, php-format msgid "Default theme %s not found!" -msgstr "" +msgstr "เริ่มต้นชุดรูปแบบ %s ไม่พบ" #: libraries/Theme_Manager.class.php:194 #, php-format msgid "Theme %s not found!" -msgstr "" +msgstr "ชุดรูปแบบ %s ไม่พบ" #: libraries/Theme_Manager.class.php:271 -#, php-format +#, fuzzy, php-format msgid "Theme path not found for theme %s!" -msgstr "" +msgstr "เส้นทางของชุดรูปแบบ %s ไม่พบ" #: libraries/Theme_Manager.class.php:363 themes.php:16 themes.php:21 msgid "Theme" -msgstr "" +msgstr "ชุดรูปแบบ" #: libraries/Types.class.php:295 msgid "" @@ -7209,7 +7213,7 @@ msgstr "รูปแบบนี้ไม่มีตัวเลือก" #: libraries/plugins/auth/AuthenticationConfig.class.php:73 msgid "Cannot connect: invalid settings." -msgstr "" +msgstr "ไม่สามารถเชื่อมต่อ: ตั้งค่าไม่ถูกต้อง" #: libraries/plugins/auth/AuthenticationConfig.class.php:85 #: libraries/plugins/auth/AuthenticationCookie.class.php:140 @@ -7224,6 +7228,8 @@ msgid "" "You probably did not create a configuration file. You might want to use the " "%1$ssetup script%2$s to create one." msgstr "" +"คุณคงไม่ได้สร้างแฟ้มการกำหนดค่า คุณอาจต้องการใช้ %1$ssetup script%2$s " +"เพื่อสร้างอย่างใดอย่างหนึ่ง" #: libraries/plugins/auth/AuthenticationConfig.class.php:121 msgid "" @@ -7232,6 +7238,10 @@ msgid "" "configuration and make sure that they correspond to the information given by " "the administrator of the MySQL server." msgstr "" +"phpMyAdmin พยายามเชื่อมต่อไปยังเซิร์ฟเวอร์ MySQL " +"และเซิร์ฟเวอร์ได้ปฏิเสธการเชื่อมต่อดังกล่าว คุณควรตรวจสอบโฮสต์ " +"ชื่อผู้ใช้และรหัสผ่านในการกำหนดค่าของคุณ และให้แน่ใจว่าค่าต่างๆ " +"สอดคล้องกับข้อมูลที่กำหนดไว้ โดยผู้ดูแลระบบของเซิร์ฟเวอร์ MySQL แล้ว" #: libraries/plugins/auth/AuthenticationCookie.class.php:42 msgid "Failed to use Blowfish from mcrypt!" @@ -7270,13 +7280,13 @@ msgstr "ตัวเลือกเซิร์ฟเวอร์" #: libraries/plugins/auth/AuthenticationSignon.class.php:249 msgid "" "Login without a password is forbidden by configuration (see AllowNoPassword)" -msgstr "" +msgstr "ห้ามกำหนดค่า สำหรับการเข้าสู่ระบบโดยไม่มีรหัสผ่าน (ดู AllowNoPassword)" #: libraries/plugins/auth/AuthenticationCookie.class.php:578 #: libraries/plugins/auth/AuthenticationSignon.class.php:256 #, php-format msgid "No activity within %s seconds; please log in again" -msgstr "" +msgstr "ไม่มีกิจกรรมภายใน %s วินาที กรุณาล็อกอินอีกครั้ง" #: libraries/plugins/auth/AuthenticationCookie.class.php:591 #: libraries/plugins/auth/AuthenticationCookie.class.php:593 @@ -7290,25 +7300,25 @@ msgstr "อนุญาตให้เข้าใช้ไม่ได้ ช #: libraries/plugins/auth/AuthenticationSignon.class.php:102 msgid "Can not find signon authentication script:" -msgstr "" +msgstr "สามารถค้นหา signon สำหรับตรวจสอบสคริปต์:" #: libraries/plugins/auth/swekey/swekey.auth.lib.php:132 #, php-format msgid "File %s does not contain any key id" -msgstr "" +msgstr "แฟ้ม %s ไม่ควรประกอบไปด้วยรหัสคีย์ใดๆ" #: libraries/plugins/auth/swekey/swekey.auth.lib.php:174 #: libraries/plugins/auth/swekey/swekey.auth.lib.php:194 msgid "Hardware authentication failed" -msgstr "" +msgstr "ตรวจสอบฮาร์ดแวร์ล้มเหลว" #: libraries/plugins/auth/swekey/swekey.auth.lib.php:181 msgid "No valid authentication key plugged" -msgstr "" +msgstr "ไม่มีคีย์รับรองความถูกต้อง" #: libraries/plugins/auth/swekey/swekey.auth.lib.php:214 msgid "Authenticating..." -msgstr "" +msgstr "กำลังตรวจสอบ..." #: libraries/plugins/export/ExportCsv.class.php:112 #: libraries/plugins/import/ImportCsv.class.php:78 From 72da3b8880ae7cb3b1952a04a963188028589587 Mon Sep 17 00:00:00 2001 From: Alex Marin Date: Tue, 7 Aug 2012 14:58:29 +0300 Subject: [PATCH 17/28] oop: properties - fix invalid argument for foreach --- libraries/plugin_interface.lib.php | 250 +++++++++++++++-------------- 1 file changed, 127 insertions(+), 123 deletions(-) diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index dd98bcbd88..b7e9d39290 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -199,7 +199,7 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null) $plugin_name = strtolower(substr(get_class($plugin), strlen($section))); $ret .= ''. "\n"; } - + return $ret; } @@ -245,137 +245,141 @@ function PMA_pluginGetOneOption( } } - if (! isset($properties)) { $not_subgroup_header = true; - $properties = $propertyGroup->getProperties(); + if (method_exists($propertyGroup, 'getProperties')) { + $properties = $propertyGroup->getProperties(); + } } - foreach ($properties as $propertyItem) { - $property_class = get_class($propertyItem); - // if the property is a subgroup, we deal with it recursively - if (strpos($property_class, "Subgroup")) { - // for subgroups - // each subgroup can have a header, which may also be a form element - $subgroup_header = $propertyItem->getSubgroupHeader(); - if (isset($subgroup_header)) { - $ret .= PMA_pluginGetOneOption( + + if (isset($properties)) { + foreach ($properties as $propertyItem) { + $property_class = get_class($propertyItem); + // if the property is a subgroup, we deal with it recursively + if (strpos($property_class, "Subgroup")) { + // for subgroups + // each subgroup can have a header, which may also be a form element + $subgroup_header = $propertyItem->getSubgroupHeader(); + if (isset($subgroup_header)) { + $ret .= PMA_pluginGetOneOption( + $section, + $plugin_name, + $subgroup_header + ); + } + + $ret .= '
  • getName() . '">'; + } else { + $ret .= '>'; + } + + $ret .= PMA_pluginGetOneOption( $section, $plugin_name, - $subgroup_header + $propertyItem, + true ); - } - - $ret .= '
  • getName() . '">'; } else { - $ret .= '>'; - } + // single property item + switch ($property_class) { + case "BoolPropertyItem": + $ret .= '
  • ' . "\n"; + $ret .= 'getName()); - $ret .= PMA_pluginGetOneOption( - $section, - $plugin_name, - $propertyItem, - true - ); - } else { - // single property item - switch ($property_class) { - case "BoolPropertyItem": - $ret .= '
  • ' . "\n"; - $ret .= 'getName()); - - if ($propertyItem->getForce() != null) { - // Same code is also few lines lower, update both if needed - $ret .= ' onclick="if (!this.checked && ' - . '(!document.getElementById(\'checkbox_' . $plugin_name - . '_' . $propertyItem->getForce() . '\') ' - . '|| !document.getElementById(\'checkbox_' - . $plugin_name . '_' . $propertyItem->getForce() - . '\').checked)) ' - . 'return false; else return true;"'; - } - $ret .= ' />'; - $ret .= ''; - break; - case "DocPropertyItem": - echo "DocPropertyItem"; - break; - case "HiddenPropertyItem": - $ret .= '
    • '; - break; - case "MessageOnlyPropertyItem": - $ret .= '
  • ' . "\n"; - $ret .= '

    ' . PMA_getString($propertyItem->getText()) . '

    '; - break; - case "RadioPropertyItem": - $default = PMA_pluginGetDefault($section, $plugin_name . '_' - . $propertyItem->getName()); - foreach ($propertyItem->getValues() as $key => $val) { - $ret .= '
  • getForce() != null) { + // Same code is also few lines lower, update both if needed + $ret .= ' onclick="if (!this.checked && ' + . '(!document.getElementById(\'checkbox_' . $plugin_name + . '_' . $propertyItem->getForce() . '\') ' + . '|| !document.getElementById(\'checkbox_' + . $plugin_name . '_' . $propertyItem->getForce() + . '\').checked)) ' + . 'return false; else return true;"'; } - $ret .= ' />' . '
    • '; - } - break; - case "SelectPropertyItem": - $ret .= '
  • ' . "\n"; - $ret .= ''; - $ret .= '
    • '; + break; + case "MessageOnlyPropertyItem": + $ret .= '
  • ' . "\n"; + $ret .= '

    ' . PMA_getString($propertyItem->getText()) . '

    '; + break; + case "RadioPropertyItem": + $default = PMA_pluginGetDefault($section, $plugin_name . '_' + . $propertyItem->getName()); + foreach ($propertyItem->getValues() as $key => $val) { + $ret .= '
  • ' + . PMA_getString($val) . '
    • '; } - $ret .= '>' . PMA_getString($val) . ''; - } - $ret .= ''; - break; - case "TextPropertyItem": - $ret .= '
  • ' . "\n"; - $ret .= ''; - $ret .= 'getSize() != null - ? ' size="' . $propertyItem->getSize() . '"' - : '') - . ($propertyItem->getLen() != null - ? ' maxlength="' . $propertyItem->getLen() . '"' - : '') - . ' />'; - break; - default:; + break; + case "SelectPropertyItem": + $ret .= '
  • ' . "\n"; + $ret .= ''; + $ret .= ''; + break; + case "TextPropertyItem": + $ret .= '
  • ' . "\n"; + $ret .= ''; + $ret .= 'getSize() != null + ? ' size="' . $propertyItem->getSize() . '"' + : '') + . ($propertyItem->getLen() != null + ? ' maxlength="' . $propertyItem->getLen() . '"' + : '') + . ' />'; + break; + default:; + } } } } From ca21e5b5f49c3fbac5f0c32ec6e1fe59f29f6ce7 Mon Sep 17 00:00:00 2001 From: Alex Marin Date: Tue, 7 Aug 2012 16:22:43 +0300 Subject: [PATCH 18/28] oop: properties - fix getText() on a non-object --- libraries/plugin_interface.lib.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index b7e9d39290..d0b9c45aaf 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -188,8 +188,12 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null) ) { $ret .= ' selected="selected"'; } + + if (method_exists($plugin->getProperties(), 'getText')) { + $text = $plugin->getProperties()->getText(); + } $ret .= ' value="' . $plugin_name . '">' - . PMA_getString($plugin->getProperties()->getText()) + . PMA_getString($text) . '' . "\n"; } $ret .= '' . "\n"; From aff96872a0d7ad2ad852dcc8b79d6f73f5624967 Mon Sep 17 00:00:00 2001 From: Yasitha Pandithawatta Date: Wed, 8 Aug 2012 11:37:30 +0530 Subject: [PATCH 19/28] Fixed failing test cases of Display Results --- test/classes/PMA_DisplayResults_test.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/classes/PMA_DisplayResults_test.php b/test/classes/PMA_DisplayResults_test.php index 5da925cb57..d47c2e5ffc 100644 --- a/test/classes/PMA_DisplayResults_test.php +++ b/test/classes/PMA_DisplayResults_test.php @@ -844,7 +844,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase 'DELETE FROM `data`.`new` WHERE `new`.`id` = 1', '[%_PMA_CHECKBOX_DIR_%]', 'odd row_0 vpointer vmarker', - ' ' + ' ' ) ); } @@ -1070,7 +1070,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase 'Copy Copy', 'Delete Delete', 'DELETE FROM `data`.`new` WHERE `new`.`id` = 1', - ' + ' Edit Edit Copy Copy @@ -1167,7 +1167,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase Copy Copy Edit Edit - ' + ' ) ); } @@ -1252,7 +1252,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase 'Copy Copy', 'Delete Delete', 'DELETE FROM `data`.`new` WHERE `new`.`id` = 1', - ' ' + ' ' ) ); } @@ -1351,7 +1351,7 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase 'Copy Copy', 'Delete Delete', null, - ' ' + ' ' ) ); } From cf06fe961d22c9c57a87d9dd13a0751a5702fede Mon Sep 17 00:00:00 2001 From: Yasitha Pandithawatta Date: Wed, 8 Aug 2012 12:25:11 +0530 Subject: [PATCH 20/28] Add test class for ZipFile lib --- test/libraries/PMA_Zip_test.php | 102 ++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 test/libraries/PMA_Zip_test.php diff --git a/test/libraries/PMA_Zip_test.php b/test/libraries/PMA_Zip_test.php new file mode 100644 index 0000000000..12f28a545b --- /dev/null +++ b/test/libraries/PMA_Zip_test.php @@ -0,0 +1,102 @@ +object = $this->getMockForAbstractClass('ZipFile'); + + } + + /** + * 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); + } + + /** + * Test for setDoWrite + */ + public function testSetDoWrite(){ + $this->object->setDoWrite(); + $this->assertTrue($this->object->doWrite); + } + + /** + * Test for unix2DosTime + * + * @param $unixtime + * @param $output + * + * @dataProvider providerForTestUnix2DosTime + */ + public function testUnix2DosTime($unixTime, $output){ + $this->assertEquals( + $this->object->unix2DosTime($unixTime), + $output + ); + } + + public function providerForTestUnix2DosTime(){ + return array( + array( + 123456, + 2162688 + ), + array( + 234232, + 2162688 + ), + ); + } + + /** + * Test for addFile + */ + public function testAddFile(){ + $this->assertEquals( + $this->object->addFile('This is test content for the file', 'Test file'), + '' + ); + $this->assertTrue(!empty($this->object->ctrl_dir)); + } + + /** + * Test for file + */ + public function testFile(){ + $file = $this->object->file(); + $this->assertTrue( + !empty($file) + ); + } +} From 8c91c10cebcbd0da9482a7946e39e14d6d24ee67 Mon Sep 17 00:00:00 2001 From: Anusuk Sangubon Date: Wed, 8 Aug 2012 08:31:04 +0200 Subject: [PATCH 21/28] Translated using Weblate. --- po/th.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/th.po b/po/th.po index d87a04fd01..3a56f66995 100644 --- a/po/th.po +++ b/po/th.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-08-07 09:12+0200\n" -"Last-Translator: jaideejung007 \n" +"PO-Revision-Date: 2012-08-08 08:31+0200\n" +"Last-Translator: Anusuk Sangubon \n" "Language-Team: Thai \n" "Language: th\n" "MIME-Version: 1.0\n" @@ -3616,7 +3616,7 @@ msgstr "" #: libraries/bookmark.lib.php:83 msgid "shared" -msgstr "" +msgstr "ใช้ร่วมกัน" #: libraries/build_html_for_db.lib.php:26 #: libraries/config/messages.inc.php:187 @@ -3717,7 +3717,7 @@ msgstr "" #: libraries/common.inc.php:1083 msgid "possible exploit" -msgstr "" +msgstr "ใช้ประโยชน์ได้" #: libraries/common.inc.php:1092 msgid "numeric key detected" From 8431884c8d6be30bc9e7f44c429d4680645ddd48 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Wed, 8 Aug 2012 14:01:07 +0200 Subject: [PATCH 22/28] Translated using Weblate. --- po/el.po | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/po/el.po b/po/el.po index b55d632481..59b5ec0c82 100644 --- a/po/el.po +++ b/po/el.po @@ -4,15 +4,15 @@ 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-03-22 09:27+0200\n" +"PO-Revision-Date: 2012-08-08 14:01+0200\n" "Last-Translator: Panagiotis Papazoglou \n" -"Language-Team: greek \n" +"Language-Team: Greek \n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 0.8\n" +"X-Generator: Weblate 1.2\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:353 #: libraries/display_tbl.lib.php:359 server_privileges.php:1677 @@ -1545,10 +1545,9 @@ msgid "From general log" msgstr "Από την γενική καταγραφή" #: js/messages.php:176 -#, fuzzy #| msgid "Loading logs" msgid "Analysing logs" -msgstr "Φόρτωση καταγραφών" +msgstr "Ανάλυση καταγραφών" #: js/messages.php:177 msgid "Analysing & loading logs. This may take a while." @@ -1589,10 +1588,9 @@ msgid "Jump to Log table" msgstr "Μετάβαση στον πίνακα Καταγραφής" #: js/messages.php:184 -#, fuzzy #| msgid "No data" msgid "No data found" -msgstr "Δεν υπάρχουν δεδομένα" +msgstr "Δεν βρέθηκαν δεδομένα" #: js/messages.php:185 msgid "Log analysed, but no data found in this time span." @@ -1630,16 +1628,14 @@ msgid "Chart" msgstr "Διάγραμμα" #: js/messages.php:195 -#, fuzzy #| msgid "Add chart" msgid "Edit chart" -msgstr "Προσθήκη διαγράμματος" +msgstr "Επεξεργασία διαγράμματος" #: js/messages.php:196 -#, fuzzy #| msgid "Series:" msgid "Series" -msgstr "Σειρές:" +msgstr "Σειρές" #. l10n: A collection of available filters #: js/messages.php:199 @@ -1716,16 +1712,14 @@ msgid "Import" msgstr "Εισαγωγή" #: js/messages.php:217 -#, fuzzy #| msgid "Could not import configuration" msgid "Import monitor configuration" -msgstr "Αδύνατη η εισαγωγή ρυθμίσεων" +msgstr "Εισαγωγή ρύθμισης εποπτείας" #: js/messages.php:218 -#, fuzzy #| msgid "Please check the following points:" msgid "Please select the file you want to import" -msgstr "Ελέγξτε τα ακόλουθα σημεία:" +msgstr "Ελέγξτε το αρχείο που θέλετε να εισάγετε" #: js/messages.php:220 msgid "Analyse Query" @@ -1792,7 +1786,6 @@ msgstr "Προσθήκη Πρωτεύοντος Κλειδιού" #: js/messages.php:244 libraries/relation.lib.php:80 pmd_general.php:380 #: pmd_general.php:537 pmd_general.php:585 pmd_general.php:661 #: pmd_general.php:715 pmd_general.php:778 -#, fuzzy msgid "OK" msgstr "Εντάξει" @@ -1924,7 +1917,7 @@ msgstr "Η μετάβαση πάνω από ένα σημείο θα δείξε #: js/messages.php:304 msgid "To zoom in, select a section of the plot with the mouse." -msgstr "" +msgstr "Για να εστιάσετε, επιλέξτε ένα τομέα της εκτύπωσης με το ποντίκι." #: js/messages.php:306 msgid "Click reset zoom link to come back to original state." @@ -12093,10 +12086,9 @@ msgid "How to use" msgstr "Πως να το χρησιμοποιήσετε" #: tbl_zoom_select.php:431 -#, fuzzy #| msgid "Reset" msgid "Reset zoom" -msgstr "Επαναφορά" +msgstr "Επανφορά εστίασης" #: themes.php:28 msgid "Get more themes!" From 0005bc676cfabcf8ec14e49ed400f218a23df37c Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Wed, 8 Aug 2012 14:10:46 +0200 Subject: [PATCH 23/28] Translated using Weblate. --- po/el.po | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/po/el.po b/po/el.po index 86a11f0127..2c96fbf673 100644 --- a/po/el.po +++ b/po/el.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-03-22 09:27+0200\n" +"PO-Revision-Date: 2012-08-08 14:01+0200\n" "Last-Translator: Panagiotis Papazoglou \n" -"Language-Team: greek \n" +"Language-Team: Greek \n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 0.8\n" +"X-Generator: Weblate 1.2\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354 #: libraries/DisplayResults.class.php:794 @@ -1409,10 +1409,9 @@ msgid "From general log" msgstr "Από την γενική καταγραφή" #: js/messages.php:172 -#, fuzzy #| msgid "Loading logs" msgid "Analysing logs" -msgstr "Φόρτωση καταγραφών" +msgstr "Ανάλυση καταγραφών" #: js/messages.php:173 msgid "Analysing & loading logs. This may take a while." @@ -1453,10 +1452,9 @@ msgid "Jump to Log table" msgstr "Μετάβαση στον πίνακα Καταγραφής" #: js/messages.php:180 -#, fuzzy #| msgid "No data" msgid "No data found" -msgstr "Δεν υπάρχουν δεδομένα" +msgstr "Δεν βρέθηκαν δεδομένα" #: js/messages.php:181 msgid "Log analysed, but no data found in this time span." @@ -1497,16 +1495,14 @@ msgid "Chart" msgstr "Διάγραμμα" #: js/messages.php:191 -#, fuzzy #| msgid "Add chart" msgid "Edit chart" -msgstr "Προσθήκη διαγράμματος" +msgstr "Επεξεργασία διαγράμματος" #: js/messages.php:192 -#, fuzzy #| msgid "Series:" msgid "Series" -msgstr "Σειρές:" +msgstr "Σειρές" #. l10n: A collection of available filters #: js/messages.php:195 @@ -1583,16 +1579,14 @@ msgid "Import" msgstr "Εισαγωγή" #: js/messages.php:213 -#, fuzzy #| msgid "Could not import configuration" msgid "Import monitor configuration" -msgstr "Αδύνατη η εισαγωγή ρυθμίσεων" +msgstr "Εισαγωγή ρύθμισης εποπτείας" #: js/messages.php:214 -#, fuzzy #| msgid "Please select the primary key or a unique key" msgid "Please select the file you want to import" -msgstr "Επιλέξτε το πρωτεύον κλειδί ή ένα μοναδικό κλειδί" +msgstr "Ελέγξτε το αρχείο που θέλετε να εισάγετε" #: js/messages.php:216 msgid "Analyse Query" @@ -1830,7 +1824,7 @@ msgstr "Η μετάβαση πάνω από ένα σημείο θα δείξε #: js/messages.php:304 msgid "To zoom in, select a section of the plot with the mouse." -msgstr "" +msgstr "Για να εστιάσετε, επιλέξτε ένα τομέα της εκτύπωσης με το ποντίκι." #: js/messages.php:306 #, fuzzy @@ -3325,10 +3319,9 @@ msgid "How to use" msgstr "Πως να το χρησιμοποιήσετε" #: libraries/TableSearch.class.php:1210 -#, fuzzy #| msgid "Reset" msgid "Reset zoom" -msgstr "Επαναφορά" +msgstr "Επανφορά εστίασης" #: libraries/Theme.class.php:169 #, php-format From 4df208ed4cefd256a0d15ff134932dc2ea78d514 Mon Sep 17 00:00:00 2001 From: Aputsiaq Niels Janussen Date: Thu, 9 Aug 2012 08:26:33 +0200 Subject: [PATCH 24/28] Translated using Weblate. --- po/da.po | 129 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 73 insertions(+), 56 deletions(-) diff --git a/po/da.po b/po/da.po index 1a23a1a72f..54c1d5386f 100644 --- a/po/da.po +++ b/po/da.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-08-05 02:30+0200\n" +"PO-Revision-Date: 2012-08-09 08:26+0200\n" "Last-Translator: Aputsiaq Niels Janussen \n" "Language-Team: Danish \n" "Language: da\n" @@ -3613,7 +3613,7 @@ msgstr "" #: libraries/Types.class.php:713 msgid "A system's default double-precision floating-point number" -msgstr "" +msgstr "Et systems standard for flydepunktstal med dobbelt præcision" #: libraries/Types.class.php:715 msgid "True or false" @@ -3632,22 +3632,28 @@ msgid "" "A timestamp, range is '0001-01-01 00:00:00' UTC to '9999-12-31 23:59:59' " "UTC; TIMESTAMP(6) can store microseconds" msgstr "" +"Et tidsstempel, intervallet er '0001-01-01 00:00:00' UTC til '9999-12-31 " +"23:59:59' UTC; TIMESTAMP(6) kan lagre mikrosekunder" #: libraries/Types.class.php:733 msgid "" "A variable-length (0-65,535) string, uses binary collation for all " "comparisons" msgstr "" +"En streng med variabel længde (0-65.535), bruger binær sammenligning for " +"alle sammenligninger" #: libraries/Types.class.php:735 msgid "" "A BLOB column with a maximum length of 65,535 (2^16 - 1) bytes, stored with " "a four-byte prefix indicating the length of the value" msgstr "" +"En BLOB-kolonne med en maksimal længde på 65.535 (2^16 - 1) bytes, lagret " +"med et præfiks på fire byte som indikerer længden af værdien" #: libraries/Types.class.php:737 msgid "An enumeration, chosen from the list of defined values" -msgstr "" +msgstr "En optælling, udvalgt fra listen med definerede værdier" #: libraries/bookmark.lib.php:83 msgid "shared" @@ -4040,10 +4046,13 @@ msgid "" "Use user-friendly editor for editing SQL queries ([a@http://codemirror.net/]" "CodeMirror[/a]) with syntax highlighting and line numbers" msgstr "" +"Brug en brugervenlig redigering til redigering af SQL-forespørgsler, " +"([a@http://codemirror.net/]CodeMirror[/a]) med fremhævelse af syntaks og " +"linjenummerering" #: libraries/config/messages.inc.php:35 msgid "Enable CodeMirror" -msgstr "" +msgstr "Slå CodeMirror til" #: libraries/config/messages.inc.php:36 msgid "" @@ -4153,7 +4162,7 @@ msgstr "Standard tabel-fane" #: libraries/config/messages.inc.php:58 msgid "Whether the table structure actions should be hidden" -msgstr "" +msgstr "Om hvorvidt handlinger for tabel-struktur skal være skjulte" #: libraries/config/messages.inc.php:59 msgid "Hide table structure actions" @@ -4732,6 +4741,8 @@ msgstr "Database-struktur" #: libraries/config/messages.inc.php:229 msgid "Choose which details to show in the database structure (list of tables)" msgstr "" +"Vælg hvilke detaljer, der skal vises i database-strukturen (liste af " +"tabeller)" #: libraries/config/messages.inc.php:230 msgid "Table structure" @@ -4739,7 +4750,7 @@ msgstr "Tabel-struktur" #: libraries/config/messages.inc.php:231 msgid "Settings for the table structure (list of columns)" -msgstr "" +msgstr "Indstillinger for tabel-strukturen (liste af kolonner)" #: libraries/config/messages.inc.php:232 msgid "Tabs" @@ -5780,6 +5791,8 @@ msgstr "Vis formular til databaseoprettelse" #: libraries/config/messages.inc.php:460 msgid "Show or hide a column displaying the Creation timestamp for all tables" msgstr "" +"Vis eller skjul en kolonne, der viser oprettelses-tidsstempel for alle " +"tabeller" #: libraries/config/messages.inc.php:461 msgid "Show Creation timestamp" @@ -5789,15 +5802,19 @@ msgstr "Vis tidsstempel for oprettelse" msgid "" "Show or hide a column displaying the Last update timestamp for all tables" msgstr "" +"Vis eller skjul en kolonne, der viser tidsstempel med seneste opdatering for " +"alle tabeller" #: libraries/config/messages.inc.php:463 msgid "Show Last update timestamp" -msgstr "" +msgstr "Vis tidsstempel med seneste opdatering" #: libraries/config/messages.inc.php:464 msgid "" "Show or hide a column displaying the Last check timestamp for all tables" msgstr "" +"Vis eller skjul en kolonne, der viser tidsstempel med seneste tjek for alle " +"tabeller" #: libraries/config/messages.inc.php:465 msgid "Show Last check timestamp" @@ -6441,15 +6458,15 @@ msgstr "Konvertering af indkodning:" #: libraries/display_git_revision.lib.php:59 #, php-format msgid "%1$s from %2$s branch" -msgstr "" +msgstr "%1$s fra grenen %2$s" #: libraries/display_git_revision.lib.php:61 msgid "no branch" -msgstr "" +msgstr "ingen gren" #: libraries/display_git_revision.lib.php:67 msgid "Git revision" -msgstr "" +msgstr "Git-revision" #: libraries/display_git_revision.lib.php:70 #, php-format @@ -6474,7 +6491,7 @@ msgstr "" #: libraries/display_import.lib.php:76 #, php-format msgid "%s of %s" -msgstr "" +msgstr "%s af %s" #: libraries/display_import.lib.php:85 msgid "Uploading your import file..." @@ -6483,15 +6500,15 @@ msgstr "Overfører din importfil ..." #: libraries/display_import.lib.php:93 #, php-format msgid "%s/sec." -msgstr "" +msgstr "%s/sek." #: libraries/display_import.lib.php:100 msgid "About %MIN min. %SEC sec. remaining." -msgstr "" +msgstr "Omtrent %MIN min. %SEC sek. resterer." #: libraries/display_import.lib.php:104 msgid "About %SEC sec. remaining." -msgstr "" +msgstr "Omtrent %SEC sek. resterer." #: libraries/display_import.lib.php:134 msgid "The file is being processed, please be patient." @@ -7333,7 +7350,7 @@ msgstr "Kunne ikke bruge Blowfish fra mcrypt!" #: libraries/plugins/auth/AuthenticationCookie.class.php:81 msgid "Your session has expired. Please login again." -msgstr "" +msgstr "Din session er udløbet. Log venligst ind igen." #: libraries/plugins/auth/AuthenticationCookie.class.php:170 msgid "Log in" @@ -7636,15 +7653,14 @@ msgstr "" "indeholdende specielle tegn og nøgleord)" #: libraries/plugins/export/ExportSql.class.php:354 -#, fuzzy #| msgid "Object creation options" msgid "Data creation options" -msgstr "Object oprettelsesindstillinger" +msgstr "Indstillinger for oprettelse af data" #: libraries/plugins/export/ExportSql.class.php:358 #: libraries/plugins/export/ExportSql.class.php:1573 msgid "Truncate table before insert" -msgstr "" +msgstr "Trunkér tabel forud for indsættelse" #: libraries/plugins/export/ExportSql.class.php:364 msgid "Instead of INSERT statements, use:" @@ -7899,13 +7915,15 @@ msgstr "XML" #: libraries/plugins/import/PMA_ShapeRecord.class.php:58 #, php-format msgid "Geometry type '%s' is not supported by MySQL." -msgstr "" +msgstr "Geometri-typen '%s' understøttes ikke af MySQL." #: libraries/plugins/transformations/abstract/AppendTransformationsPlugin.class.php:31 msgid "" "Appends text to a string. The only option is the text to be appended " "(enclosed in single quotes, default empty string)." msgstr "" +"Føjer tekst til en streng. Den eneste valgmulighed er at teksten føjes til " +"(omsluttet af enkelte anførselstegn, standardindstilling er en tom streng)." #: libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php:31 msgid "" @@ -7940,7 +7958,6 @@ msgstr "" "feltet i den første indstilling være sat til en tom streng." #: libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php:31 -#, fuzzy #| msgid "" #| "LINUX ONLY: Launches an external application and feeds it the column data " #| "via standard input. Returns the standard output of the application. The " @@ -7964,16 +7981,17 @@ msgid "" "option, if set to 1, will prevent wrapping and ensure that the output " "appears all on one line (Default 1)." msgstr "" -"KUN LINUX: Starter en ekstern applikation og føder feltdata via standard " -"input. Returnerer standardoutputtet for applikationen. Standard er Tidy, for " -"korrekt udskrivning af HTML-kode. Af sikkerhedsårsager er du nødt til " -"manuelt at redigere filen libraries/transformations/text_plain__external.inc." -"php og indsætte de værktøjer du vil tillade kørsel af. Første indstilling er " -"så nummeret på det program du vil bruge og den anden indstilling er " -"parametrene for dette program. Tredie parameter vil, hvis sat til 1, " -"konvertere outputtet vha. htmlspecialchars() (Standard er 1). Et fjerde " -"parameter vil, hvis sat til 1, sætte et NOWRAP om cellens indhold så hele " -"outputtet bliver vist uden omformattering (Standard 1)." +"KUN LINUX: Starter en ekstern applikation og føder feltdata via " +"standardinput. Returnerer standardoutputtet for applikationen. Standard er " +"Tidy, for korrekt udskrivning af HTML-kode. Af sikkerhedsårsager er du nødt " +"til manuelt at redigere filen " +"libraries/transformations/Text_Plain__External.class.php og indsætte de " +"værktøjer du ønsker skal være tilgængelig. Første indstilling er så nummeret " +"på det program du vil bruge og den anden indstilling er parametrene for " +"dette program. Tredje parameter vil, hvis sat til 1, konvertere outputtet " +"vha. htmlspecialchars() (Standard er 1). Det fjerde parameter vil, hvis sat " +"til 1, forhindre ombrydning og sikre at alt outputtet vises på én linje " +"(Standard 1)." #: libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php:31 msgid "" @@ -9490,7 +9508,7 @@ msgstr "Fuldtekst" #: libraries/tbl_properties.inc.php:603 msgid "first" -msgstr "" +msgstr "første" #: libraries/tbl_properties.inc.php:613 #, php-format @@ -10982,6 +11000,8 @@ msgid "" "Key cache miss calculated as rate of physical reads compared to read " "requests (calculated value)" msgstr "" +"Missede nøgle-mellemlagringer beregnet som raten af fysiske læsninger " +"sammenlignet med læse-forespørgsler (beregnet værdi)" #: server_status.php:1432 msgid "The number of requests to write a key block to the cache." @@ -10995,6 +11015,8 @@ msgstr "Antallet af fysiske skrivninger af en nøgleblok til disk." msgid "" "Percentage of physical writes compared to write requests (calculated value)" msgstr "" +"Procentdel af fysiske skrivninger sammenlignet med skrive-forespørgsler " +"(beregnet værdi)" #: server_status.php:1435 msgid "" @@ -11224,10 +11246,9 @@ msgstr "" "tråd-implementering.)" #: server_status.php:1470 -#, fuzzy #| msgid "Thread cache hit rate %%" msgid "Thread cache hit rate (calculated value)" -msgstr "Frekvens for hits i trådmellemlager %%" +msgstr "Frekvens for hits i trådmellemlager (beregnet værdi)" #: server_status.php:1471 msgid "The number of threads that are not sleeping." @@ -11908,10 +11929,9 @@ msgid "Using bookmark \"%s\" as default browse query." msgstr "Bruger bogmærket \"%s\" som standard-forespørgsel til gennemsyn." #: sql.php:434 -#, fuzzy #| msgid "Do you really want to " msgid "Do you really want to execute following query?" -msgstr "Er du sikker på at du vil " +msgstr "Er du sikker på at du vil udføre følgende forespørsel?" #: sql.php:802 msgid "Showing as PHP code" @@ -11944,10 +11964,9 @@ msgid "Table %1$s has been altered successfully" msgstr "Tabel %1$s er blevet ændret" #: tbl_alter.php:133 -#, fuzzy #| msgid "The selected users have been deleted successfully." msgid "The columns have been moved successfully." -msgstr "De valgte brugere er blevet korrekt slettet." +msgstr "Flytning af kolonnen er blevet fuldført." #: tbl_chart.php:83 #| msgid "Bar" @@ -12280,10 +12299,9 @@ msgid "Spatial" msgstr "Spatial" #: tbl_structure.php:161 tbl_structure.php:165 -#, fuzzy #| msgid "Browse distinct values" msgid "Distinct values" -msgstr "Gennemse bestemte værdier" +msgstr "Distinkte værdier" #: tbl_structure.php:166 tbl_structure.php:167 msgid "Add primary key" @@ -12328,14 +12346,13 @@ msgid "Show more actions" msgstr "Vis flere operationer" #: tbl_structure.php:619 tbl_structure.php:686 -#, fuzzy #| msgid "Remove column(s)" msgid "Move columns" -msgstr "Fjern kolonne(r)" +msgstr "Flyt kolonner" #: tbl_structure.php:620 msgid "Move the columns by dragging them up and down." -msgstr "" +msgstr "Flyt kolonnerne ved at trække dem op og ned." #: tbl_structure.php:646 msgid "Edit view" @@ -12381,22 +12398,22 @@ msgid "Tracking report for table `%s`" msgstr "Sporings rapport for tabel `%s`" #: tbl_tracking.php:198 -#, fuzzy, php-format +#, php-format #| msgid "Version %s is created, tracking for %s.%s is activated." msgid "Version %1$s was created, tracking for %2$s is active." -msgstr "Version %s er oprettet, sporing for %s.%s er aktiveret." +msgstr "Version %1$s blev oprettet, sporing af %2$s er aktiv." #: tbl_tracking.php:215 -#, fuzzy, php-format +#, php-format #| msgid "Tracking of %s.%s is activated." msgid "Tracking for %1$s was deactivated at version %2$s." -msgstr "Sporing af %s.%s er aktiveret." +msgstr "Sporing af %1$s blev deaktiveret i version %2$s." #: tbl_tracking.php:232 -#, fuzzy, php-format +#, php-format #| msgid "Tracking of %s.%s is activated." msgid "Tracking for %1$s was activated at version %2$s." -msgstr "Sporing af %s.%s er aktiveret." +msgstr "Sporing af %1$s blev aktiveret i version %2$s." #: tbl_tracking.php:246 msgid "SQL statements executed." @@ -12440,10 +12457,10 @@ msgid "Tracking statements" msgstr "Sporingskommandoer" #: tbl_tracking.php:499 tbl_tracking.php:631 -#, fuzzy, php-format +#, php-format #| msgid "Show %s with dates from %s to %s by user %s %s" msgid "Show %1$s with dates from %2$s to %3$s by user %4$s %5$s" -msgstr "Vis %s med datoer fra %s til %s for bruger %s %s" +msgstr "Vis %1$s med datoer fra %2$s til %3$s for brugeren %4$s %5$s" #: tbl_tracking.php:504 msgid "Delete tracking data row from report" @@ -12491,30 +12508,30 @@ msgid "Show versions" msgstr "Vis versioner" #: tbl_tracking.php:772 -#, fuzzy, php-format +#, php-format #| msgid "Deactivate tracking for %s.%s" msgid "Deactivate tracking for %s" -msgstr "Deaktiver sporing af %s.%s" +msgstr "Deaktiver sporing af %s" #: tbl_tracking.php:774 msgid "Deactivate now" msgstr "Deaktiver nu" #: tbl_tracking.php:785 -#, fuzzy, php-format +#, php-format #| msgid "Activate tracking for %s.%s" msgid "Activate tracking for %s" -msgstr "Aktiver sporing af %s.%s" +msgstr "Aktiver sporing af %s" #: tbl_tracking.php:787 msgid "Activate now" msgstr "Aktiver nu" #: tbl_tracking.php:800 -#, fuzzy, php-format +#, php-format #| msgid "Create version %s of %s.%s" msgid "Create version %1$s of %2$s" -msgstr "Opret version %s af %s.%s" +msgstr "Opret version %1$s af %2$s" #: tbl_tracking.php:804 msgid "Track these data definition statements:" From b7f580e8b5547322fa76ffe38dd6df47132530f6 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Thu, 9 Aug 2012 08:45:21 +0200 Subject: [PATCH 25/28] Translated using Weblate. --- po/el.po | 331 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 193 insertions(+), 138 deletions(-) diff --git a/po/el.po b/po/el.po index 2c96fbf673..c50ede395e 100644 --- a/po/el.po +++ b/po/el.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-08-08 14:01+0200\n" +"PO-Revision-Date: 2012-08-09 08:45+0200\n" "Last-Translator: Panagiotis Papazoglou \n" "Language-Team: Greek \n" "Language: el\n" @@ -289,16 +289,16 @@ msgid "The database name is empty!" msgstr "Το όνομα της βάσης δεδομένων είναι κενό!" #: db_operations.php:327 -#, fuzzy, php-format +#, php-format #| msgid "Database %s has been renamed to %s" msgid "Database %1$s has been renamed to %2$s" -msgstr "Η βάση δεδομένων %s μετονομάστηκε σε %s" +msgstr "Η βάση δεδομένων %1$s μετονομάστηκε σε %2$s" #: db_operations.php:331 -#, fuzzy, php-format +#, php-format #| msgid "Database %s has been copied to %s" msgid "Database %1$s has been copied to %2$s" -msgstr "Η βάση δεδομένων %s αντιγράφηκε στη %s" +msgstr "Η βάση δεδομένων %1$s αντιγράφηκε στη %2$s" #: db_operations.php:465 msgid "Rename database to" @@ -930,10 +930,10 @@ msgid "\"DROP DATABASE\" statements are disabled." msgstr "Οι εντολές «DROP DATABASE» έχουν απενεργοποιηθεί." #: js/messages.php:30 -#, fuzzy, php-format +#, php-format #| msgid "Do you really want to execute following query?" msgid "Do you really want to execute \"%s\"?" -msgstr "Θέλετε να εκτελέσετε το ακόλουθο ερώτημα;" +msgstr "Θέλετε να εκτελέσετε το ακόλουθο το «%s»;" #: js/messages.php:31 libraries/mult_submits.inc.php:307 sql.php:418 msgid "You are about to DESTROY a complete database!" @@ -1697,22 +1697,19 @@ msgid "Show indexes" msgstr "Εμφάνιση ευρετηρίων" #: js/messages.php:257 libraries/mult_submits.inc.php:317 -#, fuzzy #| msgid "Disable foreign key checks" msgid "Foreign key check:" -msgstr "Απενεργοποίηση ελέγχων μη διακριτών κλειδιών" +msgstr "Έλεγχος μη διακριτού κλειδιού:" #: js/messages.php:258 libraries/mult_submits.inc.php:321 -#, fuzzy #| msgid "Enabled" msgid "(Enabled)" -msgstr "Ενεργοποιημένη" +msgstr "(Ενεργοποιημένη)" #: js/messages.php:259 libraries/mult_submits.inc.php:321 -#, fuzzy #| msgid "Disabled" msgid "(Disabled)" -msgstr "Απενεργοποιημένη" +msgstr "(Απενεργοποιημένη)" #: js/messages.php:262 msgid "Searching" @@ -1827,11 +1824,11 @@ msgid "To zoom in, select a section of the plot with the mouse." msgstr "Για να εστιάσετε, επιλέξτε ένα τομέα της εκτύπωσης με το ποντίκι." #: js/messages.php:306 -#, fuzzy #| msgid "Click reset zoom link to come back to original state." msgid "Click reset zoom button to come back to original state." msgstr "" -"Πατήστε στην επαναφορά εστίασης για να επιστρέψετε στην αρχική κατάσταση." +"Πατήστε το κουμπί επαναφοράς εστίασης για να επιστρέψετε στην αρχική " +"κατάσταση." #: js/messages.php:308 msgid "Click a data point to view and possibly edit the data row." @@ -1927,7 +1924,7 @@ msgstr "Πατήστε για εναλλαγή επισήμανσης" #: js/messages.php:352 msgid "Double-click to copy column name" -msgstr "" +msgstr "Διπλό κλικ για αντιγραφή ονόματος στήλης" #: js/messages.php:353 msgid "Click the drop-down arrow
    to toggle column's visibility" @@ -1954,20 +1951,18 @@ msgid "Go to link" msgstr "Μετάβαση στο σύνδεσμο" #: js/messages.php:358 -#, fuzzy #| msgid "Column names" msgid "Copy column name" -msgstr "Ονόματα στηλών" +msgstr "Αντιγραφή ονόματος στήλης" #: js/messages.php:359 msgid "Right-click the column name to copy it to your clipboard." -msgstr "" +msgstr "Δεξί κλικ στο όνομα στήλης για αντιγραφή του στο πρόχειρο." #: js/messages.php:360 -#, fuzzy #| msgid "Update row(s)" msgid "Show data row(s)" -msgstr "Ενημέρωση γραμμής(ών)" +msgstr "Προβολή γραμμής(ών) δεδομένων" #: js/messages.php:363 msgid "Generate password" @@ -2261,53 +2256,55 @@ msgstr "Δευτερόλεπτο" #: libraries/Advisor.class.php:67 #, php-format msgid "PHP threw following error: %s" -msgstr "" +msgstr "Η PHP έδωσε το ακόλουθο σφάλμα: %s" #: libraries/Advisor.class.php:89 #, php-format msgid "Failed evaluating precondition for rule '%s'" -msgstr "" +msgstr "Απέτυχε η αξιολόγηση προσυνθήκης για τον κανόνα «%s»" #: libraries/Advisor.class.php:106 #, php-format msgid "Failed calculating value for rule '%s'" -msgstr "" +msgstr "Απέτυχε ο υπολογισμός τιμής για τον κανόνα «%s»" #: libraries/Advisor.class.php:125 #, php-format msgid "Failed running test for rule '%s'" -msgstr "" +msgstr "Απέτυχε η εκτέλεση ελέγχου για τον κανόνα «%s»" #: libraries/Advisor.class.php:207 -#, fuzzy, php-format +#, php-format #| msgid "" #| "Failed formatting string for rule '%s'. PHP threw following error: %s" msgid "Failed formatting string for rule '%s'." -msgstr "" -"Αποτυχία διαμόρφωσης κειμένου για τον κανόνα «%s». Η PHP έδωσε το ακόλουθο " -"σφάλμα: %s" +msgstr "Αποτυχία διαμόρφωσης κειμένου για τον κανόνα «%s»." #: libraries/Advisor.class.php:361 #, php-format msgid "" "Invalid rule declaration on line %1$s, expected line %2$s of previous rule" msgstr "" +"Μη έγκυρη διακήρυξη κανόνα στη γραμμή %1$s, αναμενόμενη γραμμή %2$s από " +"προηγούμενο κανόνα" #: libraries/Advisor.class.php:378 -#, fuzzy, php-format +#, php-format #| msgid "Invalid format of CSV input on line %d." msgid "Invalid rule declaration on line %s" -msgstr "Μη έγκυρη μορφή στο εισαχθέν CSV στη γραμμή %d." +msgstr "Μη έγκυρη διακήρυξη κανόνα στη γραμμή %s" #: libraries/Advisor.class.php:386 #, php-format msgid "Unexpected characters on line %s" -msgstr "" +msgstr "Μη έγκυρη χαρακτήρες στη γραμμή %s" #: libraries/Advisor.class.php:400 #, php-format msgid "Unexpected character on line %1$s. Expected tab, but found \"%2$s\"" msgstr "" +"Μη έγκυρος χαρακτήρας στη γραμμή %1$s. Αναμενότας στηλοθέτης, αλλά βρέθηκε «" +"%2$s»" #: libraries/Advisor.class.php:425 server_status.php:972 msgid "per second" @@ -2688,13 +2685,13 @@ msgstr[0] "Σύνολο: %s αποτέλεσμα" msgstr[1] "Σύνολο: %s αποτελέσματα" #: libraries/DbSearch.class.php:351 -#, fuzzy, php-format +#, php-format #| msgid "%1$s match inside table %2$s" #| msgid_plural "%1$s matches inside table %2$s" msgid "%1$s match in %2$s" msgid_plural "%1$s matches in %2$s" -msgstr[0] "%1$s απατέλεσμα στον πίνακα %2$s" -msgstr[1] "%1$s αποτελέσματα στον πίνακα %2$s" +msgstr[0] "%1$s απατέλεσμα στο %2$s" +msgstr[1] "%1$s αποτελέσματα στο %2$s" #: libraries/DbSearch.class.php:373 #, php-format @@ -2770,7 +2767,7 @@ msgid "vertical" msgstr "κάθετη" #: libraries/DisplayResults.class.php:918 -#, fuzzy, php-format +#, php-format #| msgid "Headers every %s rows" msgid "Headers every %s rows" msgstr "Κεφαλίδες κάθε %s εγγραφές" @@ -2980,10 +2977,9 @@ msgstr "Από αυτό το σημείο πρέπει να έχετε ενερ #: libraries/Header.class.php:500 #: libraries/plugins/auth/AuthenticationCookie.class.php:152 -#, fuzzy #| msgid "Cookies must be enabled past this point." msgid "Javascript must be enabled past this point" -msgstr "Από αυτό το σημείο πρέπει να έχετε ενεργοποιημένα cookies." +msgstr "Από αυτό το σημείο πρέπει να έχετε ενεργοποιημένη την Javascript" #: libraries/Index.class.php:433 tbl_relation.php:540 msgid "No index defined!" @@ -3187,16 +3183,16 @@ msgid "unknown table status: " msgstr "άγνωστη κατάσταση πίνακα: " #: libraries/Table.class.php:757 -#, fuzzy, php-format +#, php-format #| msgid "Source database" msgid "Source database `%s` was not found!" -msgstr "Βάση δεδομένων προέλευσης" +msgstr "Η Βάση δεδομένων προέλευσης «%s» δεν βρέθηκε!" #: libraries/Table.class.php:765 -#, fuzzy, php-format +#, php-format #| msgid "Theme %s not found!" msgid "Target database `%s` was not found!" -msgstr "Το θέμα %s δεν βρέθηκε!" +msgstr "Η βάση δεδομένων προορισμού «%s» δεν βρέθηκε!" #: libraries/Table.class.php:1192 msgid "Invalid database" @@ -3359,42 +3355,59 @@ msgstr "Θέμα" msgid "" "A 1-byte integer, signed range is -128 to 127, unsigned range is 0 to 255" msgstr "" +"Ένας ακέραιος 1-byte, εύρος με πρόσημο είναι -128 έως 127, εύρος χωρίς " +"πρόσημο είναι 0 έως 255" #: libraries/Types.class.php:297 msgid "" "A 2-byte integer, signed range is -32,768 to 32,767, unsigned range is 0 to " "65,535" msgstr "" +"Ένας ακέραιος 2-byte, εύρος με πρόσημο είναι -32.768 έως 32.767, εύρος χωρίς " +"πρόσημο είναι 0 έως 65.535" #: libraries/Types.class.php:299 msgid "" "A 3-byte integer, signed range is -8,388,608 to 8,388,607, unsigned range is " "0 to 16,777,215" msgstr "" +"Ένας ακέραιος 3-byte, εύρος με πρόσημο είναι -8.388.608 έως 8.388.607, εύρος " +"χωρίς πρόσημο είναι 0 έως 16.777.215" #: libraries/Types.class.php:301 msgid "" "A 4-byte integer, signed range is -2,147,483,648 to 2,147,483,647, unsigned " "range is 0 to 4,294,967,295." msgstr "" +"Ένας ακέραιος 4-byte, εύρος με πρόσημο είναι -2.147.483.648 έως " +"2.147.483.647, εύρος χωρίς πρόσημο είναι 0 έως 4.294.967.295." #: libraries/Types.class.php:303 msgid "" "An 8-byte integer, signed range is -9,223,372,036,854,775,808 to " "9,223,372,036,854,775,807, unsigned range is 0 to 18,446,744,073,709,551,615" msgstr "" +"Ένας ακέραιος 8-byte, εύρος με πρόσημο είναι -9.223.372.036.854.775.808 έως " +"9.223.372.036.854.775.807, εύρος χωρίς πρόσημο είναι 0 έως " +"18.446.744.073.709.551.615" #: libraries/Types.class.php:305 libraries/Types.class.php:711 msgid "" "A fixed-point number (M, D) - the maximum number of digits (M) is 65 " "(default 10), the maximum number of decimals (D) is 30 (default 0)" msgstr "" +"Ένας αριθμός σταθερής υποδιαστολής (Μ,Δ) - ο μέγιστος αριθμός ψηφίων (Μ) " +"είναι 65 (προεπιλογή 10), ο μέγιστος αριθμός δεκαδικών είναι (Δ) είναι 30 " +"(προεπιλογή 0)" #: libraries/Types.class.php:307 msgid "" "A small floating-point number, allowable values are -3.402823466E+38 to " "-1.175494351E-38, 0, and 1.175494351E-38 to 3.402823466E+38" msgstr "" +"Ένας μικρός αριθμός κινητής υποδιαστολής, επιτρεπτές τιμές είναι " +"-3.402823466E+38 έως -1.175494351E-38, 0, και 1.175494351E-38 έως " +"3.402823466E+38" #: libraries/Types.class.php:309 msgid "" @@ -3402,63 +3415,81 @@ msgid "" "-1.7976931348623157E+308 to -2.2250738585072014E-308, 0, and " "2.2250738585072014E-308 to 1.7976931348623157E+308" msgstr "" +"Ένας αριθμός κινητής υποδιαστολής διπλής ακρίβειας, επιτρεπτές τιμές είναι " +"-1.7976931348623157E+308 έως -2.2250738585072014E-308, 0, και " +"2.2250738585072014E-308 έως 1.7976931348623157E+308" #: libraries/Types.class.php:311 msgid "" "Synonym for DOUBLE (exception: in REAL_AS_FLOAT SQL mode it is a synonym for " "FLOAT)" msgstr "" +"Συνώνυμο για το DOUBLE (εξαίρεση: στην κατάσταση SQL REAL_AS_FLOAT είναι " +"συνώνυμο με το FLOAT)" #: libraries/Types.class.php:313 msgid "" "A bit-field type (M), storing M of bits per value (default is 1, maximum is " "64)" msgstr "" +"Ένας τύπος πεδίου bit (M), αποθηκεύονται το πλήθος (M) των bits ανά τιμή " +"(προεπιλογή είναι το 1, μέγιστο είναι το 64)" #: libraries/Types.class.php:315 msgid "" "A synonym for TINYINT(1), a value of zero is considered false, nonzero " "values are considered true" msgstr "" +"Ένα συνώνυμο για το TINYINT(1), μια μηδενική τιμή θεωρείτε λάθος, μη " +"μηδενικές τιμές θεωρούνται σωστές" #: libraries/Types.class.php:317 msgid "An alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE" -msgstr "" +msgstr "Μια ετικέτα για το BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE" #: libraries/Types.class.php:319 libraries/Types.class.php:721 -#, fuzzy, php-format +#, php-format #| msgid "Create version %1$s of %2$s" msgid "A date, supported range is %1$s to %2$s" -msgstr "Δημιουργία έκδοσης %1$s του %2$s" +msgstr "Μια ημερομηνία, υποστηριζόμενο εύρος είναι από %1$s έως %2$s" #: libraries/Types.class.php:321 libraries/Types.class.php:723 #, php-format msgid "A date and time combination, supported range is %1$s to %2$s" msgstr "" +"Ένας συνδυασμός ημερομηνίας και ώρας, υποστηριζόμενο εύρος είναι από %1$s " +"έως %2$s" #: libraries/Types.class.php:323 msgid "" "A timestamp, range is 1970-01-01 00:00:01 UTC to 2038-01-09 03:14:07 UTC, " "stored as the number of seconds since the epoch (1970-01-01 00:00:00 UTC)" msgstr "" +"Μια χρονοσφραγίδα, εύρος από 1970-01-01 00:00:01 UTC έως 2038-01-09 03:14:07 " +"UTC, αποπθηκεύεται ως ο αριθμός των δευτερολέπτων από την αρχή (1970-01-01 " +"00:00:00 UTC)" #: libraries/Types.class.php:325 libraries/Types.class.php:727 -#, fuzzy, php-format +#, php-format #| msgid "Error renaming table %1$s to %2$s" msgid "A time, range is %1$s to %2$s" -msgstr "Σφάλμα μετονομασίας του πίνακα %1$s σε %2$s" +msgstr "Ένας χρόνος, εύρος είναι από %1$s έως %2$s" #: libraries/Types.class.php:327 msgid "" "A year in four-digit (4, default) or two-digit (2) format, the allowable " "values are 70 (1970) to 69 (2069) or 1901 to 2155 and 0000" msgstr "" +"Το έτος με τέσσερα ψηφία (4, προεπιλογή) ή μορφή 2 ψηφίων (2), οι επιτρεπτές " +"τιμές είναι 70 (1970) έως 69 (2069) ή 1901 έως 2155 και 0000" #: libraries/Types.class.php:329 msgid "" "A fixed-length (0-255, default 1) string that is always right-padded with " "spaces to the specified length when stored" msgstr "" +"Ένα κείμενο σταθερού μήκους (0-255, προεπιλογή 1) που είναι πάντα δεξιά " +"στοιχισμένο με κενά στο ορισμένο μήκος όταν αποθηεκύεται" #: libraries/Types.class.php:331 libraries/Types.class.php:729 #, php-format @@ -3466,24 +3497,32 @@ msgid "" "A variable-length (%s) string, the effective maximum length is subject to " "the maximum row size" msgstr "" +"Ένα κείμενο μεταβλητού μήκους (%s), το δραστικό μέγιστο μήκος είναι σχετικό " +"με το μέγιστο μέγεθος της εγγραφής" #: libraries/Types.class.php:333 msgid "" "A TEXT column with a maximum length of 255 (2^8 - 1) characters, stored with " "a one-byte prefix indicating the length of the value in bytes" msgstr "" +"Μια στήλη TEXT με μέγιστο μήκος 255 (2⁸ - 1) χαρακτήρες, αποθηκεύεται με " +"πρόθεμα 1-byte δείχνοντας το μήκος της τιμής σε bytes" #: libraries/Types.class.php:335 libraries/Types.class.php:731 msgid "" "A TEXT column with a maximum length of 65,535 (2^16 - 1) characters, stored " "with a two-byte prefix indicating the length of the value in bytes" msgstr "" +"Μια στήλη TEXT με μέγιστο μήκος 65.535 (2¹⁶ - 1) χαρακτήρες, αποθηκεύεται με " +"πρόθεμα 2-byte δείχνοντας το μήκος της τιμής σε bytes" #: libraries/Types.class.php:337 msgid "" "A TEXT column with a maximum length of 16,777,215 (2^24 - 1) characters, " "stored with a three-byte prefix indicating the length of the value in bytes" msgstr "" +"Μια στήλη TEXT με μέγιστο μήκος 16.777.215 (2²⁴ - 1) χαρακτήρες, " +"αποθηκεύεται με πρόθεμα 3-byte δείχνοντας το μήκος της τιμής σε bytes" #: libraries/Types.class.php:339 msgid "" @@ -3491,108 +3530,120 @@ msgid "" "characters, stored with a four-byte prefix indicating the length of the " "value in bytes" msgstr "" +"Μια στήλη TEXT με μέγιστο μήκος 4.294.967.295 ή 4GB (2³² - 1) χαρακτήρες, " +"αποθηκεύεται με πρόθεμα 4-byte δείχνοντας το μήκος της τιμής σε bytes" #: libraries/Types.class.php:341 msgid "" "Similar to the CHAR type, but stores binary byte strings rather than non-" "binary character strings" msgstr "" +"Παρόμοιο με τον τύπο CHAR, αλλά αποθηκεύει τα κείμενα δυαδικού byte παρά τα " +"κείμενα με μη δυαδικούς χαρακτήρες" #: libraries/Types.class.php:343 msgid "" "Similar to the VARCHAR type, but stores binary byte strings rather than non-" "binary character strings" msgstr "" +"Παρόμοιο με τον τύπο VARCHAR, αλλά αποθηκεύει τα κείμενα δυαδικού byte παρά " +"τα κείμενα με μη δυαδικούς χαρακτήρες" #: libraries/Types.class.php:345 msgid "" "A BLOB column with a maximum length of 255 (2^8 - 1) bytes, stored with a " "one-byte prefix indicating the length of the value" msgstr "" +"Μια στήλη BLOB με μέγιστο μήκος 255 (2⁸ - 1) bytes, αποθηκεύεται με πρόθεμα " +"2-byte δείχνοντας το μήκος της τιμής σε bytes" #: libraries/Types.class.php:347 msgid "" "A BLOB column with a maximum length of 16,777,215 (2^24 - 1) bytes, stored " "with a three-byte prefix indicating the length of the value" msgstr "" +"Μια στήλη BLOB με μέγιστο μήκος 16.777.215 (2²⁴ - 1) χαρακτήρες, " +"αποθηκεύεται με πρόθεμα 3-byte δείχνοντας το μήκος της τιμής σε bytes" #: libraries/Types.class.php:349 msgid "" "A BLOB column with a maximum length of 65,535 (2^16 - 1) bytes, stored with " "a two-byte prefix indicating the length of the value" msgstr "" +"Μια στήλη BLOB με μέγιστο μήκος 65.535 (2¹⁶ - 1) χαρακτήρες, αποθηκεύεται με " +"πρόθεμα 2-byte δείχνοντας το μήκος της τιμής σε bytes" #: libraries/Types.class.php:351 msgid "" "A BLOB column with a maximum length of 4,294,967,295 or 4GiB (2^32 - 1) " "bytes, stored with a four-byte prefix indicating the length of the value" msgstr "" +"Μια στήλη BLOB με μέγιστο μήκος 4.294.967.295 ή 4GB (2³² - 1) χαρακτήρες, " +"αποθηκεύεται με πρόθεμα 4-byte δείχνοντας το μήκος της τιμής σε bytes" #: libraries/Types.class.php:353 msgid "" "An enumeration, chosen from the list of up to 65,535 values or the special " "'' error value" msgstr "" +"Μια απαρίθμηση, η οποία έχει επιλεγεί από τη λίστα των έως και 65.535 τιμές " +"ή τις ειδικές \" τιμή σφάλματος" #: libraries/Types.class.php:355 msgid "A single value chosen from a set of up to 64 members" -msgstr "" +msgstr "Μία μόνο τιμή που επιλέγεται από ένα σύνολο έως και 64 μέλη" #: libraries/Types.class.php:357 msgid "A type that can store a geometry of any type" -msgstr "" +msgstr "Ένας τύπος που μπορεί να αποθηκεύσει μια γεωμετρία οποιουδήποτε τύπου" #: libraries/Types.class.php:359 msgid "A point in 2-dimensional space" -msgstr "" +msgstr "Ένα σημείο σε δισδιάστατο χώρο" #: libraries/Types.class.php:361 msgid "A curve with linear interpolation between points" -msgstr "" +msgstr "Μια καμπύλη με γραμμική παρεμβολή μεταξύ σημείων" #: libraries/Types.class.php:363 -#, fuzzy #| msgid "Add a polygon" msgid "A polygon" -msgstr "Προσθήκη πολυγώνου" +msgstr "Ένα πολύγωνο" #: libraries/Types.class.php:365 msgid "A collection of points" -msgstr "" +msgstr "Μια συλλογή από σημεία" #: libraries/Types.class.php:367 msgid "A collection of curves with linear interpolation between points" -msgstr "" +msgstr "Μια συλλογή καμπυλών με γραμμική παρεμβολή μεταξύ σημείων" #: libraries/Types.class.php:369 msgid "A collection of polygons" -msgstr "" +msgstr "Μια συλλογή πολυγώνων" #: libraries/Types.class.php:371 msgid "A collection of geometry objects of any type" -msgstr "" +msgstr "Μια συλλογή γεωμετρικών αντικειμένων οποιουδήποτε τύπου" #: libraries/Types.class.php:623 libraries/Types.class.php:973 msgctxt "numeric types" msgid "Numeric" -msgstr "" +msgstr "Αριθμητικό" #: libraries/Types.class.php:642 libraries/Types.class.php:976 -#, fuzzy #| msgid "Create an index" msgctxt "date and time types" msgid "Date and time" -msgstr "Δημιουργία ευρετηρίου" +msgstr "Ημερομηνία και ώρα" #: libraries/Types.class.php:651 libraries/Types.class.php:979 -#, fuzzy #| msgid "Linestring" msgctxt "string types" msgid "String" -msgstr "Κείμενο γραμμής" +msgstr "Κείμενο" #: libraries/Types.class.php:672 -#, fuzzy #| msgid "Spatial" msgctxt "spatial types" msgid "Spatial" @@ -3600,51 +3651,60 @@ msgstr "Χωρική" #: libraries/Types.class.php:707 msgid "A 4-byte integer, range is -2,147,483,648 to 2,147,483,647" -msgstr "" +msgstr "Ένας ακέραιος 4-byte, εύρος είναι -2.147.483.648 έως 2.147.483.647" #: libraries/Types.class.php:709 msgid "" "An 8-byte integer, range is -9,223,372,036,854,775,808 to " "9,223,372,036,854,775,807" msgstr "" +"Ένας ακέραιος 8-byte, εύρος είναι -9.223.372.036.854.775.808 έως " +"9.223.372.036.854.775.807" #: libraries/Types.class.php:713 msgid "A system's default double-precision floating-point number" msgstr "" +"Ένας προεπιλεγμένος αριθμός κινητής υποδιαστολής διπλής ακριβείας συστήματος" #: libraries/Types.class.php:715 msgid "True or false" -msgstr "" +msgstr "Σωστό ή λάθος" #: libraries/Types.class.php:717 msgid "An alias for BIGINT NOT NULL AUTO_INCREMENT UNIQUE" -msgstr "" +msgstr "Μια ετικέτα για BIGINT NOT NULL AUTO_INCREMENT ΜΟΝΑΔΙΚΌ" #: libraries/Types.class.php:719 msgid "Stores a Universally Unique Identifier (UUID)" -msgstr "" +msgstr "Αποθηκεύει ένα Καθολικά Μοναδικό Αναγνωριστικό (UUID)" #: libraries/Types.class.php:725 msgid "" "A timestamp, range is '0001-01-01 00:00:00' UTC to '9999-12-31 23:59:59' " "UTC; TIMESTAMP(6) can store microseconds" msgstr "" +"Μια χρονοσφραγίδα, εύρος είναι από «0001-01-01 00:00:00» UTC έως «9999-12-31 " +"23:59:59» UTC; TIMESTAMP(6) μπορεί να αποθηκεύσει μικροδευτερόλεπτα" #: libraries/Types.class.php:733 msgid "" "A variable-length (0-65,535) string, uses binary collation for all " "comparisons" msgstr "" +"Ένα κείμενο μεταβλητού μήκους (0-65.535), χρησιμοποιεί δυαδική συρραφή για " +"όλες τις συγκρίσεις" #: libraries/Types.class.php:735 msgid "" "A BLOB column with a maximum length of 65,535 (2^16 - 1) bytes, stored with " "a four-byte prefix indicating the length of the value" msgstr "" +"Μια στήλη BLOB με μέγιστο μήκος 65.535 (2¹⁶ - 1) χαρακτήρες, αποθηκεύεται με " +"πρόθεμα 4-byte δείχνοντας το μήκος της τιμής σε bytes" #: libraries/Types.class.php:737 msgid "An enumeration, chosen from the list of defined values" -msgstr "" +msgstr "Μια απαρίθμηση, η οποία έχει επιλεγεί από τη λίστα ορισμένων τιμών" #: libraries/bookmark.lib.php:83 msgid "shared" @@ -3714,7 +3774,6 @@ msgid "Could not load default configuration from: %1$s" msgstr "Αδύνατη η φόρτωση της προεπιλεγμένης ρύθμισης από: «%1$s»" #: libraries/common.inc.php:588 -#, fuzzy #| msgid "" #| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your " #| "configuration file!" @@ -3722,7 +3781,7 @@ msgid "" "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your " "configuration file!" msgstr "" -"Η εντολή $cfg['PmaAbsoluteUri'] ΠΡΕΠΕΙ να οριστεί στο αρχείο " +"Η πδηγία $cfg['PmaAbsoluteUri'] ΠΡΕΠΕΙ να οριστεί στο αρχείο " "ρυθμίσεων!" #: libraries/common.inc.php:621 @@ -4040,10 +4099,13 @@ msgid "" "Use user-friendly editor for editing SQL queries ([a@http://codemirror.net/]" "CodeMirror[/a]) with syntax highlighting and line numbers" msgstr "" +"Χρησιμοποιήστε το φιλικό προς το χρήστη πρόγραμμα επεξεργασίας για την " +"επεξεργασία ερωτημάτων SQL ([a@http://codemirror.net/]CodeMirror[/a]) με " +"επισήμανση σύνταξης και αρίθμηση γραμμών" #: libraries/config/messages.inc.php:35 msgid "Enable CodeMirror" -msgstr "" +msgstr "Ενεργοποίηση CodeMirror" #: libraries/config/messages.inc.php:36 msgid "" @@ -4151,13 +4213,12 @@ msgstr "Προεπιλεγμένη καρτέλα πίνακα" #: libraries/config/messages.inc.php:58 msgid "Whether the table structure actions should be hidden" -msgstr "" +msgstr "Αν θα πρέπει να αποκρυφτούν οι ενέργειες δομής πίνακα" #: libraries/config/messages.inc.php:59 -#, fuzzy #| msgid "Propose table structure" msgid "Hide table structure actions" -msgstr "Προτεινόμενη δομή πίνακα" +msgstr "Απόκρυψη ενεργειών δομής πίνακα" #: libraries/config/messages.inc.php:60 msgid "Show binary contents as HEX by default" @@ -4726,24 +4787,24 @@ msgid "Customize startup page" msgstr "Προσαρμογή σελίδας εκκίνησης" #: libraries/config/messages.inc.php:228 -#, fuzzy #| msgid "Database server" msgid "Database structure" -msgstr "Διακομιστής βάσης δεδομένων" +msgstr "Δομή βάσης δεδομένων" #: libraries/config/messages.inc.php:229 msgid "Choose which details to show in the database structure (list of tables)" msgstr "" +"Επιλέξτε ποιες λεπτομέρειες θα προβάλονται στη δομή της βάσης δεδομένων " +"(λίστα πινάκων)" #: libraries/config/messages.inc.php:230 -#, fuzzy #| msgid "Database server" msgid "Table structure" -msgstr "Διακομιστής βάσης δεδομένων" +msgstr "Δομή πίνακα" #: libraries/config/messages.inc.php:231 msgid "Settings for the table structure (list of columns)" -msgstr "" +msgstr "Ρυθμίσεις για τη δομή του πίνακα (λίστα στηλών)" #: libraries/config/messages.inc.php:232 msgid "Tabs" @@ -4913,10 +4974,9 @@ msgid "Minimum number of tables to display the table filter box" msgstr "Ελάχιστος αριθμός πινάκων για προβολή του πλαισίου φίλτρου πίνακα" #: libraries/config/messages.inc.php:281 -#, fuzzy #| msgid "Minimum number of tables to display the table filter box" msgid "Minimum number of databases to display the database filter box" -msgstr "Ελάχιστος αριθμός πινάκων για προβολή του πλαισίου φίλτρου πίνακα" +msgstr "Ελάχιστος αριθμός πινάκων για προβολή στο πλαίσιο φίλτρου πίνακα" #: libraries/config/messages.inc.php:282 msgid "String that separates databases into different tree levels" @@ -5818,32 +5878,36 @@ msgstr "Εμφάνιση φόρμας δημιουργίας βάσης δεδο #: libraries/config/messages.inc.php:460 msgid "Show or hide a column displaying the Creation timestamp for all tables" msgstr "" +"Εμφάνιση ή απόκρυψη μιας στήλης εμφανίζοντας τη χρονοσφραγίδα Δημιουργίας " +"για όλους τους πίνακες" #: libraries/config/messages.inc.php:461 -#, fuzzy #| msgid "Show more actions" msgid "Show Creation timestamp" -msgstr "Προβολή περισσοτέρων δράσεων" +msgstr "Προβολή χρονοσφραγίδας δημιουργίας" #: libraries/config/messages.inc.php:462 msgid "" "Show or hide a column displaying the Last update timestamp for all tables" msgstr "" +"Εμφάνιση ή απόκρυψη μιας στήλης που θα εμφανίζει τη χρονοσφραγίδα Τελευταίας " +"ενημέρωσης για όλους τους πίνακες" #: libraries/config/messages.inc.php:463 msgid "Show Last update timestamp" -msgstr "" +msgstr "Εμφάνιση χρονοσφραγίδας Τελευταίας ενημερώσης" #: libraries/config/messages.inc.php:464 msgid "" "Show or hide a column displaying the Last check timestamp for all tables" msgstr "" +"Εμφάνιση ή απόκρυψη μιας στήλης που θα εμφανίζει τη χρονοσφραγίδα Τελευταίου " +"ελέγχου για όλους τους πίνακες" #: libraries/config/messages.inc.php:465 -#, fuzzy #| msgid "Show master status" msgid "Show Last check timestamp" -msgstr "Προβολή κατάστασης πρωτεύοντος" +msgstr "Προβολή χρονοσφραγίδας τελευταίου ελέγχου" #: libraries/config/messages.inc.php:466 msgid "" @@ -6500,27 +6564,27 @@ msgstr "Μετατροπή κωδικοποίησης:" #: libraries/display_git_revision.lib.php:59 #, php-format msgid "%1$s from %2$s branch" -msgstr "" +msgstr "%1$s από %2$s κλάδο" #: libraries/display_git_revision.lib.php:61 msgid "no branch" -msgstr "" +msgstr "κανένας κλάδος" #: libraries/display_git_revision.lib.php:67 msgid "Git revision" -msgstr "" +msgstr "Αναθεώρηση git" #: libraries/display_git_revision.lib.php:70 -#, fuzzy, php-format +#, php-format #| msgid "Create version %1$s of %2$s" msgid "committed on %1$s by %2$s" -msgstr "Δημιουργία έκδοσης %1$s του %2$s" +msgstr "έγινε την %1$s από %2$s" #: libraries/display_git_revision.lib.php:78 -#, fuzzy, php-format +#, php-format #| msgid "Create version %1$s of %2$s" msgid "authored on %1$s by %2$s" -msgstr "Δημιουργία έκδοσης %1$s του %2$s" +msgstr "δημιουργήθηκε την %1$s από %2$s" #: libraries/display_import.lib.php:68 msgid "" @@ -6535,26 +6599,25 @@ msgstr "" #: libraries/display_import.lib.php:76 #, php-format msgid "%s of %s" -msgstr "" +msgstr "%s από %s" #: libraries/display_import.lib.php:85 -#, fuzzy #| msgid "Format of imported file" msgid "Uploading your import file..." -msgstr "Μορφή εισαχθέντος αρχείου" +msgstr "Αποστολή του αρχείου εισαγωγής σας..." #: libraries/display_import.lib.php:93 #, php-format msgid "%s/sec." -msgstr "" +msgstr "%s/δευτ." #: libraries/display_import.lib.php:100 msgid "About %MIN min. %SEC sec. remaining." -msgstr "" +msgstr "Απομένουν περίπου %MIN λεπτά %SEC δευτερόλεπτα." #: libraries/display_import.lib.php:104 msgid "About %SEC sec. remaining." -msgstr "" +msgstr "Απομένουν περίπου %SEC δευτερόλεπτα." #: libraries/display_import.lib.php:134 msgid "The file is being processed, please be patient." @@ -7157,7 +7220,6 @@ msgid "Add prefix" msgstr "Προσθήκη προθέματος" #: libraries/mult_submits.inc.php:309 -#, fuzzy #| msgid "Do you really want to execute following query?" msgid "Do you really want to execute the following query?" msgstr "Θέλετε να εκτελέσετε το ακόλουθο ερώτημα;" @@ -7411,7 +7473,7 @@ msgstr "Αδύνατη η χρήση του Blowfish από το mcrypt!" #: libraries/plugins/auth/AuthenticationCookie.class.php:81 msgid "Your session has expired. Please login again." -msgstr "" +msgstr "Η συνεδρία σας έληξε. Συνδεθείτε ξανά." #: libraries/plugins/auth/AuthenticationCookie.class.php:170 msgid "Log in" @@ -7651,16 +7713,14 @@ msgid "PHP Version" msgstr "Έκδοση PHP" #: libraries/plugins/export/ExportMediawiki.class.php:81 -#, fuzzy #| msgid "Export contents" msgid "Export table names" -msgstr "Εξαγωγή περιεχομένων" +msgstr "Εξαγωγή ονομάτων πινάκων" #: libraries/plugins/export/ExportMediawiki.class.php:87 -#, fuzzy #| msgid "horizontal (rotated headers)" msgid "Export table headers" -msgstr "οριζόντια (στραμμένες επικεφαλίδες)" +msgstr "Εξαγωγή κεφαλίδων πίνακα" #: libraries/plugins/export/ExportPdf.class.php:96 msgid "(Generates a report containing the data of a single table)" @@ -7719,10 +7779,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 @@ -7920,10 +7979,10 @@ msgid "MediaWiki Table" msgstr "Πίνακας MediaWiki" #: libraries/plugins/import/ImportMediawiki.class.php:298 -#, fuzzy, php-format +#, php-format #| msgid "Invalid format of CSV input on line %d." msgid "Invalid format of mediawiki input on line:
    %s." -msgstr "Μη έγκυρη μορφή στο εισαχθέν CSV στη γραμμή %d." +msgstr "Μη έγκυρη μορφή του εισαγόμενου mediawiki στη γραμμή
    %s." #: libraries/plugins/import/ImportOds.class.php:73 msgid "Import percentages as proper decimals (ex. 12.00% to .12)" @@ -7984,13 +8043,16 @@ msgstr "Κώδικας XML" #: libraries/plugins/import/PMA_ShapeRecord.class.php:58 #, php-format msgid "Geometry type '%s' is not supported by MySQL." -msgstr "" +msgstr "Ο τύπος γεωμετρίας «%s» δεν υποστηρίζεται από την MySQL." #: libraries/plugins/transformations/abstract/AppendTransformationsPlugin.class.php:31 msgid "" "Appends text to a string. The only option is the text to be appended " "(enclosed in single quotes, default empty string)." msgstr "" +"Προστίθεται κείμενο σε μια συμβολοσειρά. Η μοναδική επιλογή είναι το κείμενο " +"να προσαρτηθεί (περικλειόμενο σε μονά εισαγωγικά, προεπιλογή η κενή " +"συμβολοσειρά)." #: libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php:31 msgid "" @@ -8026,7 +8088,6 @@ msgstr "" "επιλογή ως κενό." #: libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php:31 -#, fuzzy #| msgid "" #| "LINUX ONLY: Launches an external application and feeds it the column data " #| "via standard input. Returns the standard output of the application. The " @@ -8053,15 +8114,15 @@ msgstr "" "ΜΟΝΟ ΓΙΑ LINUX: Εκτελεί μία εξωτερική εφαρμογή και στέλνει τα δεδομένα μέσω " "«βασικής εισαγωγής». Επιστρέφει το αποτέλεσμα της εφαρμογής. Προεπιλεγμένη " "τιμή είναι το Tidy, που τυπώνει μορφοποιημένο κώδικα HTML. Για λόγους " -"ασφαλείες, πρέπει χειροκίνητα να αλλάξετε το αρχείο libraries/" -"transformations/text_plain__external.inc.php και να εισάγετε τις εφαρμογές " -"που εσείς επιτρέπετε να εκτελούνται. Η πρώτη επιλογή είναι ο αριθμός της " -"εφαρμογής που θέλετε να χρησιμοποιήσετε και η δεύτερη επιλογή είναι οι " -"παράμετροι της. Η τρίτη επιλογή, αν τεθεί σε 1 θα μετατρέψει το αποτέλεσμα " -"χρησιμοποιώντας την εντολή htmlspecialchars() (Προεπιλεγμένη τιμή: 1). Η " -"τέταρτη επιλογή, αν τεθεί σε 1 θα εισάγει NOWRAP στο κελί περιεχομένου ούτως " -"ώστε όλο το αποτέλεσμα να εμφανιστεί χωρίς αλλαγές στην διάταξη " -"(Προεπιλεγμένη τιμή: 1)." +"ασφαλείας, πρέπει χειροκίνητα να αλλάξετε το αρχείο " +"libraries/transformations/text_plain__external.inc.php και να εισάγετε τα " +"εργαλεία που εσείς θέλετε να είναι διαθέσιμα. Η πρώτη επιλογή είναι ο " +"αριθμός της εφαρμογής που θέλετε να χρησιμοποιήσετε και η δεύτερη επιλογή " +"είναι οι παράμετροι της. Η τρίτη επιλογή, αν τεθεί σε 1 θα μετατρέψει το " +"αποτέλεσμα χρησιμοποιώντας την εντολή htmlspecialchars() (Προεπιλεγμένη " +"τιμή: 1). Η τέταρτη επιλογή, αν τεθεί σε 1 θα εισάγει NOWRAP στο κελί " +"περιεχομένου ούτως ώστε όλο το αποτέλεσμα να εμφανιστεί χωρίς αλλαγές στην " +"διάταξη (Προεπιλεγμένη τιμή: 1)." #: libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php:31 msgid "" @@ -8486,7 +8547,6 @@ msgid "Returns" msgstr "Επιστροφές" #: libraries/rte/rte_routines.lib.php:69 -#, fuzzy #| msgid "" #| "You are using PHP's deprecated 'mysql' extension, which is not capable of " #| "handling multi queries. The execution of some stored routines may fail!" @@ -8498,9 +8558,9 @@ msgid "" "problems." msgstr "" "Χρησιμοποιείτε την μη υποστηριζόμενη πλέον επέκταση «mysql» της PHP, η οποία " -"δεν μπορεί να διαχειριστεί πολλαπλά ερωτήματα. Η εκτέλεση ορισμένων " -"αποθηκευμένων ερωτημάτων ίσως αποτύχουν! Χρησιμοποιήστε τη βελτιωμένη " -"επέκταση «mysqli» για να αποφύγετε προβλήματα." +"δεν μπορεί να διαχειριστεί πολλαπλά ερωτήματα. [strong]Η εκτέλεση ορισμένων " +"αποθηκευμένων ερωτημάτων ίσως αποτύχουν![/strong] Χρησιμοποιήστε τη " +"βελτιωμένη επέκταση «mysqli» για να αποφύγετε προβλήματα." #: libraries/rte/rte_routines.lib.php:282 #: libraries/rte/rte_routines.lib.php:1068 @@ -9544,10 +9604,9 @@ msgid "Index" msgstr "Ευρετήριο" #: libraries/tbl_properties.inc.php:123 -#, fuzzy #| msgid "Remove column(s)" msgid "Move column" -msgstr "Απομάκρυνση στήλης(ών)" +msgstr "Απομάκρυνση στήλης" #: libraries/tbl_properties.inc.php:132 #, php-format @@ -9603,13 +9662,13 @@ msgstr "Πλήρες κείμενο" #: libraries/tbl_properties.inc.php:603 msgid "first" -msgstr "" +msgstr "πρώτη" #: libraries/tbl_properties.inc.php:613 -#, fuzzy, php-format +#, php-format #| msgid "After %s" msgid "after %s" -msgstr "Μετά το %s" +msgstr "μετά το %s" #: libraries/tbl_properties.inc.php:729 tbl_structure.php:697 #, php-format @@ -9839,10 +9898,9 @@ msgid "No databases" msgstr "Δεν υπάρχουν βάσεις δεδομένων" #: navigation.php:171 -#, fuzzy #| msgid "Filter tables by name" msgid "Filter databases by name" -msgstr "Φιλτράρισμα πινάκων κατά όνομα" +msgstr "Φιλτράρισμα βάσεων δεδομενων κατά όνομα" #: navigation.php:243 msgid "Filter tables by name" @@ -12128,10 +12186,9 @@ msgid "Table %1$s has been altered successfully" msgstr "Ο πίνακας %1$s αλλάχτηκε επιτυχώς" #: tbl_alter.php:133 -#, fuzzy #| msgid "The selected users have been deleted successfully." msgid "The columns have been moved successfully." -msgstr "Οι επιλεγμένοι χρήστες διεγράφησαν επιτυχώς." +msgstr "Οι στήλες μετακινήθηκαν επιτυχώς." #: tbl_chart.php:83 msgctxt "Chart type" @@ -12460,10 +12517,9 @@ msgid "Spatial" msgstr "Χωρική" #: tbl_structure.php:161 tbl_structure.php:165 -#, fuzzy #| msgid "Browse distinct values" msgid "Distinct values" -msgstr "Αναζήτηση διακριτων τιμών" +msgstr "Διακριτές τιμές" #: tbl_structure.php:166 tbl_structure.php:167 msgid "Add primary key" @@ -12508,14 +12564,13 @@ msgid "Show more actions" msgstr "Προβολή περισσοτέρων δράσεων" #: tbl_structure.php:619 tbl_structure.php:686 -#, fuzzy #| msgid "Remove column(s)" msgid "Move columns" -msgstr "Απομάκρυνση στήλης(ών)" +msgstr "Απομάκρυνση στήλης" #: tbl_structure.php:620 msgid "Move the columns by dragging them up and down." -msgstr "" +msgstr "Μετακινήστε τις στήλες, σύροντας τες επάνω και κάτω." #: tbl_structure.php:646 msgid "Edit view" From 3a3aa643dd0fc919a660f5cf1f74649d3a42b1f0 Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Thu, 9 Aug 2012 10:27:21 +0200 Subject: [PATCH 26/28] Fixed double confirmation message display on table options form submission --- tbl_operations.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tbl_operations.php b/tbl_operations.php index 375db1a0b5..4ec747ec1c 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -180,7 +180,7 @@ if (isset($result) && empty($message_to_show)) { $_type = 'success'; if (empty($_message)) { $_message = $result - ? $message = PMA_Message::success( + ? PMA_Message::success( __('Your SQL query has been executed successfully') ) : PMA_Message::error(__('Error')); From 5ed8c9815c2e7762fa5adc655485921476afdff8 Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Thu, 9 Aug 2012 10:41:51 +0200 Subject: [PATCH 27/28] Fixed display of table comments in the menu --- libraries/Menu.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/Menu.class.php b/libraries/Menu.class.php index 1a1160cee9..4574c8afd3 100644 --- a/libraries/Menu.class.php +++ b/libraries/Menu.class.php @@ -172,7 +172,7 @@ class PMA_Menu if (strlen($this->_table) && ! (isset($_REQUEST['purge']) && $_REQUEST['purge'] == '1') ) { - include_once './libraries/tbl_info.inc.php'; + include './libraries/tbl_info.inc.php'; $retval .= $separator; if ($GLOBALS['cfg']['NavigationBarIconic']) { From 211f15f296fb083969e2ad7c0cff847e46dd53ce Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Thu, 9 Aug 2012 13:03:42 +0200 Subject: [PATCH 28/28] Dropped dead code --- libraries/tbl_info.inc.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php index d0056649cd..9b06b3c002 100644 --- a/libraries/tbl_info.inc.php +++ b/libraries/tbl_info.inc.php @@ -63,14 +63,9 @@ if ($showtable) { $tbl_storage_engine = isset($showtable['Engine']) ? strtoupper($showtable['Engine']) : ''; - // a new comment could be coming from tbl_operations.php - // and we want to show it in the header - if (isset($submitcomment) && isset($comment)) { - $show_comment = $comment; - } else { - $show_comment = isset($showtable['Comment']) - ? $showtable['Comment'] - : ''; + $show_comment = ''; + if (isset($showtable['Comment'])) { + $show_comment = $showtable['Comment']; } } $tbl_collation = empty($showtable['Collation'])