November 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7_1-43-g29455fe
by Madhura Jayaratne 24 Nov '11

24 Nov '11

The branch, QA_3_4 has been updated via 29455fe79bc9896129d7004e0242c451f4a32cc8 (commit) via ff0ea2f9b960359234fab02a74b156bc9bb1e383 (commit) from cf5faa1dd1bcae329eddb793765ad2ba3e4471dc (commit) - Log ----------------------------------------------------------------- commit 29455fe79bc9896129d7004e0242c451f4a32cc8 Merge: ff0ea2f cf5faa1 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Nov 24 23:12:37 2011 +0530 Merge branch 'QA_3_4' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into QA_3_4 commit ff0ea2f9b960359234fab02a74b156bc9bb1e383 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Nov 20 23:01:58 2011 +0530 bug #3431427: Fix for enum and set columns ----------------------------------------------------------------------- Summary of changes: js/tbl_change.js | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/js/tbl_change.js b/js/tbl_change.js index 79e7906..234e4e1 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -26,10 +26,9 @@ function nullify(theType, urlField, md5Field, multi_edit) rowForm.elements['funcs' + multi_edit + '[' + md5Field + ']'].selectedIndex = -1; } - // "SET" field , "ENUM" field with more than 20 characters - // or foreign key field (drop-down) - if (theType == 1 || theType == 3 || theType == 4) { - rowForm.elements['fields' + multi_edit + '[' + md5Field + ']'].selectedIndex = -1; + // "ENUM" field with more than 20 characters + if (theType == 1) { + rowForm.elements['fields' + multi_edit + '[' + md5Field + ']'][1].selectedIndex = -1; } // Other "ENUM" field else if (theType == 2) { @@ -45,6 +44,14 @@ function nullify(theType, urlField, md5Field, multi_edit) } // end if } + // "SET" field + else if (theType == 3) { + rowForm.elements['fields' + multi_edit + '[' + md5Field + '][]'].selectedIndex = -1; + } + // Foreign key field (drop-down) + else if (theType == 4) { + rowForm.elements['fields' + multi_edit + '[' + md5Field + ']'].selectedIndex = -1; + } // foreign key field (with browsing icon for foreign values) else if (theType == 6) { rowForm.elements['fields' + multi_edit + '[' + md5Field + ']'].value = ''; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7_1-41-gcf5faa1
by Marc Delisle 24 Nov '11

24 Nov '11

The branch, QA_3_4 has been updated via cf5faa1dd1bcae329eddb793765ad2ba3e4471dc (commit) via 077c10020e349e8c1beb46309098992fde616913 (commit) via dac8d6ce256333ff45b5f46270304b8657452740 (commit) via bc45a1048d2f5ca8a532f774ddb1dd80985dff3d (commit) via 1490533d91e9d3820e78ca4eac7981886eaea2cb (commit) via b289fe082441dc739939b0ba15dae0d9dc6cee92 (commit) from f414a0ec32626c3f0084bd020daba2b4553d244b (commit) - Log ----------------------------------------------------------------- commit cf5faa1dd1bcae329eddb793765ad2ba3e4471dc Merge: f414a0e 077c100 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Nov 24 12:26:31 2011 -0500 Fix merge conflicts commit 077c10020e349e8c1beb46309098992fde616913 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Tue Nov 22 21:59:19 2011 +0100 [security] Self-XSS on invalid query (table overview), see PMASA-2011-18 commit dac8d6ce256333ff45b5f46270304b8657452740 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Nov 22 12:46:46 2011 -0500 [security] Self-XSS on column type (table Search), see PMASA-2011-18 commit bc45a1048d2f5ca8a532f774ddb1dd80985dff3d Author: Rouslan Placella <rouslan(a)placella.com> Date: Tue Nov 22 12:38:22 2011 -0500 [security] Self-XSS on column type (Create index), see PMASA-2011-18 commit 1490533d91e9d3820e78ca4eac7981886eaea2cb Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 21 18:08:49 2011 -0500 [security] Self-XSS on database names (Operations/rename), see PMASA-2011-18 commit b289fe082441dc739939b0ba15dae0d9dc6cee92 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 21 17:53:10 2011 -0500 [security] Self-XSS on database names (Synchronize), see PMASA-2011-18 ----------------------------------------------------------------------- Summary of changes: ChangeLog | 5 +++++ js/db_operations.js | 2 +- libraries/common.lib.php | 5 +---- libraries/server_synchronize.lib.php | 4 ++-- tbl_indexes.php | 4 ++-- tbl_select.php | 4 ++-- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 36a9e0a..7c40e9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,11 @@ phpMyAdmin - ChangeLog - [interface] Avoid showing the password in phpinfo()'s output - bug #3441572 [GUI] 'newer version of phpMyAdmin' message not shown in IE8 - bug #3407235 [interface] Entering the key through a lookup window does not reset NULL +- [security] Self-XSS on database names (Synchronize), see PMASA-2011-18 +- [security] Self-XSS on database names (Operations/rename), see PMASA-2011-18 +- [security] Self-XSS on column type (Create index), see PMASA-2011-18 +- [security] Self-XSS on column type (table Search), see PMASA-2011-18 +- [security] Self-XSS on invalid query (table overview), see PMASA-2011-18 3.4.7.1 (2011-11-10) - [security] Fixed possible local file inclusion in XML import diff --git a/js/db_operations.js b/js/db_operations.js index b053694..ad39635 100644 --- a/js/db_operations.js +++ b/js/db_operations.js @@ -32,7 +32,7 @@ $(document).ready(function() { var $form = $(this); - var question = 'CREATE DATABASE ' + $('#new_db_name').val() + ' / DROP DATABASE ' + window.parent.db; + var question = escapeHtml('CREATE DATABASE ' + $('#new_db_name').val() + ' / DROP DATABASE ' + window.parent.db); PMA_prepareForAjaxRequest($form); /** diff --git a/libraries/common.lib.php b/libraries/common.lib.php index ad38266..caeeee2 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1059,13 +1059,10 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view } else { // Parse SQL if needed $parsed_sql = PMA_SQP_parse($query_base); - if (PMA_SQP_isError()) { - unset($parsed_sql); - } } // Analyze it - if (isset($parsed_sql)) { + if (isset($parsed_sql) && ! PMA_SQP_isError()) { $analyzed_display_query = PMA_SQP_analyze($parsed_sql); // Here we append the LIMIT added for navigation, to // enable its display. Adding it higher in the code diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index c1b9159..53ad9d7 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -1335,7 +1335,7 @@ function PMA_syncDisplayHeaderSource($src_db) { echo '<table id="serverstatusconnections" class="data" width="55%">'; echo '<tr>'; - echo '<th>' . __('Source database') . ': ' . $src_db . '<br />('; + echo '<th>' . __('Source database') . ': ' . htmlspecialchars($src_db) . '<br />('; if ('cur' == $_SESSION['src_type']) { echo __('Current server'); } else { @@ -1358,7 +1358,7 @@ function PMA_syncDisplayHeaderSource($src_db) { function PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables) { echo '<table id="serverstatusconnections" class="data" width="43%">'; echo '<tr>'; - echo '<th>' . __('Target database') . ': '. $trg_db . '<br />('; + echo '<th>' . __('Target database') . ': '. htmlspecialchars($trg_db) . '<br />('; if ('cur' == $_SESSION['trg_type']) { echo __('Current server'); } else { diff --git a/tbl_indexes.php b/tbl_indexes.php index 54923a0..ac32387 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -200,7 +200,7 @@ foreach ($index->getColumns() as $column) { || preg_match('/(char|text)/i', $field_type)) { echo '<option value="' . htmlspecialchars($field_name) . '"' . (($field_name == $column->getName()) ? ' selected="selected"' : '') . '>' - . htmlspecialchars($field_name) . ' [' . $field_type . ']' + . htmlspecialchars($field_name) . ' [' . htmlspecialchars($field_type) . ']' . '</option>' . "\n"; } } // end foreach $fields @@ -222,7 +222,7 @@ for ($i = 0; $i < $add_fields; $i++) { <?php foreach ($fields as $field_name => $field_type) { echo '<option value="' . htmlspecialchars($field_name) . '">' - . htmlspecialchars($field_name) . ' [' . $field_type . ']' + . htmlspecialchars($field_name) . ' [' . htmlspecialchars($field_type) . ']' . '</option>' . "\n"; } // end foreach $fields ?> diff --git a/tbl_select.php b/tbl_select.php index 2cb0086..8414222 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -124,7 +124,7 @@ if (!isset($param) || $param[0] == '') { ?> <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>"> <th><?php echo htmlspecialchars($fields_list[$i]); ?></th> - <td><?php echo $fields_type[$i]; ?></td> + <td><?php echo htmlspecialchars($fields_type[$i]); ?></td> <td><?php echo $fields_collation[$i]; ?></td> <td><select name="func[]"> <?php @@ -190,7 +190,7 @@ if (!isset($param) || $param[0] == '') { <?php } elseif (strncasecmp($fields_type[$i], 'enum', 4) == 0) { // e n u m s - $enum_value=explode(', ', str_replace("'", '', substr($fields_type[$i], 5, -1))); + $enum_value=explode(', ', str_replace("'", '', substr(htmlspecialchars($fields_type[$i]), 5, -1))); $cnt_enum_value = count($enum_value); echo ' <select name="fields[' . $i . '][]"' .' multiple="multiple" size="' . min(3, $cnt_enum_value) . '">' . "\n"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23441-gc8dbed1
by Madhura Jayaratne 24 Nov '11

24 Nov '11

The branch, master has been updated via c8dbed11b2e2ad76c3c7dcd41777f314427f3f32 (commit) via f414a0ec32626c3f0084bd020daba2b4553d244b (commit) from f22a4571998df392e2a5d6817f04fe02da1b111a (commit) - Log ----------------------------------------------------------------- commit c8dbed11b2e2ad76c3c7dcd41777f314427f3f32 Merge: f22a457 f414a0e Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Nov 24 22:48:25 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + browse_foreigners.php | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec37459..2c6e859 100644 --- a/ChangeLog +++ b/ChangeLog @@ -80,6 +80,7 @@ phpMyAdmin - ChangeLog - bug #3425156 [interface] Add column after drop - [interface] Avoid showing the password in phpinfo()'s output - bug #3441572 [GUI] 'newer version of phpMyAdmin' message not shown in IE8 +- bug #3407235 [interface] Entering the key through a lookup window does not reset NULL 3.4.7.1 (2011-11-10) - [security] Fixed possible local file inclusion in XML import diff --git a/browse_foreigners.php b/browse_foreigners.php index ab5385c..74e4e99 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -104,9 +104,11 @@ require_once './libraries/header_scripts.inc.php'; if (opener && opener.document && opener.document.insertForm) { var field = 'fields'; + var field_null = 'fields_null'; <?php if (isset($rownumber)) { ?> var element_name = field + '[multi_edit][<?php echo htmlspecialchars($rownumber); ?>][' + fieldmd5 + ']'; + var null_name = field_null + '[multi_edit][<?php echo htmlspecialchars($rownumber); ?>][' + fieldmd5 + ']'; <?php } else { ?> var element_name = field + '[]'; <?php } ?> @@ -120,6 +122,9 @@ require_once './libraries/header_scripts.inc.php'; if (opener.document.insertForm.elements[element_name]) { // Edit/Insert form opener.document.insertForm.elements[element_name].value = key; + if (opener.document.insertForm.elements[null_name]) { + opener.document.insertForm.elements[null_name].checked = false; + } self.close(); return false; } else if (opener.document.insertForm.elements[element_name_alt]) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7_1-35-gf414a0e
by Madhura Jayaratne 24 Nov '11

24 Nov '11

The branch, QA_3_4 has been updated via f414a0ec32626c3f0084bd020daba2b4553d244b (commit) from 035c112eafeb57201c63f0b94d7485d41762922f (commit) - Log ----------------------------------------------------------------- commit f414a0ec32626c3f0084bd020daba2b4553d244b Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Nov 24 22:45:51 2011 +0530 bug #3407235 [interface] Entering the key through a lookup window does not reset NULL ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + browse_foreigners.php | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 031c880..36a9e0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ phpMyAdmin - ChangeLog - bug #3425156 [interface] Add column after drop - [interface] Avoid showing the password in phpinfo()'s output - bug #3441572 [GUI] 'newer version of phpMyAdmin' message not shown in IE8 +- bug #3407235 [interface] Entering the key through a lookup window does not reset NULL 3.4.7.1 (2011-11-10) - [security] Fixed possible local file inclusion in XML import diff --git a/browse_foreigners.php b/browse_foreigners.php index c8867af..e88c20f 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -104,9 +104,11 @@ require_once './libraries/header_scripts.inc.php'; if (opener && opener.document && opener.document.insertForm) { var field = 'fields'; + var field_null = 'fields_null'; <?php if (isset($rownumber)) { ?> var element_name = field + '[multi_edit][<?php echo htmlspecialchars($rownumber); ?>][' + fieldmd5 + ']'; + var null_name = field_null + '[multi_edit][<?php echo htmlspecialchars($rownumber); ?>][' + fieldmd5 + ']'; <?php } else { ?> var element_name = field + '[]'; <?php } ?> @@ -120,6 +122,9 @@ require_once './libraries/header_scripts.inc.php'; if (opener.document.insertForm.elements[element_name]) { // Edit/Insert form opener.document.insertForm.elements[element_name].value = key; + if (opener.document.insertForm.elements[null_name]) { + opener.document.insertForm.elements[null_name].checked = false; + } self.close(); return false; } else if (opener.document.insertForm.elements[element_name_alt]) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23439-gf22a457
by Rouslan Placella 24 Nov '11

24 Nov '11

The branch, master has been updated via f22a4571998df392e2a5d6817f04fe02da1b111a (commit) from f6d0aa3873907d577b883cb7a4c417153820bb2d (commit) - Log ----------------------------------------------------------------- commit f22a4571998df392e2a5d6817f04fe02da1b111a Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Nov 24 16:44:21 2011 +0000 Removed redundant code. Already using 'onclick' since commit 0c2f7f16f52cd0e37687fac063ad36678657b070 ----------------------------------------------------------------------- Summary of changes: js/pmd/move.js | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/js/pmd/move.js b/js/pmd/move.js index e7e5439..df692fd 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -11,23 +11,6 @@ var _change = 0; // variable to track any change in designer layout. var _staying = 0; // variable to check if the user stayed after seeing the confirmation prompt. -// Below is the function to change the href attributes to '#' while the href script is called using -// the onclick event. It fixes the Internet Explorer issue with href. - - $(document).ready(function(){ - $('a').filter(function(){ - return ( /^javascript\:/i).test($(this).attr('href')); - }).each(function(){ - var hrefscript = $(this).attr('href'); - hrefscript = hrefscript.substr(11); - $(this).data('hrefscript', hrefscript); - }).click(function(){ - var hrefscript = $(this).data('hrefscript'); - eval (hrefscript); - return false; - }).attr('href', '#'); -}); - // Below is the function to bind onbeforeunload events with the content_frame as well as the top window. $(document).ready(function(){ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23438-gf6d0aa3
by Rouslan Placella 24 Nov '11

24 Nov '11

The branch, master has been updated via f6d0aa3873907d577b883cb7a4c417153820bb2d (commit) via 2776f894446e515cadd9ff530b1e4fb3eb4255bf (commit) from f62c4a1809458008c778afac98e481f54def216b (commit) - Log ----------------------------------------------------------------- commit f6d0aa3873907d577b883cb7a4c417153820bb2d Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Nov 24 16:14:43 2011 +0000 Improved the rendering of the designer menu when it's moved to the right commit 2776f894446e515cadd9ff530b1e4fb3eb4255bf Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Nov 24 15:43:04 2011 +0000 Disabled floating of the menubar in designer and fixed designer menu rendering in IE ----------------------------------------------------------------------- Summary of changes: db_printview.php | 2 +- js/functions.js | 2 +- js/pmd/move.js | 17 ++++++++--------- pmd_general.php | 1 + tbl_printview.php | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/db_printview.php b/db_printview.php index e15b79d..5512fa6 100644 --- a/db_printview.php +++ b/db_printview.php @@ -246,7 +246,7 @@ if ($num_tables == 0) { */ PMA_printButton(); -echo "<div id='PMA_print_view'></div>\n"; +echo "<div id='PMA_disable_floating_menubar'></div>\n"; require './libraries/footer.inc.php'; ?> diff --git a/js/functions.js b/js/functions.js index f9e5717..2081ffc 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3694,7 +3694,7 @@ $(document).ready(function() { * Makes the breadcrumbs and the menu bar float at the top of the viewport */ $(document).ready(function () { - if ($("#floating_menubar").length && $('#PMA_print_view').length == 0) { + if ($("#floating_menubar").length && $('#PMA_disable_floating_menubar').length == 0) { $("#floating_menubar") .css({ 'position': 'fixed', diff --git a/js/pmd/move.js b/js/pmd/move.js index 6bb9717..e7e5439 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -125,7 +125,7 @@ function MouseDown(e) cur_click.style.zIndex = 2; } if (layer_menu_cur_click) { - offsetx = isIE ? event.clientX + document.body.scrollLeft : e.pageX; + offsetx = e.pageX; dx = offsetx - parseInt(document.getElementById("layer_menu").style.width); } } @@ -213,10 +213,6 @@ function Main() { //alert( document.getElementById('osn_tab').offsetTop); //---CROSS - if (isIE) { - document.getElementById('top_menu').style.position = 'absolute'; - document.getElementById('layer_menu').style.position = 'absolute'; - } document.getElementById("layer_menu").style.top = -1000 + 'px'; //fast scroll sm_x += document.getElementById('osn_tab').offsetLeft; @@ -892,8 +888,6 @@ function General_scroll() { document.getElementById('top_menu').style.left = document.body.scrollLeft + 'px'; document.getElementById('top_menu').style.top = document.body.scrollTop + 'px'; - document.getElementById('layer_menu').style.left = document.body.scrollLeft + 'px'; - document.getElementById('layer_menu').style.top = (document.body.scrollTop + document.getElementById('top_menu').offsetHeight) + 'px'; } ,200 ); @@ -936,11 +930,16 @@ function Show_left_menu(id_this) // max/min all tables function Top_menu_right(id_this) { if (id_this.alt == ">") { - document.getElementById('top_menu').style.marginLeft = document.getElementById('top_menu').offsetWidth + 'px'; // = 350 + var top_menu_width = 10; + $('#top_menu').children().each(function () { + top_menu_width += $(this).outerWidth(true); + }); + var offset = parseInt(document.getElementById('top_menu').offsetWidth - top_menu_width, 10); + document.getElementById('top_menu').style.paddingLeft = offset + 'px'; id_this.alt = "<"; id_this.src = pmaThemeImage + "pmd/2leftarrow_m.png"; } else { - document.getElementById('top_menu').style.marginLeft = 0; + document.getElementById('top_menu').style.paddingLeft = 0; id_this.alt = ">"; id_this.src = pmaThemeImage + "pmd/2rightarrow_m.png"; } diff --git a/pmd_general.php b/pmd_general.php index 21fffc9..aafc5fd 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -821,5 +821,6 @@ if (! empty($_REQUEST['query'])) { <img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/rightarrow1.png" width="0" height="0" alt="" /> <img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/rightarrow2.png" width="0" height="0" alt="" /> <img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/uparrow2_m.png" width="0" height="0" alt="" /> +<div id="PMA_disable_floating_menubar"></div> </body> </html> diff --git a/tbl_printview.php b/tbl_printview.php index a6844e9..554608a 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -441,7 +441,7 @@ foreach ($the_tables as $key => $table) { */ PMA_printButton(); -echo "<div id='PMA_print_view'></div>\n"; +echo "<div id='PMA_disable_floating_menubar'></div>\n"; require './libraries/footer.inc.php'; ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23436-gf62c4a1
by Dieter Adriaenssens 24 Nov '11

24 Nov '11

The branch, master has been updated via f62c4a1809458008c778afac98e481f54def216b (commit) from 90bd76540c22cdc1fca5529cf00f7dbc694b6b51 (commit) - Log ----------------------------------------------------------------- commit f62c4a1809458008c778afac98e481f54def216b Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Thu Nov 24 15:32:30 2011 +0100 coding style : control structures ----------------------------------------------------------------------- Summary of changes: enum_editor.php | 2 +- libraries/header.inc.php | 4 ++-- libraries/header_scripts.inc.php | 2 +- libraries/import/sql.php | 2 +- libraries/mult_submits.inc.php | 12 +++--------- libraries/svg_plot/pma_scatter_plot.php | 11 +++++------ libraries/tbl_links.inc.php | 3 +-- libraries/tbl_select.lib.php | 5 ++--- navigation.php | 3 +-- pmd_pdf.php | 2 +- server_databases.php | 11 +++++------ server_status.php | 7 +++---- sql.php | 7 +++---- tbl_addfield.php | 2 +- tbl_change.php | 8 +++----- tbl_replace.php | 2 +- 16 files changed, 34 insertions(+), 49 deletions(-) diff --git a/enum_editor.php b/enum_editor.php index 879023b..143d3c4 100644 --- a/enum_editor.php +++ b/enum_editor.php @@ -93,7 +93,7 @@ require_once './libraries/header_meta_style.inc.php'; // Remove a value, given a valid index, from the list // of values, if there was a request to do so. if (isset($_GET['drop']) && is_array($_GET['drop'])) { - foreach ($_GET['drop'] as $index => $value){ + foreach ($_GET['drop'] as $index => $value) { if ((int)$index == $index && $index > 0 && $index <= count($values) diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 538d3e5..3dd65ff 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -208,8 +208,8 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { * Sets a variable to remember headers have been sent */ $GLOBALS['is_header_sent'] = true; -} //end if (!$GLOBALS['is_ajax_request']) -else { +//end if (!$GLOBALS['is_ajax_request']) +} else { if (empty($GLOBALS['is_header_sent'])) { include_once './libraries/header_http.inc.php'; $GLOBALS['is_header_sent'] = true; diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php index 514f6ed..c8a68ac 100644 --- a/libraries/header_scripts.inc.php +++ b/libraries/header_scripts.inc.php @@ -64,7 +64,7 @@ if (typeof(parent.document) != 'undefined' && typeof(parent.document) != 'unknow parent.document.title = '<?php echo (isset($title) ? PMA_sanitize(PMA_escapeJsString(htmlspecialchars($title))) : ''); ?>'; } <?php -if(count($GLOBALS['js_script']) > 0) { +if (count($GLOBALS['js_script']) > 0) { echo implode("\n", $GLOBALS['js_script'])."\n"; } diff --git a/libraries/import/sql.php b/libraries/import/sql.php index 08f95aa..3f1ed8e 100644 --- a/libraries/import/sql.php +++ b/libraries/import/sql.php @@ -106,7 +106,7 @@ while (!($GLOBALS['finished'] && $i >= $len) && !$error && !$timeout_passed) { // free memory unset($data); // Do not parse string when we're not at the end and don't have ; inside - if ((strpos($buffer, $sql_delimiter, $i) === false) && !$GLOBALS['finished']) { + if ((strpos($buffer, $sql_delimiter, $i) === false) && !$GLOBALS['finished']) { continue; } } diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 6c67b27..bccc7b4 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -262,8 +262,7 @@ if (!empty($submit_mult) && !empty($what)) { <button type="submit" name="mult_btn" value="<?php echo __('Yes'); ?>" id="buttonYes"><?php echo __('Submit'); ?></button> </fieldset> <?php - } - elseif ($what == 'add_prefix_tbl') { ?> + } elseif ($what == 'add_prefix_tbl') { ?> <fieldset class = "input"> <legend><?php echo __('Add table prefix') ?>:</legend> <table> @@ -276,8 +275,7 @@ if (!empty($submit_mult) && !empty($what)) { <button type="submit" name="mult_btn" value="<?php echo __('Yes'); ?>" id="buttonYes"><?php echo __('Submit'); ?></button> </fieldset> <?php - } - else { ?> + } else { ?> <fieldset class="confirmation"> <legend><?php echo ($what == 'drop_db' ? __('You are about to DESTROY a complete database!') . ' ' : '') . __('Do you really want to '); ?>:</legend> <tt><?php echo $full_query; ?></tt> @@ -290,14 +288,10 @@ if (!empty($submit_mult) && !empty($what)) { } include './libraries/footer.inc.php'; -} // end if - - +} elseif ($mult_btn == __('Yes')) { /** * Executes the query - dropping rows, columns/fields, tables or dbs */ -elseif ($mult_btn == __('Yes')) { - if ($query_type == 'drop_db' || $query_type == 'drop_tbl' || $query_type == 'drop_fld') { include_once './libraries/relation_cleanup.lib.php'; } diff --git a/libraries/svg_plot/pma_scatter_plot.php b/libraries/svg_plot/pma_scatter_plot.php index 281a013..857a21c 100644 --- a/libraries/svg_plot/pma_scatter_plot.php +++ b/libraries/svg_plot/pma_scatter_plot.php @@ -118,13 +118,13 @@ class PMA_Scatter_Plot { $this->_dataPoints = array(); if (! is_null($this->_userSpecifiedSettings)) { - foreach (array_keys($this->_userSpecifiedSettings) as $key){ - $this->_settings[$key] = $this->_userSpecifiedSettings[$key]; - } + foreach (array_keys($this->_userSpecifiedSettings) as $key) { + $this->_settings[$key] = $this->_userSpecifiedSettings[$key]; + } } if ($this->_settings['dataLabel'] == '') { $labels = array_keys($this->_data[0]); - $this->_settings['dataLabel'] = $labels[0]; + $this->_settings['dataLabel'] = $labels[0]; } } @@ -213,8 +213,7 @@ class PMA_Scatter_Plot for ($j = 0 ; $j < count($coordinates[$i]) ; $j++) { $coordinates[$i][$j] = $map[$coordinates[$i][$j]]; } - } - else if (is_numeric($coordinates[$i][0])) { + } else if (is_numeric($coordinates[$i][0])) { $maxC = max($coordinates[$i]); for ($j = 0 ; $j < count($coordinates[$i]) ; $j++) { if ($i == 0) { diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php index e7e7152..bdc7adc 100644 --- a/libraries/tbl_links.inc.php +++ b/libraries/tbl_links.inc.php @@ -122,8 +122,7 @@ if ($table_info_num_rows == 0 && !$tbl_is_view) { echo PMA_generate_html_tabs($tabs, $url_params); unset($tabs); -if (PMA_Tracker::isActive() and PMA_Tracker::isTracked($GLOBALS["db"], $GLOBALS["table"])) -{ +if (PMA_Tracker::isActive() and PMA_Tracker::isTracked($GLOBALS["db"], $GLOBALS["table"])) { $msg = PMA_Message::notice('<a href="tbl_tracking.php?'.$url_query.'">'.sprintf(__('Tracking of %s.%s is activated.'), htmlspecialchars($GLOBALS["db"]), htmlspecialchars($GLOBALS["table"])).'</a>'); $msg->display(); } diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index 27f643a..86601d1 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -152,12 +152,11 @@ function PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fie $str .= '</select>' . "\n"; } elseif ($foreignData['foreign_link'] == true) { - if(isset($fields[$i]) && is_string($fields[$i])){ + if (isset($fields[$i]) && is_string($fields[$i])) { $str .= '<input type="text" id="fieldID_' . $i .'"name="fields[' . $i . ']" value="' . $fields[$i] . '"'; 'id="field_' . md5($field) . '[' . $i .']" class="textfield"/>' ; - } - else{ + } else { $str .= '<input type="text" id="fieldID_' . $i .'"name="fields[' . $i . ']"'; 'id="field_' . md5($field) . '[' . $i .']" class="textfield" />' ; diff --git a/navigation.php b/navigation.php index a93aae6..4966c73 100644 --- a/navigation.php +++ b/navigation.php @@ -43,8 +43,7 @@ if (! isset($_SESSION['tmp_user_values']['table_limit_offset']) || $_SESSION['tm if (isset($_REQUEST['pos'])) { if (isset($_REQUEST['tpos'])) { $_SESSION['tmp_user_values']['table_limit_offset'] = (int) $_REQUEST['pos']; - } - else { + } else { $_SESSION['tmp_user_values']['navi_limit_offset'] = (int) $_REQUEST['pos']; } } diff --git a/pmd_pdf.php b/pmd_pdf.php index ced74f9..6a47bc2 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -85,7 +85,7 @@ if (PMA_DBI_num_rows($table_info_result) > 0) { echo '<p>' . __('Page') . ':'; echo '<select name="pdf_page_number">'; - while($page = PMA_DBI_fetch_assoc($table_info_result)) { + while ($page = PMA_DBI_fetch_assoc($table_info_result)) { echo '<option value="' . $page['page_nr'] . '">'; echo htmlspecialchars($page['page_descr']); echo '</option>'; diff --git a/server_databases.php b/server_databases.php index 9b6d5b0..c76da53 100644 --- a/server_databases.php +++ b/server_databases.php @@ -181,8 +181,7 @@ if ($databases_count > 0) { } } - foreach ($replication_types as $type) - { + foreach ($replication_types as $type) { if ($type=="master") $name = __('Master replication'); elseif ($type == "slave") @@ -245,10 +244,10 @@ if ($databases_count > 0) { } } - foreach ($replication_types as $type) - { - if (${"server_{$type}_status"}) - echo ' <th></th>' . "\n"; + foreach ($replication_types as $type) { + if (${"server_{$type}_status"}) { + echo ' <th></th>' . "\n"; + { } if ($is_superuser) { diff --git a/server_status.php b/server_status.php index bfd641d..4fa4707 100644 --- a/server_status.php +++ b/server_status.php @@ -421,7 +421,7 @@ $GLOBALS['js_include'][] = 'highcharts/highcharts.js'; /* Files required for chart exporting */ $GLOBALS['js_include'][] = 'highcharts/exporting.js'; /* < IE 9 doesn't support canvas natively */ -if(PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) { +if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) { $GLOBALS['js_include'][] = 'canvg/flashcanvas.js'; } $GLOBALS['js_include'][] = 'canvg/canvg.js'; @@ -671,7 +671,7 @@ foreach ($server_status as $name => $value) { } } -if(PMA_DRIZZLE) { +if (PMA_DRIZZLE) { $used_queries = PMA_DBI_fetch_result( 'SELECT * FROM data_dictionary.global_statements', 0, @@ -1073,8 +1073,7 @@ function printServerTraffic() <h3><a name="replication"></a><?php echo __('Replication status'); ?></h3> <?php - foreach ($replication_types as $type) - { + foreach ($replication_types as $type) { if (${"server_{$type}_status"}) { PMA_replication_print_status_table($type); } diff --git a/sql.php b/sql.php index 9100def..93b84da 100644 --- a/sql.php +++ b/sql.php @@ -777,10 +777,9 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . str_replace('&', '&', $goto) . '&message=' . urlencode($message)); } // end else exit(); -} // end no rows returned - -// At least one row is returned -> displays a table with results -else { +// end no rows returned +} else { + // At least one row is returned -> displays a table with results //If we are retrieving the full value of a truncated field or the original // value of a transformed field, show it here and exit if ($GLOBALS['grid_edit'] == true && $GLOBALS['cfg']['AjaxEnable']) { diff --git a/tbl_addfield.php b/tbl_addfield.php index ce8735e..55a980c 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -185,7 +185,7 @@ if (isset($_REQUEST['do_save_data'])) { $message = PMA_Message::success(__('Table %1$s has been altered successfully')); $message->addParam($table); - if( $GLOBALS['is_ajax_request'] == true) { + if ( $GLOBALS['is_ajax_request'] == true) { $extra_data['sql_query'] = PMA_showMessage(null, $sql_query); PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); } diff --git a/tbl_change.php b/tbl_change.php index 4ffe4b2..660adff 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -803,9 +803,8 @@ foreach ($rows as $row_id => $vrow) { ?> </select> <?php - } // We don't want binary data destroyed - elseif ($field['is_binary'] || $field['is_blob']) { + } elseif ($field['is_binary'] || $field['is_blob']) { if (($cfg['ProtectBinary'] && $field['is_blob']) || ($cfg['ProtectBinary'] == 'all' && $field['is_binary']) ) { @@ -912,10 +911,9 @@ foreach ($rows as $row_id => $vrow) { echo ' </select>' . "\n"; } } // end if (web-server upload directory) - } // end elseif (binary or blob) - elseif (in_array($field['pma_type'], $no_support_types)) { + // end elseif (binary or blob) + } elseif (! in_array($field['pma_type'], $no_support_types)) { // ignore this column to avoid changing it - } else { if ($field['is_char']) { $fieldsize = $extracted_fieldspec['spec_in_brackets']; } else { diff --git a/tbl_replace.php b/tbl_replace.php index 38319b2..2505461 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -272,7 +272,7 @@ foreach ($loop_array as $rownumber => $where_clause) { } elseif (! in_array($me_funcs[$key], $func_no_param) || ($val != "''" && in_array($me_funcs[$key], $func_optional_param))) { $cur_value = $me_funcs[$key] . '(' . $val . ')'; - } else { + } else { $cur_value = $me_funcs[$key] . '()'; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23435-g90bd765
by Dieter Adriaenssens 24 Nov '11

24 Nov '11

The branch, master has been updated via 90bd76540c22cdc1fca5529cf00f7dbc694b6b51 (commit) from 4ec5f183b36993ea7a64b7cd28e24f9c7e58099e (commit) - Log ----------------------------------------------------------------- commit 90bd76540c22cdc1fca5529cf00f7dbc694b6b51 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Thu Nov 24 14:47:45 2011 +0100 coding style : correct use of includeonce() ----------------------------------------------------------------------- Summary of changes: libraries/core.lib.php | 2 +- tbl_indexes.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/core.lib.php b/libraries/core.lib.php index a27bb17..9587071 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -694,7 +694,7 @@ function PMA_linkURL($url) return $url; } else { if (!function_exists('PMA_generate_common_url')) { - require_once('./libraries/url_generating.lib.php'); + include_once './libraries/url_generating.lib.php'; } $params = array(); $params['url'] = $url; diff --git a/tbl_indexes.php b/tbl_indexes.php index b576e10..195568b 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -125,7 +125,7 @@ if (isset($_REQUEST['do_save_data'])) { $GLOBALS['js_include'][] = 'indexes.js'; require_once './libraries/tbl_info.inc.php'; if ($GLOBALS['is_ajax_request'] != true) { - require_once './libraries/tbl_links.inc.php'; + include_once './libraries/tbl_links.inc.php'; } if (isset($_REQUEST['index']) && is_array($_REQUEST['index'])) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 40f86a310c4583d299ddb494f0b6972250e47720
by Michal Čihař 24 Nov '11

24 Nov '11

The branch, master has been updated via 40f86a310c4583d299ddb494f0b6972250e47720 (commit) via a001ecb13a8d9d68b8fcd0a965a4cacb3114685e (commit) via afa3cb84826344e36b15bdfebca51cf4114c6046 (commit) via c1deac7154debe4472f2eadc7a80112a1f2dfc42 (commit) via 84515ed04e65cf2b42cd0f4d79398839963e1299 (commit) via c7e62f8f495250aabbaf9a758f5d830af51cc4d3 (commit) via a82954f68cfdf04cc5b63c9c4e8815f59b5e2bcf (commit) via bfc309b7dca3c7452844f84c038e5006d6f7daa3 (commit) via f21a7216fe3921fcbf7777dcce87ae419a83b4a4 (commit) via e56c594a0935148705650b08dbe4e37396ab3334 (commit) via 6a0f93d106e499e16722a7aeb376adc91fef21a7 (commit) via f44523faff4aeb20cfeac38b5f76bb81769e960a (commit) via e253b192fed25231e7ec8dd3a547ac396ba2585d (commit) via dc3a72f64a884a7f4c57e0aae53fe758080945a5 (commit) via 8d9d28487d4ac15f6f0b2cfa4c5a5ea7cf49d6c2 (commit) via e3b0e37b0fad3093458a1f8bf2547da3ccaeb077 (commit) via 08e26f0acdb5fe85ab48844cb0b65b838d1d8887 (commit) via d275f8a0d995fe02de37302362b43d83cd29e99d (commit) via 2246fe3eafd64456e15edc4b14d40c27f1435ffb (commit) via b3dcd2095476b88170104a3f73cb759d8f429dc1 (commit) via 1e8ef1177d9a64ef5fe20bd4bf0a6715c5aacd02 (commit) via 955bc2d8f9348633ef22e5aa389e1d3857cfab9e (commit) via 8820da690eda6dd7706edeeb08b01a98cdc7d055 (commit) via 6134449379723e71fc87904eeb7e8fdd4e21a1e6 (commit) via bf34f862a02977752bd7b0cf709f3fdb1e41b4f4 (commit) via 3f62e9ded5b7ab914ca58e4c04da2ce6767ec7a4 (commit) via aa563c033552f0aa7599eb70d2129f678bf20378 (commit) via 28957322a5a119e48a4d7e94d3ac0e4317e4ae74 (commit) via 556cc653e15463f192a553ec94911637231699b2 (commit) via 4d8c671e161aabb9fa438bca25498e30dcb98f62 (commit) via c93f61075629e955e24e6c9f1a6531a754fc2a29 (commit) via 26221515189d4143a86ebf5dd0f2da67be1cf7dc (commit) via b3121c55bc85880db13e59271dc57ac64adf55bf (commit) via 0dc6c2d180553b5ef76579befba3c010acc85ab2 (commit) via ce9d2960f000dddac02d580816146f52cddb1d80 (commit) via 9745ed6fa729564322665e5a20ba9c6a234b8db6 (commit) via a9e5a34935d91ba3aa88a487cc950a4290c0cf0d (commit) via 42a8a05168fd9d9b16f84e95c0063da88e0eb679 (commit) via 19399c0ff5ef1cce7d6decb5b4f4ee3769ae2fc0 (commit) via d7d3db319294869f5d9f5462429923f018f9f9da (commit) via 27849403c91747e0bac5f31ddbe75916d20622a3 (commit) via 5c54dc1ade861cbfbfe02aad127dc73acb379bbc (commit) via 31714ec7c4cb99936ca73b9cd7bc894e62c3450e (commit) via f38839bca6db1931ac3d712f6bead0c81d347e96 (commit) via 8925f97e1e8e8abd37e1207e9bd9c51794072567 (commit) via 1d4cfeed1c2895956d71b11c8dd5a95af8dd98ec (commit) via 593a21c61050023d2b880367cd39c6f1e5ee82e4 (commit) via a2b870a067f8a780f37723c470c884a100dc6aa3 (commit) via f78d56ae98ee057584796e5537859aa89645ac60 (commit) via ef086e32459ff942112d213e37855b831c386ead (commit) via dd6a2675afc7144393a2d3cb36f7eb7fb78fc060 (commit) via 56cc53340781f972dfc12ec7293d58dee889aade (commit) via d878064e49c063110421a35f8d186d5bc0721a75 (commit) from 79c6825dcf33763c4a24956ec5d39b743573f869 (commit) - Log ----------------------------------------------------------------- commit 40f86a310c4583d299ddb494f0b6972250e47720 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Nov 24 09:01:51 2011 +0100 Update generated files commit a001ecb13a8d9d68b8fcd0a965a4cacb3114685e Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:48:15 2011 +0200 Translation update done using Pootle. commit afa3cb84826344e36b15bdfebca51cf4114c6046 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:48:11 2011 +0200 Translation update done using Pootle. commit c1deac7154debe4472f2eadc7a80112a1f2dfc42 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:48:05 2011 +0200 Translation update done using Pootle. commit 84515ed04e65cf2b42cd0f4d79398839963e1299 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:48:00 2011 +0200 Translation update done using Pootle. commit c7e62f8f495250aabbaf9a758f5d830af51cc4d3 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:47:54 2011 +0200 Translation update done using Pootle. commit a82954f68cfdf04cc5b63c9c4e8815f59b5e2bcf Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:47:46 2011 +0200 Translation update done using Pootle. commit bfc309b7dca3c7452844f84c038e5006d6f7daa3 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:47:36 2011 +0200 Translation update done using Pootle. commit f21a7216fe3921fcbf7777dcce87ae419a83b4a4 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:47:28 2011 +0200 Translation update done using Pootle. commit e56c594a0935148705650b08dbe4e37396ab3334 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:47:18 2011 +0200 Translation update done using Pootle. commit 6a0f93d106e499e16722a7aeb376adc91fef21a7 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:47:01 2011 +0200 Translation update done using Pootle. commit f44523faff4aeb20cfeac38b5f76bb81769e960a Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:46:54 2011 +0200 Translation update done using Pootle. commit e253b192fed25231e7ec8dd3a547ac396ba2585d Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:46:48 2011 +0200 Translation update done using Pootle. commit dc3a72f64a884a7f4c57e0aae53fe758080945a5 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:46:36 2011 +0200 Translation update done using Pootle. commit 8d9d28487d4ac15f6f0b2cfa4c5a5ea7cf49d6c2 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:46:33 2011 +0200 Translation update done using Pootle. commit e3b0e37b0fad3093458a1f8bf2547da3ccaeb077 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:46:29 2011 +0200 Translation update done using Pootle. commit 08e26f0acdb5fe85ab48844cb0b65b838d1d8887 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:46:25 2011 +0200 Translation update done using Pootle. commit d275f8a0d995fe02de37302362b43d83cd29e99d Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:46:21 2011 +0200 Translation update done using Pootle. commit 2246fe3eafd64456e15edc4b14d40c27f1435ffb Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:46:16 2011 +0200 Translation update done using Pootle. commit b3dcd2095476b88170104a3f73cb759d8f429dc1 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:46:10 2011 +0200 Translation update done using Pootle. commit 1e8ef1177d9a64ef5fe20bd4bf0a6715c5aacd02 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:45:53 2011 +0200 Translation update done using Pootle. commit 955bc2d8f9348633ef22e5aa389e1d3857cfab9e Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:45:44 2011 +0200 Translation update done using Pootle. commit 8820da690eda6dd7706edeeb08b01a98cdc7d055 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:43:53 2011 +0200 Translation update done using Pootle. commit 6134449379723e71fc87904eeb7e8fdd4e21a1e6 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:43:24 2011 +0200 Translation update done using Pootle. commit bf34f862a02977752bd7b0cf709f3fdb1e41b4f4 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:42:41 2011 +0200 Translation update done using Pootle. commit 3f62e9ded5b7ab914ca58e4c04da2ce6767ec7a4 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:42:35 2011 +0200 Translation update done using Pootle. commit aa563c033552f0aa7599eb70d2129f678bf20378 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:42:26 2011 +0200 Translation update done using Pootle. commit 28957322a5a119e48a4d7e94d3ac0e4317e4ae74 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:42:09 2011 +0200 Translation update done using Pootle. commit 556cc653e15463f192a553ec94911637231699b2 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:40:54 2011 +0200 Translation update done using Pootle. commit 4d8c671e161aabb9fa438bca25498e30dcb98f62 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:40:38 2011 +0200 Translation update done using Pootle. commit c93f61075629e955e24e6c9f1a6531a754fc2a29 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:40:34 2011 +0200 Translation update done using Pootle. commit 26221515189d4143a86ebf5dd0f2da67be1cf7dc Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:40:28 2011 +0200 Translation update done using Pootle. commit b3121c55bc85880db13e59271dc57ac64adf55bf Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:40:19 2011 +0200 Translation update done using Pootle. commit 0dc6c2d180553b5ef76579befba3c010acc85ab2 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:40:15 2011 +0200 Translation update done using Pootle. commit ce9d2960f000dddac02d580816146f52cddb1d80 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:40:13 2011 +0200 Translation update done using Pootle. commit 9745ed6fa729564322665e5a20ba9c6a234b8db6 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:40:09 2011 +0200 Translation update done using Pootle. commit a9e5a34935d91ba3aa88a487cc950a4290c0cf0d Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:40:03 2011 +0200 Translation update done using Pootle. commit 42a8a05168fd9d9b16f84e95c0063da88e0eb679 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:39:59 2011 +0200 Translation update done using Pootle. commit 19399c0ff5ef1cce7d6decb5b4f4ee3769ae2fc0 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:39:50 2011 +0200 Translation update done using Pootle. commit d7d3db319294869f5d9f5462429923f018f9f9da Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:12:56 2011 +0200 Translation update done using Pootle. commit 27849403c91747e0bac5f31ddbe75916d20622a3 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:11:46 2011 +0200 Translation update done using Pootle. commit 5c54dc1ade861cbfbfe02aad127dc73acb379bbc Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:11:36 2011 +0200 Translation update done using Pootle. commit 31714ec7c4cb99936ca73b9cd7bc894e62c3450e Author: Robert Readman <robert_readman(a)hotmail.com> Date: Thu Nov 24 03:11:28 2011 +0200 Translation update done using Pootle. commit f38839bca6db1931ac3d712f6bead0c81d347e96 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Nov 23 22:50:56 2011 +0200 Translation update done using Pootle. commit 8925f97e1e8e8abd37e1207e9bd9c51794072567 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Nov 23 12:17:10 2011 +0200 Translation update done using Pootle. commit 1d4cfeed1c2895956d71b11c8dd5a95af8dd98ec Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Nov 23 12:13:46 2011 +0200 Translation update done using Pootle. commit 593a21c61050023d2b880367cd39c6f1e5ee82e4 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Nov 23 12:12:36 2011 +0200 Translation update done using Pootle. commit a2b870a067f8a780f37723c470c884a100dc6aa3 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Nov 23 12:12:17 2011 +0200 Translation update done using Pootle. commit f78d56ae98ee057584796e5537859aa89645ac60 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Nov 23 12:10:36 2011 +0200 Translation update done using Pootle. commit ef086e32459ff942112d213e37855b831c386ead Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Nov 23 12:07:14 2011 +0200 Translation update done using Pootle. commit dd6a2675afc7144393a2d3cb36f7eb7fb78fc060 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Nov 23 12:05:26 2011 +0200 Translation update done using Pootle. commit 56cc53340781f972dfc12ec7293d58dee889aade Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Nov 23 12:00:46 2011 +0200 Translation update done using Pootle. commit d878064e49c063110421a35f8d186d5bc0721a75 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Tue Nov 22 21:02:55 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/en_GB/Documentation.html | 6 +- output/en_GB/README | 2 +- output/es/Documentation.html | 4 +- output/ja/Documentation.html | 20 +++--- output/ja/index.html | 2 +- output/tr/Documentation.html | 6 +- po/en_GB.po | 158 +++++++++++++++++++++++++++------------ po/es.po | 8 +- po/ja.po | 35 ++++----- po/tr.po | 8 +- 10 files changed, 150 insertions(+), 99 deletions(-) diff --git a/output/en_GB/Documentation.html b/output/en_GB/Documentation.html index ace36af..e8b15ca 100644 --- a/output/en_GB/Documentation.html +++ b/output/en_GB/Documentation.html @@ -1224,7 +1224,7 @@ themselves and store them in the database. If you don't allow for storing preferences in <a href="#pmadb">pmadb</a>, users can still personalise phpMyAdmin, but settings will be saved in -browser's local storage, or, it is is unavailable, until the end of session. +browser's local storage, or, if it is unavailable, until the end of session. <br /><br /> To allow the usage of this functionality: @@ -2042,8 +2042,8 @@ href="#cfg_CharEditing">$cfg['CharEditing']</a>).</dd> <dd>Defines if the whole textarea of the query box will be selected on click.</dd> <dt id="cfg_LimitChars">$cfg['LimitChars'] integer</dt> - <dd>Maximum number of characters shown in any non-numeric field on browse -view. Can be turned off by a toggle button on the browse page.</dd> + <dd>Maximum number of characters shown in any non-numeric field on browse view. +Can be turned off by a toggle button on the browse page.</dd> <dt><span id="cfg_RowActionLinks">$cfg['RowActionLinks'] </span>string </dt> diff --git a/output/en_GB/README b/output/en_GB/README index fdd8c91..961355a 100644 --- a/output/en_GB/README +++ b/output/en_GB/README @@ -56,7 +56,7 @@ For a summary of features, please see the Documentation.txt/.html file. Download -------- -You can get the newest version at http://www.phpmyadmin.net/ +You can get the newest version at http://www.phpmyadmin.net/. More Information ---------------- diff --git a/output/es/Documentation.html b/output/es/Documentation.html index d2122fa..efacc0f 100644 --- a/output/es/Documentation.html +++ b/output/es/Documentation.html @@ -1656,8 +1656,8 @@ class="configrule">$cfg['LeftFrameTableSeparator']</a> </dd> <dt id="cfg_LeftFrameDBTree">booleano $cfg['LeftFrameDBTree']</dt> - <dd>Defines whether to display the names of databases (in the selector) using a -tree, see also <a href="#cfg_LeftFrameDBSeparator" + <dd>Define si mostrar los nombres de las bases de datos (en el selector) +utilizando un árbol, ver también <a href="#cfg_LeftFrameDBSeparator" class="configrule">$cfg['LeftFrameDBSeparator']</a>. </dd> diff --git a/output/ja/Documentation.html b/output/ja/Documentation.html index 6a6e755..e203bbb 100644 --- a/output/ja/Documentation.html +++ b/output/ja/Documentation.html @@ -109,7 +109,7 @@ MySQL ユーザを適切にセットアップしてお望みのデータベー <h3>phpMyAdmin は現在次のことができます。</h3> <ul><li>データベース、テーブル、ビュー、カラム、インデックスの閲覧および削除</li> - <li>データベース、テーブル、カラム、インデックスの作成・コピー・削除・リネーム・定義の変更</li> + <li>データベース、テーブル、カラム、インデックスの作成・複製・削除・名称および定義の変更</li> <li>サーバ、データベース、テーブルの保守、そのためのサーバの設定を提案</li> <li>任意の <abbr title="structured query language">SQL</abbr> 文の実行、編集、ブックマーク。マルチクエリにも対応。</li> @@ -843,9 +843,9 @@ ALTER TABLE `pma_column_comments` ADD `transformation_options` VARCHAR( 255 ) NOT NULL; </pre> - また、忘れずに <i>config.inc.php</i> にある変数を<br /> + また、忘れずに <i>config.inc.php</i> にある変数名を<br /> <tt>$cfg['Servers'][$i]['column_comments']</tt> から -<tt>$cfg['Servers'][$i]['column_info']</tt> にリネームします。</li> +<tt>$cfg['Servers'][$i]['column_info']</tt> に変更します。</li> </ul> </dd> @@ -1308,9 +1308,8 @@ class="configrule">$cfg['LeftFrameTableSeparator']</a> </dd> <dt id="cfg_LeftFrameDBTree">$cfg['LeftFrameDBTree'] 論理型</dt> - <dd>Defines whether to display the names of databases (in the selector) using a -tree, see also <a href="#cfg_LeftFrameDBSeparator" -class="configrule">$cfg['LeftFrameDBSeparator']</a>. + <dd>(セレクターの) データベース名をツリー表示するかどうかを定義します。<a href="#cfg_LeftFrameDBSeparator" +class="configrule">$cfg['LeftFrameDBSeparator']</a> もご覧ください。 </dd> <dt id="cfg_LeftFrameDBSeparator">$cfg['LeftFrameDBSeparator'] 文字列または配列</dt> @@ -1684,8 +1683,8 @@ href="#cfg_CharEditing">$cfg['CharEditing']</a> でそのように設定され <dt><span id="cfg_RowActionLinks">$cfg['RowActionLinks']</span> 文字列 </dt> - <dd>テーブルの内容を表示しているとき、行のリンク（編集、コピー、削除）をどこに表示するかを定義します（表示は、左側 (left)、右側 -(right)、左右両側 (both)、なし (none) が行えます）。「左 (left)」と「右 (right)」は、垂直表示モードでは「上 + <dd>テーブルの内容を表示しているとき、行のリンク (編集、複製、削除) をどこに表示するかを定義します (表示は、左側 (left)、右側 +(right)、左右両側 (both)、なし (none) が行えます)。「左 (left)」と「右 (right)」は、垂直表示モードでは「上 (top)」と「下 (bottom)」と解釈されます。</dd> <dt id="cfg_DefaultDisplay">$cfg['DefaultDisplay'] 文字列</dt> @@ -1902,7 +1901,8 @@ textarea <dd>データベースやテーブルの名前を自然な順番でソートします（たとえば、t1、t2、t10）。いまのところ左パネル（軽快モード）とデータベース画面のテーブル一覧に実装されています。</dd> <dt id="cfg_InitialSlidersState">$cfg['InitialSlidersState'] 文字列</dt> - <dd><tt>「closed（閉じている）」</tt>に設定した場合、折り畳みは閉じた状態で表示されます。<tt>「open（開いている）」</tt>はその逆です。全ての折り畳みを完全に無効にするには、<tt>「disabled」</tt>にします。</dd> + <dd><tt>「closed (閉じておく)」</tt>に設定した場合、折り畳みは閉じた状態で表示されます。<tt>「open +(開いておく)」</tt>はその逆です。全ての折り畳みを完全に無効にするには、<tt>「disabled (無効)」</tt>にします。</dd> <dt id="cfg_UserprefsDisallow">$cfg['UserprefsDisallow'] 配列</dt> <dd>ユーザ環境設定を許可させない設定オプションの名前 (<tt>$cfg</tt> 配列のキーで指定) @@ -2915,7 +2915,7 @@ class="configrule">$cfg['CompressOnFly']</a> (逐次圧縮) を使うとこのファイルが必要な場合、別の方法をとる必要があります。</p> <h4 id="faq3_3"> - <a href="#faq3_3">3.3 InnoDB テーブルでテーブルやカラムをリネームすると外部キーのリレーションが切れます。</a></h4> + <a href="#faq3_3">3.3 InnoDB テーブルでテーブルやカラムの名称を変更すると外部キーのリレーションが切れます。</a></h4> <p> これは InnoDB のバグです。<a href="http://bugs.mysql.com/bug.php?id=21704">http://bugs.mysql.com/bug.php?id=21704</a> diff --git a/output/ja/index.html b/output/ja/index.html index a2ce4c3..fae0dc0 100644 --- a/output/ja/index.html +++ b/output/ja/index.html @@ -8,7 +8,7 @@ </head> <body> <h1>phpMyAdmin 日本語ドキュメント</h1> -<p>ドキュメントの日本語�ント</h1>x.html.mysql.com/bug.php?id=21704</a>すると外部キーのリレーションが切れます。</a></h4>��</tt>はその逆です。全ての折り畳みを完全に無効にするには、<tt>「disabled」</tt>にします。</dd>�!�!��+��`�+��xT7�_+P�+��_+��_+��+��`��_+/�+��O��_+u��_+@��_+�D��_+�I��_+��_+xT7�_+P�+�� +��k��_+�!�!��+��`�+��H�_+0�+��_+��_+��+��`��_+/�+�� +��+��8�;�_+�p�`�+��u��_+��_+0�+��+��k��_+GHIJKMNOP��+��`�+��H��_+й+��_+��_+��+��0O��_+u��_+`7�_+� ˻_+@��_+�D��_+�I��_+��_+H��_+й+��+��k��_+8��_+й+��@�+��k��_+(��_+й+��p�+��k��_+��_+й+��+��k��_+ �N��_+u��_+�I��_+ �+��X˻_+e��_+�D��_+@�+��yX˻_+e��_+@��_+p�+��ZX˻_+e��_+�˻_+`7�_+� ˻_+@��_+�d7�_+�D��_+�I��_+��_+8�;�_+͖�_+`�+��p�ʻ_+ �+��+��k��_+5678:<=>?@BD��+��`�+��͓�_+`�+��u��_+�;�_+��+��͖�_+e��_+�;�_+�_@f�S Q��l��b�_+`�+��͓�_+0�+��+��k��_+u]�� 4Q��U^Qʉ��u��*ēv��+��`�+��H`�_+d��_+��+��p��_+�p��_+��_+/�+��`�+��+��+��o7�_+u��_+�d7�_+��+��p��_+��+��@�+��p��_+h�+��の翻訳:</p> +<p>日本語に翻訳されているドキュメント:</p> <ul> <li><a href="Documentation.html">メインドキュメント</a></li> <li><a href="INSTALL">インストール</a></li> diff --git a/output/tr/Documentation.html b/output/tr/Documentation.html index 82d7744..d2961e3 100644 --- a/output/tr/Documentation.html +++ b/output/tr/Documentation.html @@ -1638,9 +1638,9 @@ klasörleri görüntülemek için özelliği kullanabilirsiniz </dd> <dt id="cfg_LeftFrameDBTree">$cfg['LeftFrameDBTree'] boolean</dt> - <dd>Defines whether to display the names of databases (in the selector) using a -tree, see also <a href="#cfg_LeftFrameDBSeparator" -class="configrule">$cfg['LeftFrameDBSeparator']</a>. + <dd>Ağaç görünümü kullanarak veritabanı adlarını (seçicide) görüntülemek +gerekirse tanımlar, aynı zamanda <a href="#cfg_LeftFrameDBSeparator" +class="configrule">$cfg['LeftFrameDBSeparator']</a>'e bakın. </dd> <dt id="cfg_LeftFrameDBSeparator">$cfg['LeftFrameDBSeparator'] dizgi veya dizilim</dt> diff --git a/po/en_GB.po b/po/en_GB.po index f77845f..432279b 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-22 13:50+0100\n" -"PO-Revision-Date: 2011-11-14 18:02+0200\n" -"Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n" +"PO-Revision-Date: 2011-11-24 03:48+0200\n" +"Last-Translator: dannybeckett <daniel.beckett(a)gmail.com>\n" "Language-Team: none\n" "Language: en_GB\n" "MIME-Version: 1.0\n" @@ -215,11 +215,15 @@ msgstr "" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:85 +#, fuzzy msgid "" "To support XML and Open Document Spreadsheet importing, you need PHP 5.2.17 " "or newer and the <a href=\"http://www.php.net/libxml\"><tt>libxml</tt></a> " "extension." msgstr "" +"To support XML and Open Document Spreadsheet importing, you need PHP 5.2.17 " +"or newer and the <a href=\"http://www.php.net/libxml\"><tt>libxml</tt></a> " +"extension." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:90 @@ -3076,6 +3080,7 @@ msgstr "" "Since release 3.4.x phpMyAdmin allows users to set most preferences by " "themselves and store them in the database." +# The original translation for this also needs amending #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1206 msgid "" @@ -3085,7 +3090,7 @@ msgid "" msgstr "" "If you don't allow for storing preferences in <a href=\"#pmadb\">pmadb</a>, " "users can still personalise phpMyAdmin, but settings will be saved in " -"browser's local storage, or, it is is unavailable, until the end of session." +"browser's local storage, or, if it is unavailable, until the end of session." #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1216 @@ -4114,9 +4119,9 @@ msgid "" "tree, see also <a href=\"#cfg_LeftFrameDBSeparator\" class=\"configrule\">" "$cfg['LeftFrameDBSeparator']</a>." msgstr "" -"In light mode, defines whether to display the names of databases (in the " -"selector) using a tree, see also <a href=\"#cfg_LeftFrameDBSeparator\" class=" -"\"configrule\">$cfg['LeftFrameDBSeparator']</a>." +"Defines whether to display the names of databases (in the selector) using a " +"tree, see also <a href=\"#cfg_LeftFrameDBSeparator\" " +"class=\"configrule\">$cfg['LeftFrameDBSeparator']</a>." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1534 @@ -4674,10 +4679,13 @@ msgstr "$cfg['MaxSizeForInputField'] integer" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1710 +#, fuzzy msgid "" "Defines the maximum size for input fields generated for CHAR and VARCHAR " "columns." msgstr "" +"Defines the maximum size for input fields generated for CHAR and VARCHAR " +"columns." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1713 @@ -5558,12 +5566,13 @@ msgstr "$cfg['LimitChars'] integer" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1989 +#, fuzzy msgid "" "Maximum number of characters shown in any non-numeric field on browse view. " "Can be turned off by a toggle button on the browse page." msgstr "" "Maximum number of characters shown in any non-numeric field on browse view. " -"Can be turned off by a toggle button on the browse page." +" Can be turned off by a toggle button on the browse page." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1992 @@ -7888,14 +7897,19 @@ msgstr "" msgid "" "<a href=\"http://mariadb.org/\">MariaDB</a> is also supported (versions 5.1 " "and 5.2 were tested)." -msgstr "MariaDB is also supported (versions 5.1 and 5.2 were tested)." +msgstr "" +"<a href=\"http://mariadb.org/\">MariaDB</a> is also supported (versions 5.1 " +"and 5.2 were tested)." #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2849 +#, fuzzy msgid "" "Since phpMyAdmin 3.5 <a href=\"http://www.drizzle.org/\">Drizzle</a> is " "supported." msgstr "" +"Since phpMyAdmin 3.5 <a href=\"http://www.drizzle.org/\">Drizzle</a> is " +"supported." #. type: Content of: <html><body><div><h5> #: orig-docs/Documentation.html:2853 @@ -8379,7 +8393,7 @@ msgstr "" #: orig-docs/Documentation.html:3040 #, fuzzy msgid "<a href=\"#faq1_33\">1.33 (withdrawn).</a>" -msgstr "<a href=\"#faq1_3\">1.3 (withdrawn).</a>" +msgstr "<a href=\"#faq1_33\">1.33 (withdrawn).</a>" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3043 @@ -8633,9 +8647,9 @@ msgid "" "max_value_length\">suhosin.get.max_value_length</a> should be increased (eg. " "1024)" msgstr "" -"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin." -"post.max_totalname_length\">suhosin.post.max_totalname_length</a> should be " -"increased (eg. 8192)" +"<a href=\"http://www.hardened-php.net/suhosin/configuration.html#suhosin.get." +"max_value_length\">suhosin.get.max_value_length</a> should be increased (eg. " +"1024)" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3127 @@ -8972,9 +8986,9 @@ msgid "" ""alpha" it means you're running a testing version of PHP. That's " "not a so good idea, please upgrade to a plain revision." msgstr "" -"Also have a look at your PHP version number: if it contains "4.0b..." -"" it means you're running a beta version of PHP. That's not a so good " -"idea, please upgrade to a plain revision." +"Also have a look at your PHP version number: if it contains "b" or " +""alpha" it means you're running a testing version of PHP. That's " +"not a so good idea, please upgrade to a plain revision." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3255 @@ -8985,9 +8999,9 @@ msgid "" "<abbr title=\"HyperText Transfer Protocol\">HTTP</abbr> or cookie " "authentication, I'm asked to log in again. What's wrong?</a>" msgstr "" -"<a href=\"#faq2_5\">2.5 Each time I want to insert or change a record or " -"drop a database or a table, an error 404 (page not found) is displayed or, " -"with <abbr title=\"HyperText Transfer Protocol\">HTTP</abbr> or cookie " +"<a href=\"#faq2_5\">2.5 Each time I want to insert or change a row or drop a " +"database or a table, an error 404 (page not found) is displayed or, with " +"<abbr title=\"HyperText Transfer Protocol\">HTTP</abbr> or cookie " "authentication, I'm asked to log in again. What's wrong?</a>" #. type: Content of: <html><body><div><p> @@ -9589,7 +9603,7 @@ msgid "" "<a href=\"#faq3_11\">3.11 The number of rows for InnoDB tables is not " "correct.</a>" msgstr "" -"<a href=\"#faq3_11\">3.11 The number of records for InnoDB tables is not " +"<a href=\"#faq3_11\">3.11 The number of rows for InnoDB tables is not " "correct.</a>" #. type: Content of: <html><body><div><p> @@ -9652,19 +9666,19 @@ msgstr "" #: orig-docs/Documentation.html:3524 #, fuzzy msgid "<a href=\"#faq3_15\">3.15 (withdrawn).</a>" -msgstr "<a href=\"#faq3_12\">3.12 (withdrawn).</a>" +msgstr "<a href=\"#faq3_15\">3.15 (withdrawn).</a>" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3527 #, fuzzy msgid "<a href=\"#faq3_16\">3.16 (withdrawn).</a>" -msgstr "<a href=\"#faq3_12\">3.12 (withdrawn).</a>" +msgstr "<a href=\"#faq3_16\">3.16 (withdrawn).</a>" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3530 #, fuzzy msgid "<a href=\"#faq3_17\">3.17 (withdrawn).</a>" -msgstr "<a href=\"#faq3_12\">3.12 (withdrawn).</a>" +msgstr "<a href=\"#faq3_17\">3.17 (withdrawn).</a>" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3536 @@ -9817,8 +9831,9 @@ msgstr "" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3595 +#, fuzzy msgid "Follow security recommendations for PHP and your webserver." -msgstr "" +msgstr "Follow security recommendations for PHP and your webserver." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3600 @@ -11550,7 +11565,8 @@ msgid "" "Yes. If a bookmark has the same label as a table name and it's not a public " "bookmark, it will be executed." msgstr "" -"Yes. If a bookmark has the same label as a table name, it will be executed." +"Yes. If a bookmark has the same label as a table name and it's not a public " +"bookmark, it will be executed." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:4282 @@ -11560,21 +11576,27 @@ msgid "" "Excel files?</a>" msgstr "" "<a href=\"#faq6_23\">6.23 Export: I heard phpMyAdmin can export Microsoft " -"Excel files, how can I enable that?</a>" +"Excel files?</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4284 +#, fuzzy msgid "" "You can use <abbr title=\"comma separated values\">CSV</abbr> for Microsoft " "Excel, which works out of the box." msgstr "" +"You can use <abbr title=\"comma separated values\">CSV</abbr> for Microsoft " +"Excel, which works out of the box." #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4287 +#, fuzzy msgid "" "Since phpMyAdmin 3.4.5 support for direct export to Microsoft Excel version " "97 and newer was dropped." msgstr "" +"Since phpMyAdmin 3.4.5 support for direct export to Microsoft Excel version " +"97 and newer was dropped." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:4292 @@ -11785,13 +11807,13 @@ msgstr "Currently opened table" #: orig-docs/Documentation.html:4348 #, fuzzy msgid "<code>@COLUMNS@</code>" -msgstr "<code>@FIELDS@</code>" +msgstr "<code>@COLUMNS@</code>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:4349 #, fuzzy msgid "Columns of the currently opened table" -msgstr "Fields of currently opened table" +msgstr "Columns of the currently opened table" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:4350 @@ -11892,11 +11914,11 @@ msgstr "" #: orig-docs/Documentation.html:4389 #, fuzzy msgid "<a href=\"#faq6_30\">6.30 Import: How can I import ESRI Shapefiles</a>" -msgstr "" -"<a href=\"#faq6_3\">6.3 How can I insert a null value into my table?</a>" +msgstr "<a href=\"#faq6_30\">6.30 Import: How can I import ESRI Shapefiles</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4392 +#, fuzzy msgid "" "An ESRI Shapefile is actually a set of several files, where .shp file " "contains geometry data and .dbf file contains data related to those geometry " @@ -11904,20 +11926,31 @@ msgid "" "dBase extension (--enable-dbase). Otherwise only geometry data will be " "imported." msgstr "" +"An ESRI Shapefile is actually a set of several files, where .shp file " +"contains geometry data and .dbf file contains data related to those geometry " +"data. To read data from .dbf file you need to have PHP compiled with the " +"dBase extension (--enable-dbase). Otherwise only geometry data will be " +"imported." #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4398 +#, fuzzy msgid "" "To upload these set of files you can use either of the following methods:" msgstr "" +"To upload these set of files you can use either of the following methods:" #. type: Content of: <html><body><div><ul><li><p> #: orig-docs/Documentation.html:4402 +#, fuzzy msgid "" "Configure upload directory with <a href=\"#cfg_UploadDir\" class=\"configrule" "\">$cfg['UploadDir']</a>, upload both .shp and .dbf files with the same " "filename and chose the .shp file from the import page." msgstr "" +"Configure upload directory with <a href=\"#cfg_UploadDir\" " +"class=\"configrule\">$cfg['UploadDir']</a>, upload both .shp and .dbf files " +"with the same filename and chose the .shp file from the import page." #. type: Content of: <html><body><div><ul><li><p> #: orig-docs/Documentation.html:4409 @@ -11928,11 +11961,10 @@ msgid "" "['TempDir']</a> to a place where the web server user can write (for example " "<tt>'./tmp'</tt>)." msgstr "" -"You can use <abbr title=\"comma separated values\">CSV</abbr> for Microsoft " -"Excel, which works out of the box, but phpMyAdmin supports direct export to " -"Microsoft Excel version 97 and newer. For this to work, you need to set <a " -"href=\"#cfg_TempDir\" class=\"configrule\">$cfg['TempDir']</a> to a place " -"where the web server user can write (for example <tt>'./tmp'</tt>)." +"Create a Zip archive with .shp and .dbf files and import it. For this to " +"work, you need to set <a href=\"#cfg_TempDir\" " +"class=\"configrule\">$cfg['TempDir']</a> to a place where the web server user " +"can write (for example <tt>'./tmp'</tt>)." #. type: Content of: <html><body><div><ul><li><p> #: orig-docs/Documentation.html:4414 @@ -11955,9 +11987,7 @@ msgstr "" #: orig-docs/Documentation.html:4424 #, fuzzy msgid "<a href=\"#faq6_31\">6.31 How do I create a relation in designer?</a>" -msgstr "" -"<a href=\"#faq6_6\">6.6 How can I use the relation table in Query-by-example?" -"</a>" +msgstr "<a href=\"#faq6_31\">6.31 How do I create a relation in designer?</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4426 @@ -11979,19 +12009,25 @@ msgstr "" #: orig-docs/Documentation.html:4432 #, fuzzy msgid "<a href=\"#faq6_32\">6.32 How can I use the zoom search feature?</a>" -msgstr "<a href=\"#faq6_26\">6.26 How can I select a range of rows?</a>" +msgstr "<a href=\"#faq6_32\">6.32 How can I use the zoom search feature?</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4434 +#, fuzzy msgid "" "The Zoom search feature is an alternative to table search feature. It allows " "you to explore a table by representing its data in a scatter plot. You can " "locate this feature by selecting a table and clicking the 'Search' tab. One " "of the sub-tabs in the 'Table Search' page is 'Zoom Search'." msgstr "" +"The Zoom search feature is an alternative to table search feature. It allows " +"you to explore a table by representing its data in a scatter plot. You can " +"locate this feature by selecting a table and clicking the 'Search' tab. One " +"of the sub-tabs in the 'Table Search' page is 'Zoom Search'." #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4439 +#, fuzzy msgid "" "Consider the table REL_persons in <a href=\"#faq6_6\"><abbr title=" "\"Frequently Asked Questions\"> FAQ</abbr> 6.6</a> for an example. To use " @@ -12001,9 +12037,17 @@ msgid "" "on its id and town_code. You can include two additional search criteria " "apart from the two fields to display." msgstr "" +"Consider the table REL_persons in <a href=\"#faq6_6\"><abbr title=\"Frequently " +"Asked Questions\"> FAQ</abbr> 6.6</a> for an example. To use zoom search, two " +"columns need to be selected, for example, id and town_code. The id values " +"will be represented on one axis and town_code values on the other axis. Each " +"row will be represented as a point in a scatter plot based on its id and " +"town_code. You can include two additional search criteria apart from the two " +"fields to display." #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4446 +#, fuzzy msgid "" "You can choose which field should be displayed as label for each point. If a " "display column has been set for the table (see <a href=\"#faqdisplay\"><abbr " @@ -12013,9 +12057,17 @@ msgid "" "rows to plot' field. Once you have decided over your criteria, click 'Go' to " "display the plot." msgstr "" +"You can choose which field should be displayed as label for each point. If a " +"display column has been set for the table (see <a href=\"#faqdisplay\"><abbr " +"title=\"Frequently Asked Questions\">FAQ</abbr> 6.7</a>), it is taken as the " +"label unless you specify otherwise. You can also select the maximum number " +"of rows you want to be displayed in the plot by specifing it in the 'Max " +"rows to plot' field. Once you have decided over your criteria, click 'Go' to " +"display the plot." #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4453 +#, fuzzy msgid "" "After the plot is generated, you can use the mousewheel to zoom in and out " "of the plot. In addition, panning feature is enabled to navigate through " @@ -12026,6 +12078,14 @@ msgid "" "Basic instructions on how to use can be viewed by clicking the 'How to use?' " "link located just above the plot." msgstr "" +"After the plot is generated, you can use the mousewheel to zoom in and out " +"of the plot. In addition, panning feature is enabled to navigate through " +"the plot. You can zoom-in to a certail level of detail and use panning to " +"locate your area of interest. Clicking on a point opens a dialogue box, " +"displaying field values of the data row represented by the point. You can " +"edit the values if required and click on submit to issue an update query. " +"Basic instructions on how to use can be viewed by clicking the 'How to use?' " +"link located just above the plot." #. type: Content of: <html><body><div><h3> #: orig-docs/Documentation.html:4461 @@ -12716,7 +12776,7 @@ msgstr "Marc Delisle <marc_at_infomarc.info>" #: orig-docs/Documentation.html:4742 #, fuzzy msgid "multi-language version in December 1998" -msgstr "multi-language version" +msgstr "multi-language version in December 1998" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4743 @@ -13243,7 +13303,7 @@ msgstr "BLOBstreaming support" #: orig-docs/Documentation.html:4936 #, fuzzy msgid "Piotr Przybylski (Google Summer of Code 2008, 2010 and 2011)" -msgstr "Piotr Przybylski (Google Summer of Code 2008 and 2010)" +msgstr "Piotr Przybylski (Google Summer of Code 2008, 2010 and 2011)" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4938 @@ -13259,7 +13319,7 @@ msgstr "user preferences" #: orig-docs/Documentation.html:4940 #, fuzzy msgid "Drizzle support" -msgstr "Get support" +msgstr "Drizzle support" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4943 @@ -13375,18 +13435,19 @@ msgstr "Visual query builder" #: orig-docs/Documentation.html:4995 #, fuzzy msgid "Rouslan Placella (Google Summer of Code 2011)" -msgstr "Lori Lee (Google Summer of Code 2010)" +msgstr "Rouslan Placella (Google Summer of Code 2011)" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4997 +#, fuzzy msgid "Improved support for Stored Routines, Triggers and Events" -msgstr "" +msgstr "Improved support for Stored Routines, Triggers and Events" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4998 #, fuzzy msgid "Italian translation updates" -msgstr "Internal relation added" +msgstr "Italian translation updates" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:5004 @@ -13727,8 +13788,8 @@ msgid "" "different) table." msgstr "" "<a href=\"http://www.wikipedia.org/wiki/Foreign_key\">foreign key</a> - a " -"field or group of fields in a database record that point to a key field or " -"group of fields forming a key of another database record in some (usually " +"column or group of columns in a database row that point to a key column or " +"group of columns forming a key of another database row in some (usually " "different) table." #. type: Content of: <html><body><div><ul><li> @@ -14091,7 +14152,7 @@ msgid "" "tuple)</a> - represents a single, implicitly structured data item in a table." msgstr "" "<a href=\"http://www.wikipedia.org/wiki/Row_%28database%29\">Row (record, " -"tulpel)</a> - represents a single, implicitly structured data item in a " +"tuple)</a> - represents a single, implicitly structured data item in a " "table." #. type: Content of: <html><body><div><ul><li> @@ -14510,8 +14571,9 @@ msgstr "Download" #. type: Plain text #: orig-docs/README:60 +#, fuzzy msgid "You can get the newest version at http://www.phpmyadmin.net/." -msgstr "You can get the newest version at http://www.phpmyadmin.net/" +msgstr "You can get the newest version at http://www.phpmyadmin.net/." #. type: Title - #: orig-docs/README:62 diff --git a/po/es.po b/po/es.po index bc7a497..79c7823 100644 --- a/po/es.po +++ b/po/es.po @@ -4204,16 +4204,14 @@ msgstr "booleano $cfg['LeftFrameDBTree']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1529 -#, fuzzy msgid "" "Defines whether to display the names of databases (in the selector) using a " "tree, see also <a href=\"#cfg_LeftFrameDBSeparator\" class=\"configrule\">" "$cfg['LeftFrameDBSeparator']</a>." msgstr "" -"En el modo ligero, define si mostrar los nombres de las bases de datos (en " -"el selector) utilizando un árbol. Ver también <a href=" -"\"#cfg_LeftFrameDBSeparator\" class=\"configrule\">$cfg" -"['LeftFrameDBSeparator']</a>." +"Define si mostrar los nombres de las bases de datos (en el selector) " +"utilizando un árbol, ver también <a href=\"#cfg_LeftFrameDBSeparator\" " +"class=\"configrule\">$cfg['LeftFrameDBSeparator']</a>." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1534 diff --git a/po/ja.po b/po/ja.po index b25b83c..e98cc7e 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-22 13:49+0100\n" -"PO-Revision-Date: 2011-11-19 08:02+0200\n" +"PO-Revision-Date: 2011-11-23 12:13+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: Japan <jp(a)li.org>\n" "Language: ja\n" @@ -270,9 +270,7 @@ msgstr "データベース、テーブル、ビュー、カラム、インデッ #: orig-docs/Documentation.html:106 msgid "" "create, copy, drop, rename and alter databases, tables, columns and indexes" -msgstr "" -"データベース、テーブル、カラム、インデックスの作成・コピー・削除・リネーム・" -"定義の変更" +msgstr "データベース、テーブル、カラム、インデックスの作成・複製・削除・名称および定義の変更" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:108 @@ -2718,7 +2716,7 @@ msgstr "" #: orig-docs/Documentation.html:1036 msgid "" "and remember that the Variable in <i>config.inc.php</i> has been renamed from" -msgstr "また、忘れずに <i>config.inc.php</i> にある変数を" +msgstr "また、忘れずに <i>config.inc.php</i> にある変数名を" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1038 @@ -2726,8 +2724,8 @@ msgid "" "<tt>$cfg['Servers'][$i]['column_comments']</tt> to <tt>$cfg['Servers'][$i]" "['column_info']</tt>" msgstr "" -"<tt>$cfg['Servers'][$i]['column_comments']</tt> から <tt>$cfg['Servers'][$i]" -"['column_info']</tt> にリネームします。" +"<tt>$cfg['Servers'][$i]['column_comments']</tt> から " +"<tt>$cfg['Servers'][$i]['column_info']</tt> に変更します。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1044 @@ -4112,15 +4110,13 @@ msgstr "$cfg['LeftFrameDBTree'] 論理型" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1529 -#, fuzzy msgid "" "Defines whether to display the names of databases (in the selector) using a " "tree, see also <a href=\"#cfg_LeftFrameDBSeparator\" class=\"configrule\">" "$cfg['LeftFrameDBSeparator']</a>." msgstr "" -"軽快モードのときに（セレクターの）データベース名をツリー表示するかどうかを定" -"義します。<a href=\"#cfg_LeftFrameDBSeparator\" class=\"configrule\">$cfg" -"['LeftFrameDBSeparator']</a> もご覧ください。" +"(セレクターの) データベース名をツリー表示するかどうかを定義します。<a href=\"#cfg_LeftFrameDBSeparator\" " +"class=\"configrule\">$cfg['LeftFrameDBSeparator']</a> もご覧ください。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1534 @@ -5580,10 +5576,9 @@ msgid "" "right" are parsed as "top" and "bottom" with " "vertical display mode." msgstr "" -"テーブルの内容を表示しているとき、行のリンク（編集、コピー、削除）をどこに表" -"示するかを定義します（表示は、左側 (left)、右側 (right)、左右両側 (both)、な" -"し (none) が行えます）。「左 (left)」と「右 (right)」は、垂直表示モードでは" -"「上 (top)」と「下 (bottom)」と解釈されます。" +"テーブルの内容を表示しているとき、行のリンク (編集、複製、削除) をどこに表示するかを定義します (表示は、左側 (left)、右側 " +"(right)、左右両側 (both)、なし (none) が行えます)。「左 (left)」と「右 (right)」は、垂直表示モードでは「上 " +"(top)」と「下 (bottom)」と解釈されます。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2000 @@ -6239,9 +6234,8 @@ msgid "" "state. A value of <tt>'open'</tt> does the reverse. To completely disable " "all visual sliders, use <tt>'disabled'</tt>." msgstr "" -"<tt>「closed（閉じている）」</tt>に設定した場合、折り畳みは閉じた状態で表示さ" -"れます。<tt>「open（開いている）」</tt>はその逆です。全ての折り畳みを完全に無" -"効にするには、<tt>「disabled」</tt>にします。" +"<tt>「closed (閉じておく)」</tt>に設定した場合、折り畳みは閉じた状態で表示されます。<tt>「open " +"(開いておく)」</tt>はその逆です。全ての折り畳みを完全に無効にするには、<tt>「disabled (無効)」</tt>にします。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2265 @@ -9357,8 +9351,7 @@ msgid "" "<a href=\"#faq3_3\">3.3 With InnoDB tables, I lose foreign key relationships " "when I rename a table or a column.</a>" msgstr "" -"<a href=\"#faq3_3\">3.3 InnoDB テーブルでテーブルやカラムをリネームすると外部" -"キーのリレーションが切れます。</a>" +"<a href=\"#faq3_3\">3.3 InnoDB テーブルでテーブルやカラムの名称を変更すると外部キーのリレーションが切れます。</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3392 @@ -14360,7 +14353,7 @@ msgstr "phpMyAdmin 日本語ドキュメント" #. type: Content of: <html><body><p> #: output/ja/index-full-template.html:11 msgid "Documents translated to Japanese:" -msgstr "ドキュメントの日本語への翻訳:" +msgstr "日本語に翻訳されているドキュメント:" #. type: Content of: <html><body><ul><li> #: output/ja/index-full-template.html:13 diff --git a/po/tr.po b/po/tr.po index 294a4a6..8ca4c0f 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4177,16 +4177,14 @@ msgstr "$cfg['LeftFrameDBTree'] boolean" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1529 -#, fuzzy msgid "" "Defines whether to display the names of databases (in the selector) using a " "tree, see also <a href=\"#cfg_LeftFrameDBSeparator\" class=\"configrule\">" "$cfg['LeftFrameDBSeparator']</a>." msgstr "" -"Sade kipte ağaç görünümü kullanarak veritabanı adlarını (seçicide) " -"görüntülemek gerekirse tanımlar, aynı zamanda <a href=" -"\"#cfg_LeftFrameDBSeparator\" class=\"configrule\">$cfg" -"['LeftFrameDBSeparator']</a>'e bakın." +"Ağaç görünümü kullanarak veritabanı adlarını (seçicide) görüntülemek " +"gerekirse tanımlar, aynı zamanda <a href=\"#cfg_LeftFrameDBSeparator\" " +"class=\"configrule\">$cfg['LeftFrameDBSeparator']</a>'e bakın." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1534 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23434-g4ec5f18
by Michal Čihař 24 Nov '11

24 Nov '11

The branch, master has been updated via 4ec5f183b36993ea7a64b7cd28e24f9c7e58099e (commit) via 2dad6175daae521b1e9e6b3165f242f1bd0f4fc6 (commit) via f9b7a9fdc0bdbe4d22d900be30c2701e9c7e56ab (commit) via 8dbb1dc6e276a7d26640ea4951f0c70375e50a13 (commit) via 8050c1f936b4f8be6f9d095f0891f12c583975af (commit) via 85aae50b585afa85bc047460e3475f940553a82e (commit) via ac406d0e9f4aa2bd6ac89f69690ae30b81721c06 (commit) via e34e48e2b2087c861ff960558cb0d40497b89603 (commit) via 8db897c523880a70014faf7a128d872e059571d1 (commit) via c979a8bec6f441b3e182b3e551f547e7f69e012b (commit) via 3e5d16a0d9f0e46e1cd43c19267277553ae61df5 (commit) via 6b8af657dec310597a3f95aee7d57864d0d50a27 (commit) via 10a6e19994e4ee0c3e9a3514fdedca7d36846b08 (commit) via d10d4a56704397bf1c7cde2c32bb753c3993e509 (commit) via 16166ee2af7e4ddf12ec91710eb4a52da53c961f (commit) via 8919278be40d2e41dd35ee53af097f4fc25b7b4f (commit) via 6163785e3b725266443c2c7fd01dc1e45bc38aa3 (commit) via 2d397576568382515fddadde45086f9a9375f4bf (commit) via d6d5c4ef542ee9a59aba12e783dd7830fcd27fa2 (commit) via 718597a85b800a49d62d479e3ed7087d459d63ee (commit) via a93a83b0cbe4cfd02b68bcfdfd605e058785535f (commit) via 7c658b082f389a31225e50321b3f1312820051ac (commit) via b49d5c5cfaa02e9068e5940c57e61fdc35a4aeb0 (commit) via 30c22f5bc831395c88dec329ab7db6396fa5f029 (commit) via ea9f7815982c30dbc40ac78d5ed70e01d8693e4a (commit) via 553d75bca2722b1b2df25f17686fe919206565e1 (commit) via ecca421850f7bf67b49bfe50d9e02ee9a451a4c9 (commit) via 8c9c587b62d75a56434a04cf5c4012573d76506e (commit) via 7917db69c86dfc5d08484383bd5bc299c8ba3fc8 (commit) via 973588dc8dd8707f8d0b1503a286e7044039e2ca (commit) via e45ab3c2b80632919b0dd272f3a052e962e20596 (commit) via c86ef528c5a548003a3cdec9fc80c15ebdfd23b2 (commit) via c8883748b6b1d29585a2e8aa589197692ae55c77 (commit) via 0f0dd8eb4b7c0aebeab4cbc4db3c956cb6771903 (commit) via 955e557ba74697b2cf7859b98be0e0b543ff441e (commit) via 0226c1a6ff8eb6161b2433511f4d52467944a861 (commit) via 870fa0d1e12d8a0423b890b0cfaa870ab6e63ca0 (commit) via c8493f64232b8e78829bca16186c2b85eea3ef99 (commit) via 6cdb54a67fc85568f2efddb1ff992b4178c7348b (commit) via 8705ed6a2e74728c545cc58de1ed637abfcd7a9f (commit) via 2da16a694d886f24c19746e890b4e91f22cae41c (commit) via f1fe2dca98670f1f6774909cf967b514fb8618b7 (commit) via a537e1f0bdcd0c9834b0ded0a7ca6545ccd3c7f0 (commit) via cba73501603e0c92acf1699467cb708528dbf774 (commit) via 39e836d1e99e8ccbd1e850222da0b9d2434a6bf3 (commit) via d8947af1aa537d68c77c1f90537d3de44d20f98a (commit) via cc284b411a92096edc747276b4ea531eb970374c (commit) via c6ddcb7f161afd4cc225c86e64c550d1773bbd13 (commit) via 7463beb88464395b7b65cf3a6d051e292775a2e6 (commit) via 99269ae2ea113d07f30b75999171758c4df85d02 (commit) via 558f2e0854430e7484f316e09eff6d0c95d8e01a (commit) via 2cef3a3e0d3ad3e8c23ed379485497491d2e739b (commit) via 4d734823ae225a541a9eea8ed3802fb7e90a47e3 (commit) via 69b98b964c91060698798e908eaeef06a602fe4d (commit) via b9e84d806d9b511bab717d242bd242841bb16ed3 (commit) via 74465b40ef54f15cf94a2ccd4b51e61368d20b06 (commit) via 08b2af6364f8f5bd69dc9061dcf4dba8b72db972 (commit) via d51191ad51c4c6811c1193067f10046e2c7666df (commit) via bbacdeec2442d0f270b830d98829489d1d1ccb24 (commit) via 81796a642037053e702ab33752175cf06d7f2aa1 (commit) via ea457ef84b5ad2d0505c75ed77e0112b00f9b141 (commit) via fd3fcaf2cbb90a0c00411cc393d829953d4c627a (commit) via aa9f7bdf51fa30440564068935c6274556a80eb5 (commit) via 0fdd9eaa9379c5658164360c4c4c41371b0fd575 (commit) via 6d910f66a5235c4cfa611686defaa3081dd17945 (commit) via 4e75c7165b6edd51f84bde9e20a17eda5705552f (commit) via 6827a6da42ef19b60dbd8379a058bd3b0e5b2dd8 (commit) via c0b63bd9e93eaa472b04c53d10fc1fdf1ebda806 (commit) via efe1270e76668864b22315b67740ebcf2618dd6c (commit) via cd0fb1bcd1ae813fdb608663114342f7234d9136 (commit) via a8ff530df201002567a6c682c92e43b820e46afb (commit) via 508d1b4800fa911aba2bfdcdfb3ad213a1439b02 (commit) via a2198b1619a78bc825b8509e12f53573b1d7a1b0 (commit) via a107b18271fc6493b72d0b7c2091aae54f8509e4 (commit) via df8d8ccf12229d94cfd34878c65893d34320f50f (commit) via 77ccc3941e4c5e0d4aa4e15017d54eb31969ffee (commit) via 27715276610801b06da3da4aa40973171120b8b4 (commit) via 74064b609711679d6a166c9ab9b441c4e273e42c (commit) via 78100f40b9f2392f85690f54b7a2d41a55126a49 (commit) via 5fdf94489673bf48027fc23527979b05a5f7de3f (commit) via 29f18b37cefa3b777b140f5ac0276c90249dfc2b (commit) via af8428489414615a7657fe7df2b38ef1576cc26b (commit) via a6dc36080ccaee8b7db53f6b9063b09687be00ec (commit) via 5eaa12c979fbb7af63560c6ced25f27c048eeba7 (commit) via ca6d213f596d6139f5883ad17429a5aa96ecf999 (commit) via cd5a32c104274d018c15cdf61b65249aa909bdc5 (commit) via 5416eb4853e1f661a75b30499216bf33c4ca6b7b (commit) via 5e8c42a9bd25ba9aca276fb098284ec4c1c7a203 (commit) via f801a2d8dc93201bb2605d8f2e4938206b93db36 (commit) via bfab8adfde5ab2b63bfc97ebe050010f37f43837 (commit) via d41fd2c5789c3604a9731247b6cbf12530c9fe4c (commit) via 9441750723672d8b2a9c1da995355bafae2679c9 (commit) via 65e99a4746a3a75a00a97eebceaf4ee2c31d729f (commit) via a5e3c85a616a06996c2f1f81cc7227a72bf05f45 (commit) via e31748fd0d3f69820fca3b6fc88fcc9b6b7ddda8 (commit) via e358d5f5dd780999255ac8ecf05858ec62c64a2e (commit) via 1d3ba2cbbd61dd09f5672335bf9e634b224645e8 (commit) via 48382684aea9d30949bc78b5f222766627e8f70c (commit) via e60925ba058057888207fe259aecdc49178f0435 (commit) via a66389083e83c2ea47d80907a97e7146d1309695 (commit) via 0b11dcf426ed4f9efc5f1ea803f613b19749cc37 (commit) via 7ff761adf080db837921cb7e94c7a83e8b76c7a9 (commit) via 16d2e0ceeea7f2bd90b7c6b7eb19fda06e8d0c83 (commit) via 24594b3550e7ea0a6fc7c7cd6072908535dcdd39 (commit) via 3b8a4b274c1f3139a902b8cc2470c795553e4d06 (commit) via 138a438352113d23a014d0b1cb45f5ce388b8485 (commit) via af5f26b1b75801b497e8865ca31951cd5be29294 (commit) via 3b8f970c399e1f2c41149e1c8b31f6ef1f952993 (commit) via 237459de3e719b3a2e62fc51da5154c3d147cb89 (commit) via cf29ce5746d8497e4cb163e5924df2a902d78d59 (commit) via b2df3b7fb037c72190a977b1cc2b74f75b9ea631 (commit) via ea0626f96877d65f09a94833772ac9b013137be8 (commit) via 3646113f7f900e7aca8c9222a9e3b9cfc5021b6a (commit) via fd1569c683847a6bdcaf29e38aa50cd3a41fff6f (commit) via 7eceee57707def951d3b020d46e4705424d65100 (commit) via 9eb69372323f36437aee808ff6510d71efb76d1c (commit) via aac10bf7ec1f7a93d5a3d3437373948fedbe928e (commit) via 6af64a2e4d85dfbca4b7d337c73819ce59e7e5f3 (commit) via 1f580b4a34c8c5a65561e112f6c7356a66503178 (commit) via 959a73bd977f72b5c1a8952623388ac7a88f14d3 (commit) via 507f8984f5de67e8e8b60df5490b91819f453d2c (commit) via 24e69832fd718dc560d3388fa907ed9e4fe9d398 (commit) via ece828379911bcbe2dd3c9a35876baa88917a6f2 (commit) via 4eb8d90f709affd97cb64747801fd14cdb64fecc (commit) via 0c2b19b7b7d88e2a414222e3a2e42af154092656 (commit) via e990ae0bd2a4796410942b84b3b356d163e0ac62 (commit) via 22e47657921929b25dc6b68324298e6fe6144690 (commit) via 702af48772ffb0a767f8f363f6e3985f12f883d5 (commit) via a42c9cdfb4d75accef432a7afa5e07d2df96b6e4 (commit) via 01fab6f78b5e24dd1df1b9264a89bbfe201294da (commit) via bd941c9d77f2a5d9b0a38f92a292346bf6cf8216 (commit) via 3afafb7ffc05a21158a24bfc4266e1f7f9264b16 (commit) via 333d20a48a8135dde1ecddff7ef1e83973598e71 (commit) via acc78cdd1e5c25ae2c98cd2a18b7f4cad109e494 (commit) via 069059de7ad5b75d5ce4d781a3c5056d57826672 (commit) via b4434261c5e3493bd747a3184109f6ac509ac09d (commit) via abafe406edd621f30788e8cf7055345c486f3c78 (commit) via 8a80dfd2a220c6876a549fe5deeae8ddca72273e (commit) via 83eebc7f8ee9c237435fdbd9eb8723b48c57e183 (commit) via b6a4d02f9b2f822462221377873f8926a90dae9f (commit) via f8b0a1ccf48cc73aecff4f069cbdc64de54b5b83 (commit) via 1d038fdcda024f8a6164c61380b7b6eaef41a573 (commit) via 80e91ca886ff97661042382617e6847a5e38d00d (commit) via a3321f0105fa94e54cdbf463779cf2b98ca6850e (commit) via 14839d866472adc123d3d06202489b29b8ea866d (commit) via 46674b4e72ea90c2fd41f086cf4cc4f77ded61b4 (commit) via 926857bfd8b9aa102a0cdb0f8439eff088761cb9 (commit) via a367395d0d61873f5a09b2adaa0032c63b071985 (commit) via adeee7801037cf492913e0185880ea9852b468a5 (commit) via 56ca17fb91844cf872ca68dad7cd027ef895fe79 (commit) via 2dac5dbae0acaa5df1e24569839d25517fed4b4f (commit) from 6be4f840ed0783b1e48a94e62ea477fbc36cc653 (commit) - Log ----------------------------------------------------------------- commit 4ec5f183b36993ea7a64b7cd28e24f9c7e58099e Author: Michal Čihař <michal(a)cihar.com> Date: Thu Nov 24 08:28:57 2011 +0100 Fix format string commit 2dad6175daae521b1e9e6b3165f242f1bd0f4fc6 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 04:01:14 2011 +0200 Translation update done using Pootle. commit f9b7a9fdc0bdbe4d22d900be30c2701e9c7e56ab Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Nov 24 03:59:15 2011 +0200 Translation update done using Pootle. commit 8dbb1dc6e276a7d26640ea4951f0c70375e50a13 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:52:14 2011 +0200 Translation update done using Pootle. commit 8050c1f936b4f8be6f9d095f0891f12c583975af Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:16:24 2011 +0200 Translation update done using Pootle. commit 85aae50b585afa85bc047460e3475f940553a82e Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:09:57 2011 +0200 Translation update done using Pootle. commit ac406d0e9f4aa2bd6ac89f69690ae30b81721c06 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:09:50 2011 +0200 Translation update done using Pootle. commit e34e48e2b2087c861ff960558cb0d40497b89603 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:09:45 2011 +0200 Translation update done using Pootle. commit 8db897c523880a70014faf7a128d872e059571d1 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:09:35 2011 +0200 Translation update done using Pootle. commit c979a8bec6f441b3e182b3e551f547e7f69e012b Author: Pootle server <noreply(a)l10n.cihar.com> Date: Thu Nov 24 03:08:58 2011 +0200 Translation update done using Pootle. commit 3e5d16a0d9f0e46e1cd43c19267277553ae61df5 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:08:40 2011 +0200 Translation update done using Pootle. commit 6b8af657dec310597a3f95aee7d57864d0d50a27 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:08:37 2011 +0200 Translation update done using Pootle. commit 10a6e19994e4ee0c3e9a3514fdedca7d36846b08 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:08:30 2011 +0200 Translation update done using Pootle. commit d10d4a56704397bf1c7cde2c32bb753c3993e509 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:08:12 2011 +0200 Translation update done using Pootle. commit 16166ee2af7e4ddf12ec91710eb4a52da53c961f Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:08:09 2011 +0200 Translation update done using Pootle. commit 8919278be40d2e41dd35ee53af097f4fc25b7b4f Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:08:00 2011 +0200 Translation update done using Pootle. commit 6163785e3b725266443c2c7fd01dc1e45bc38aa3 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:07:44 2011 +0200 Translation update done using Pootle. commit 2d397576568382515fddadde45086f9a9375f4bf Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:07:17 2011 +0200 Translation update done using Pootle. commit d6d5c4ef542ee9a59aba12e783dd7830fcd27fa2 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:07:14 2011 +0200 Translation update done using Pootle. commit 718597a85b800a49d62d479e3ed7087d459d63ee Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:07:11 2011 +0200 Translation update done using Pootle. commit a93a83b0cbe4cfd02b68bcfdfd605e058785535f Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:06:56 2011 +0200 Translation update done using Pootle. commit 7c658b082f389a31225e50321b3f1312820051ac Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:06:54 2011 +0200 Translation update done using Pootle. commit b49d5c5cfaa02e9068e5940c57e61fdc35a4aeb0 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:06:51 2011 +0200 Translation update done using Pootle. commit 30c22f5bc831395c88dec329ab7db6396fa5f029 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:06:48 2011 +0200 Translation update done using Pootle. commit ea9f7815982c30dbc40ac78d5ed70e01d8693e4a Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:06:30 2011 +0200 Translation update done using Pootle. commit 553d75bca2722b1b2df25f17686fe919206565e1 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:06:25 2011 +0200 Translation update done using Pootle. commit ecca421850f7bf67b49bfe50d9e02ee9a451a4c9 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:06:21 2011 +0200 Translation update done using Pootle. commit 8c9c587b62d75a56434a04cf5c4012573d76506e Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:06:17 2011 +0200 Translation update done using Pootle. commit 7917db69c86dfc5d08484383bd5bc299c8ba3fc8 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:06:12 2011 +0200 Translation update done using Pootle. commit 973588dc8dd8707f8d0b1503a286e7044039e2ca Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:06:09 2011 +0200 Translation update done using Pootle. commit e45ab3c2b80632919b0dd272f3a052e962e20596 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:06:06 2011 +0200 Translation update done using Pootle. commit c86ef528c5a548003a3cdec9fc80c15ebdfd23b2 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:06:03 2011 +0200 Translation update done using Pootle. commit c8883748b6b1d29585a2e8aa589197692ae55c77 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:06:00 2011 +0200 Translation update done using Pootle. commit 0f0dd8eb4b7c0aebeab4cbc4db3c956cb6771903 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:05:57 2011 +0200 Translation update done using Pootle. commit 955e557ba74697b2cf7859b98be0e0b543ff441e Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:05:50 2011 +0200 Translation update done using Pootle. commit 0226c1a6ff8eb6161b2433511f4d52467944a861 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:05:48 2011 +0200 Translation update done using Pootle. commit 870fa0d1e12d8a0423b890b0cfaa870ab6e63ca0 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:05:45 2011 +0200 Translation update done using Pootle. commit c8493f64232b8e78829bca16186c2b85eea3ef99 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:05:41 2011 +0200 Translation update done using Pootle. commit 6cdb54a67fc85568f2efddb1ff992b4178c7348b Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:05:37 2011 +0200 Translation update done using Pootle. commit 8705ed6a2e74728c545cc58de1ed637abfcd7a9f Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:05:34 2011 +0200 Translation update done using Pootle. commit 2da16a694d886f24c19746e890b4e91f22cae41c Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:05:25 2011 +0200 Translation update done using Pootle. commit f1fe2dca98670f1f6774909cf967b514fb8618b7 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:05:22 2011 +0200 Translation update done using Pootle. commit a537e1f0bdcd0c9834b0ded0a7ca6545ccd3c7f0 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:05:20 2011 +0200 Translation update done using Pootle. commit cba73501603e0c92acf1699467cb708528dbf774 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:05:17 2011 +0200 Translation update done using Pootle. commit 39e836d1e99e8ccbd1e850222da0b9d2434a6bf3 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:05:05 2011 +0200 Translation update done using Pootle. commit d8947af1aa537d68c77c1f90537d3de44d20f98a Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:05:02 2011 +0200 Translation update done using Pootle. commit cc284b411a92096edc747276b4ea531eb970374c Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:05:00 2011 +0200 Translation update done using Pootle. commit c6ddcb7f161afd4cc225c86e64c550d1773bbd13 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:04:56 2011 +0200 Translation update done using Pootle. commit 7463beb88464395b7b65cf3a6d051e292775a2e6 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:04:53 2011 +0200 Translation update done using Pootle. commit 99269ae2ea113d07f30b75999171758c4df85d02 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:04:50 2011 +0200 Translation update done using Pootle. commit 558f2e0854430e7484f316e09eff6d0c95d8e01a Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:04:48 2011 +0200 Translation update done using Pootle. commit 2cef3a3e0d3ad3e8c23ed379485497491d2e739b Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:04:44 2011 +0200 Translation update done using Pootle. commit 4d734823ae225a541a9eea8ed3802fb7e90a47e3 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:04:36 2011 +0200 Translation update done using Pootle. commit 69b98b964c91060698798e908eaeef06a602fe4d Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:04:34 2011 +0200 Translation update done using Pootle. commit b9e84d806d9b511bab717d242bd242841bb16ed3 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:04:31 2011 +0200 Translation update done using Pootle. commit 74465b40ef54f15cf94a2ccd4b51e61368d20b06 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:04:28 2011 +0200 Translation update done using Pootle. commit 08b2af6364f8f5bd69dc9061dcf4dba8b72db972 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:04:25 2011 +0200 Translation update done using Pootle. commit d51191ad51c4c6811c1193067f10046e2c7666df Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:04:22 2011 +0200 Translation update done using Pootle. commit bbacdeec2442d0f270b830d98829489d1d1ccb24 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:04:18 2011 +0200 Translation update done using Pootle. commit 81796a642037053e702ab33752175cf06d7f2aa1 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:04:16 2011 +0200 Translation update done using Pootle. commit ea457ef84b5ad2d0505c75ed77e0112b00f9b141 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:04:13 2011 +0200 Translation update done using Pootle. commit fd3fcaf2cbb90a0c00411cc393d829953d4c627a Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:04:08 2011 +0200 Translation update done using Pootle. commit aa9f7bdf51fa30440564068935c6274556a80eb5 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:04:06 2011 +0200 Translation update done using Pootle. commit 0fdd9eaa9379c5658164360c4c4c41371b0fd575 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:03:58 2011 +0200 Translation update done using Pootle. commit 6d910f66a5235c4cfa611686defaa3081dd17945 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:03:55 2011 +0200 Translation update done using Pootle. commit 4e75c7165b6edd51f84bde9e20a17eda5705552f Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:03:51 2011 +0200 Translation update done using Pootle. commit 6827a6da42ef19b60dbd8379a058bd3b0e5b2dd8 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:03:41 2011 +0200 Translation update done using Pootle. commit c0b63bd9e93eaa472b04c53d10fc1fdf1ebda806 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:03:26 2011 +0200 Translation update done using Pootle. commit efe1270e76668864b22315b67740ebcf2618dd6c Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:03:23 2011 +0200 Translation update done using Pootle. commit cd0fb1bcd1ae813fdb608663114342f7234d9136 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:03:20 2011 +0200 Translation update done using Pootle. commit a8ff530df201002567a6c682c92e43b820e46afb Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:03:16 2011 +0200 Translation update done using Pootle. commit 508d1b4800fa911aba2bfdcdfb3ad213a1439b02 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:03:13 2011 +0200 Translation update done using Pootle. commit a2198b1619a78bc825b8509e12f53573b1d7a1b0 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:03:10 2011 +0200 Translation update done using Pootle. commit a107b18271fc6493b72d0b7c2091aae54f8509e4 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:03:05 2011 +0200 Translation update done using Pootle. commit df8d8ccf12229d94cfd34878c65893d34320f50f Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:02:51 2011 +0200 Translation update done using Pootle. commit 77ccc3941e4c5e0d4aa4e15017d54eb31969ffee Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:02:48 2011 +0200 Translation update done using Pootle. commit 27715276610801b06da3da4aa40973171120b8b4 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:02:45 2011 +0200 Translation update done using Pootle. commit 74064b609711679d6a166c9ab9b441c4e273e42c Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:02:40 2011 +0200 Translation update done using Pootle. commit 78100f40b9f2392f85690f54b7a2d41a55126a49 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:02:30 2011 +0200 Translation update done using Pootle. commit 5fdf94489673bf48027fc23527979b05a5f7de3f Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:01:38 2011 +0200 Translation update done using Pootle. commit 29f18b37cefa3b777b140f5ac0276c90249dfc2b Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:01:29 2011 +0200 Translation update done using Pootle. commit af8428489414615a7657fe7df2b38ef1576cc26b Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:01:07 2011 +0200 Translation update done using Pootle. commit a6dc36080ccaee8b7db53f6b9063b09687be00ec Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:01:02 2011 +0200 Translation update done using Pootle. commit 5eaa12c979fbb7af63560c6ced25f27c048eeba7 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:00:59 2011 +0200 Translation update done using Pootle. commit ca6d213f596d6139f5883ad17429a5aa96ecf999 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:00:35 2011 +0200 Translation update done using Pootle. commit cd5a32c104274d018c15cdf61b65249aa909bdc5 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:00:19 2011 +0200 Translation update done using Pootle. commit 5416eb4853e1f661a75b30499216bf33c4ca6b7b Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:00:15 2011 +0200 Translation update done using Pootle. commit 5e8c42a9bd25ba9aca276fb098284ec4c1c7a203 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 03:00:04 2011 +0200 Translation update done using Pootle. commit f801a2d8dc93201bb2605d8f2e4938206b93db36 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:59:52 2011 +0200 Translation update done using Pootle. commit bfab8adfde5ab2b63bfc97ebe050010f37f43837 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:59:48 2011 +0200 Translation update done using Pootle. commit d41fd2c5789c3604a9731247b6cbf12530c9fe4c Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:59:41 2011 +0200 Translation update done using Pootle. commit 9441750723672d8b2a9c1da995355bafae2679c9 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:59:29 2011 +0200 Translation update done using Pootle. commit 65e99a4746a3a75a00a97eebceaf4ee2c31d729f Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:59:25 2011 +0200 Translation update done using Pootle. commit a5e3c85a616a06996c2f1f81cc7227a72bf05f45 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:59:17 2011 +0200 Translation update done using Pootle. commit e31748fd0d3f69820fca3b6fc88fcc9b6b7ddda8 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:59:12 2011 +0200 Translation update done using Pootle. commit e358d5f5dd780999255ac8ecf05858ec62c64a2e Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:59:04 2011 +0200 Translation update done using Pootle. commit 1d3ba2cbbd61dd09f5672335bf9e634b224645e8 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:59:00 2011 +0200 Translation update done using Pootle. commit 48382684aea9d30949bc78b5f222766627e8f70c Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:58:53 2011 +0200 Translation update done using Pootle. commit e60925ba058057888207fe259aecdc49178f0435 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:58:33 2011 +0200 Translation update done using Pootle. commit a66389083e83c2ea47d80907a97e7146d1309695 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:58:27 2011 +0200 Translation update done using Pootle. commit 0b11dcf426ed4f9efc5f1ea803f613b19749cc37 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:58:22 2011 +0200 Translation update done using Pootle. commit 7ff761adf080db837921cb7e94c7a83e8b76c7a9 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:58:17 2011 +0200 Translation update done using Pootle. commit 16d2e0ceeea7f2bd90b7c6b7eb19fda06e8d0c83 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:58:04 2011 +0200 Translation update done using Pootle. commit 24594b3550e7ea0a6fc7c7cd6072908535dcdd39 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:58:00 2011 +0200 Translation update done using Pootle. commit 3b8a4b274c1f3139a902b8cc2470c795553e4d06 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:57:56 2011 +0200 Translation update done using Pootle. commit 138a438352113d23a014d0b1cb45f5ce388b8485 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:57:50 2011 +0200 Translation update done using Pootle. commit af5f26b1b75801b497e8865ca31951cd5be29294 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:57:35 2011 +0200 Translation update done using Pootle. commit 3b8f970c399e1f2c41149e1c8b31f6ef1f952993 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:55:49 2011 +0200 Translation update done using Pootle. commit 237459de3e719b3a2e62fc51da5154c3d147cb89 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:55:16 2011 +0200 Translation update done using Pootle. commit cf29ce5746d8497e4cb163e5924df2a902d78d59 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:55:11 2011 +0200 Translation update done using Pootle. commit b2df3b7fb037c72190a977b1cc2b74f75b9ea631 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:55:05 2011 +0200 Translation update done using Pootle. commit ea0626f96877d65f09a94833772ac9b013137be8 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:55:01 2011 +0200 Translation update done using Pootle. commit 3646113f7f900e7aca8c9222a9e3b9cfc5021b6a Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:54:57 2011 +0200 Translation update done using Pootle. commit fd1569c683847a6bdcaf29e38aa50cd3a41fff6f Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:54:50 2011 +0200 Translation update done using Pootle. commit 7eceee57707def951d3b020d46e4705424d65100 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:54:43 2011 +0200 Translation update done using Pootle. commit 9eb69372323f36437aee808ff6510d71efb76d1c Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:54:35 2011 +0200 Translation update done using Pootle. commit aac10bf7ec1f7a93d5a3d3437373948fedbe928e Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:54:26 2011 +0200 Translation update done using Pootle. commit 6af64a2e4d85dfbca4b7d337c73819ce59e7e5f3 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:54:18 2011 +0200 Translation update done using Pootle. commit 1f580b4a34c8c5a65561e112f6c7356a66503178 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:54:12 2011 +0200 Translation update done using Pootle. commit 959a73bd977f72b5c1a8952623388ac7a88f14d3 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:54:06 2011 +0200 Translation update done using Pootle. commit 507f8984f5de67e8e8b60df5490b91819f453d2c Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:54:00 2011 +0200 Translation update done using Pootle. commit 24e69832fd718dc560d3388fa907ed9e4fe9d398 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:53:52 2011 +0200 Translation update done using Pootle. commit ece828379911bcbe2dd3c9a35876baa88917a6f2 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:53:44 2011 +0200 Translation update done using Pootle. commit 4eb8d90f709affd97cb64747801fd14cdb64fecc Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:53:39 2011 +0200 Translation update done using Pootle. commit 0c2b19b7b7d88e2a414222e3a2e42af154092656 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:53:17 2011 +0200 Translation update done using Pootle. commit e990ae0bd2a4796410942b84b3b356d163e0ac62 Author: dannybeckett <daniel.beckett(a)gmail.com> Date: Thu Nov 24 02:53:04 2011 +0200 Translation update done using Pootle. commit 22e47657921929b25dc6b68324298e6fe6144690 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Thu Nov 24 02:52:55 2011 +0200 Translation update done using Pootle. commit 702af48772ffb0a767f8f363f6e3985f12f883d5 Merge: a42c9cd 6be4f84 Author: Pootle server <pootle(a)cihar.com> Date: Thu Nov 24 00:40:16 2011 +0100 Merge remote-tracking branch 'origin/master' commit a42c9cdfb4d75accef432a7afa5e07d2df96b6e4 Author: ProUser <stefan(a)inkopsforum.se> Date: Thu Nov 24 01:21:49 2011 +0200 Translation update done using Pootle. commit 01fab6f78b5e24dd1df1b9264a89bbfe201294da Author: ProUser <stefan(a)inkopsforum.se> Date: Thu Nov 24 01:21:30 2011 +0200 Translation update done using Pootle. commit bd941c9d77f2a5d9b0a38f92a292346bf6cf8216 Author: ProUser <stefan(a)inkopsforum.se> Date: Thu Nov 24 01:20:52 2011 +0200 Translation update done using Pootle. commit 3afafb7ffc05a21158a24bfc4266e1f7f9264b16 Author: ProUser <stefan(a)inkopsforum.se> Date: Thu Nov 24 01:19:47 2011 +0200 Translation update done using Pootle. commit 333d20a48a8135dde1ecddff7ef1e83973598e71 Author: ProUser <stefan(a)inkopsforum.se> Date: Thu Nov 24 01:18:07 2011 +0200 Translation update done using Pootle. commit acc78cdd1e5c25ae2c98cd2a18b7f4cad109e494 Author: ProUser <stefan(a)inkopsforum.se> Date: Thu Nov 24 01:17:50 2011 +0200 Translation update done using Pootle. commit 069059de7ad5b75d5ce4d781a3c5056d57826672 Merge: b443426 4dda62d Author: Pootle server <pootle(a)cihar.com> Date: Wed Nov 23 22:43:13 2011 +0100 Merge remote-tracking branch 'origin/master' commit b4434261c5e3493bd747a3184109f6ac509ac09d Merge: abafe40 a6dc747 Author: Pootle server <pootle(a)cihar.com> Date: Wed Nov 23 20:40:14 2011 +0100 Merge remote-tracking branch 'origin/master' commit abafe406edd621f30788e8cf7055345c486f3c78 Merge: 8a80dfd dab7a58 Author: Pootle server <pootle(a)cihar.com> Date: Wed Nov 23 18:40:08 2011 +0100 Merge remote-tracking branch 'origin/master' commit 8a80dfd2a220c6876a549fe5deeae8ddca72273e Author: any anonymous user <> Date: Wed Nov 23 17:58:50 2011 +0200 Translation update done using Pootle. commit 83eebc7f8ee9c237435fdbd9eb8723b48c57e183 Author: stoyan <stoyanster(a)gmail.com> Date: Wed Nov 23 17:58:49 2011 +0200 Translation update done using Pootle. commit b6a4d02f9b2f822462221377873f8926a90dae9f Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Nov 23 17:16:49 2011 +0200 Translation update done using Pootle. commit f8b0a1ccf48cc73aecff4f069cbdc64de54b5b83 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Nov 23 17:16:37 2011 +0200 Translation update done using Pootle. commit 1d038fdcda024f8a6164c61380b7b6eaef41a573 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Nov 23 17:15:42 2011 +0200 Translation update done using Pootle. commit 80e91ca886ff97661042382617e6847a5e38d00d Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Nov 23 17:14:32 2011 +0200 Translation update done using Pootle. commit a3321f0105fa94e54cdbf463779cf2b98ca6850e Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Nov 23 17:13:45 2011 +0200 Translation update done using Pootle. commit 14839d866472adc123d3d06202489b29b8ea866d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Nov 23 12:22:35 2011 +0200 Translation update done using Pootle. commit 46674b4e72ea90c2fd41f086cf4cc4f77ded61b4 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Nov 23 12:22:17 2011 +0200 Translation update done using Pootle. commit 926857bfd8b9aa102a0cdb0f8439eff088761cb9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Nov 23 12:21:32 2011 +0200 Translation update done using Pootle. commit a367395d0d61873f5a09b2adaa0032c63b071985 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Nov 23 12:21:06 2011 +0200 Translation update done using Pootle. commit adeee7801037cf492913e0185880ea9852b468a5 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Nov 23 12:20:29 2011 +0200 Translation update done using Pootle. commit 56ca17fb91844cf872ca68dad7cd027ef895fe79 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Nov 23 12:19:52 2011 +0200 Translation update done using Pootle. commit 2dac5dbae0acaa5df1e24569839d25517fed4b4f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Nov 23 12:19:37 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/bg.po | 6 +- po/en_GB.po | 428 +++++++++++++++++++++++++++++++++++++++------------------- po/fr.po | 21 +-- po/ja.po | 25 +++-- po/nl.po | 12 +- po/sv.po | 21 +-- 6 files changed, 328 insertions(+), 185 deletions(-) diff --git a/po/bg.po b/po/bg.po index 2258f57..ebcdf6d 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-20 15:13+0100\n" -"PO-Revision-Date: 2011-11-06 19:30+0200\n" -"Last-Translator: stoyan <stoyanster(a)gmail.com>\n" +"PO-Revision-Date: 2011-11-23 17:58+0200\n" +"Last-Translator: any anonymous user <>\n" "Language-Team: bulgarian <bg(a)li.org>\n" "Language: bg\n" "MIME-Version: 1.0\n" @@ -1117,7 +1117,7 @@ msgstr "Редактиране" #, fuzzy, php-format #| msgid "Add %s column(s)" msgid "Add %d column(s) to index" -msgstr "Добавяне %s колона(и)" +msgstr "Добавяне %d колона(и) към индекс" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:52 diff --git a/po/en_GB.po b/po/en_GB.po index f169516..b0648b9 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-20 15:13+0100\n" -"PO-Revision-Date: 2011-11-14 18:03+0200\n" -"Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n" +"PO-Revision-Date: 2011-11-24 03:52+0200\n" +"Last-Translator: dannybeckett <daniel.beckett(a)gmail.com>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" @@ -583,8 +583,9 @@ msgid "Inside column:" msgstr "Inside column:" #: db_structure.php:67 +#, fuzzy msgid "No tables found in database" -msgstr "No tables found in database." +msgstr "No tables found in database" #: db_structure.php:314 tbl_operations.php:692 #, php-format @@ -1096,22 +1097,20 @@ msgid "This is not a number!" msgstr "This is not a number!" #: js/messages.php:46 -#, fuzzy #| msgid "Add index" msgid "Add Index" -msgstr "Add index" +msgstr "Add Index" #: js/messages.php:47 -#, fuzzy #| msgid "Edit mode" msgid "Edit Index" -msgstr "Edit mode" +msgstr "Edit Index" #: js/messages.php:48 tbl_indexes.php:286 -#, fuzzy, php-format +#, php-format #| msgid "Add %s column(s)" msgid "Add %d column(s) to index" -msgstr "Add %s column(s)" +msgstr "Add %d column(s) to index" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:52 @@ -1731,10 +1730,10 @@ msgid "The definition of a stored function must contain a RETURN statement!" msgstr "The definition of a stored function must contain a RETURN statement!" #: js/messages.php:249 -#, fuzzy, php-format +#, php-format #| msgid "+ Add a value" msgid "Add %d value(s)" -msgstr "+ Add a value" +msgstr "Add %d value(s)" #: js/messages.php:252 msgid "" @@ -1825,16 +1824,14 @@ msgid "Select two different columns" msgstr "Select two different columns" #: js/messages.php:290 -#, fuzzy #| msgid "Query results operations" msgid "Query results" -msgstr "Query results operations" +msgstr "Query results" #: js/messages.php:291 -#, fuzzy #| msgid "Data pointer size" msgid "Data point content" -msgstr "Data pointer size" +msgstr "Data point content" #: js/messages.php:294 tbl_change.php:312 tbl_indexes.php:221 #: tbl_indexes.php:248 @@ -3254,24 +3251,26 @@ msgid "" "Defines the minimum size for input fields generated for CHAR and VARCHAR " "columns" msgstr "" +"Defines the minimum size for input fields generated for CHAR and VARCHAR " +"columns" #: libraries/config/messages.inc.php:35 -#, fuzzy #| msgid "Customize text input fields" msgid "Minimum size for input field" -msgstr "Customise text input fields" +msgstr "Minimum size for input field" #: libraries/config/messages.inc.php:36 msgid "" "Defines the maximum size for input fields generated for CHAR and VARCHAR " "columns" msgstr "" +"Defines the maximum size for input fields generated for CHAR and VARCHAR " +"columns" #: libraries/config/messages.inc.php:37 -#, fuzzy #| msgid "Maximum size for temporary sort files" msgid "Maximum size for input field" -msgstr "Maximum size for temporary sort files" +msgstr "Maximum size for input field" #: libraries/config/messages.inc.php:38 msgid "Number of columns for CHAR/VARCHAR textareas" @@ -4581,12 +4580,13 @@ msgid "" "An alternate host to hold the configuration storage; leave blank to use the " "already defined host" msgstr "" +"An alternate host to hold the configuration storage; leave blank to use the " +"already defined host" #: libraries/config/messages.inc.php:386 -#, fuzzy #| msgid "Control user" msgid "Control host" -msgstr "Control user" +msgstr "Control host" #: libraries/config/messages.inc.php:387 msgid "Count tables when showing database list" @@ -5389,22 +5389,22 @@ msgid "possible deep recursion attack" msgstr "possible deep recursion attack" #: libraries/database_interface.lib.php:1765 -#, fuzzy #| msgid "(or the local MySQL server's socket is not correctly configured)" msgid "" "The server is not responding (or the local server's socket is not correctly " "configured)." -msgstr "(or the local MySQL server's socket is not correctly configured)" +msgstr "" +"The server is not responding (or the local server's socket is not correctly " +"configured)." #: libraries/database_interface.lib.php:1768 -#, fuzzy #| msgid "The server is not responding" msgid "The server is not responding." -msgstr "The server is not responding" +msgstr "The server is not responding." #: libraries/database_interface.lib.php:1772 msgid "Please check privileges of directory containing database." -msgstr "" +msgstr "Please check privileges of directory containing database." #: libraries/database_interface.lib.php:1780 msgid "Details..." @@ -6501,10 +6501,9 @@ msgstr "" "and server version)</i>" #: libraries/export/sql.php:45 +#, fuzzy msgid "Additional custom header comment (\\n splits lines):" -msgstr "" -"Additional custom header comment (\n" -" splits lines):" +msgstr "Additional custom header comment (\\n splits lines):" #: libraries/export/sql.php:50 msgid "" @@ -7525,8 +7524,9 @@ msgid "You must provide a name and a type for each routine parameter." msgstr "You must provide a name and a type for each routine parameter." #: libraries/rte/rte_routines.lib.php:1076 +#, fuzzy msgid "You must provide a valid return type for the routine." -msgstr "You must provide a valid return type for the routine.." +msgstr "You must provide a valid return type for the routine." #: libraries/rte/rte_routines.lib.php:1120 msgid "You must provide a routine definition." @@ -7838,10 +7838,9 @@ msgid "Current Server" msgstr "Current server" #: libraries/server_links.inc.php:60 -#, fuzzy #| msgid "User" msgid "Users" -msgstr "User" +msgstr "Users" #: libraries/server_links.inc.php:79 server_synchronize.php:1154 #: server_synchronize.php:1162 @@ -9170,10 +9169,9 @@ msgid "Any" msgstr "Any" #: server_privileges.php:1561 -#, fuzzy #| msgid "User overview" msgid "Users overview" -msgstr "User overview" +msgstr "Users overview" #: server_privileges.php:1701 server_privileges.php:1895 #: server_privileges.php:2253 @@ -10451,12 +10449,10 @@ msgid "" "increases server load by up to 15%" msgstr "" "The phpMyAdmin Monitor can assist you in optimising the server configuration " -"and track down time intensive\n" -" queries. For the latter you will need to set log_output to 'TABLE' " -"and have either the slow_query_log or general_log enabled. Note however, " -"that the\n" -" general_log produces a lot of data and increases server load by up " -"to 15%" +"and track down time intensive queries. For the latter you will need to set " +"log_output to 'TABLE' and have either the slow_query_log or general_log " +"enabled. Note however, that the general_log produces a lot of data and " +"increases server load by up to 15%" #: server_status.php:1599 msgid "" @@ -11272,10 +11268,9 @@ msgid "Add index" msgstr "Add index" #: tbl_indexes.php:175 -#, fuzzy #| msgid "Edit mode" msgid "Edit index" -msgstr "Edit mode" +msgstr "Edit index" #: tbl_indexes.php:186 msgid "Index name:" @@ -11413,10 +11408,9 @@ msgid "Check referential integrity:" msgstr "Check referential integrity:" #: tbl_printview.php:72 -#, fuzzy #| msgid "Show tables" msgid "Showing tables" -msgstr "Show tables" +msgstr "Showing tables" #: tbl_printview.php:269 tbl_structure.php:763 msgid "Space usage" @@ -12247,6 +12241,14 @@ msgid "" "(often invalidated due to table updates) increasing {query_cache_limit} " "might reduce efficiency." msgstr "" +"Changing {query_cache_limit} (usually by increasing) may increase " +"efficiency. This variable determines the maximum size a query result may " +"have to be inserted into the query cache. If there are many query results " +"above 1 MiB that are well cacheable (many reads, little writes) then " +"increasing {query_cache_limit} will increase efficiency. Whereas in the case " +"of many query results being above 1 MiB that are not very well cacheable " +"(often invalidated due to table updates) increasing {query_cache_limit} " +"might reduce efficiency." #: po/advisory_rules.php:108 msgid "query_cache_limit is set to 1 MiB" @@ -12351,6 +12353,12 @@ msgid "" "scans. Other than that full index scans can only be reduced by rewriting " "queries." msgstr "" +"This usually indicates frequent full index scans. Full index scans are " +"faster than table scans but require lots of CPU cycles in big tables, if " +"those tables that have or had high volumes of UPDATEs and DELETEs, running " +"'OPTIMIZE TABLE' might reduce the amount of and/or speed up full index " +"scans. Other than that full index scans can only be reduced by rewriting " +"queries." #: po/advisory_rules.php:133 #, php-format @@ -12366,11 +12374,15 @@ msgid "The rate of reading data from a fixed position is high." msgstr "The rate of reading data from a fixed position is high." #: po/advisory_rules.php:137 +#, fuzzy msgid "" "This indicates that many queries need to sort results and/or do a full table " "scan, including join queries that do not use indexes. Add indexes where " "applicable." msgstr "" +"This indicates that many queries need to sort results and/or do a full table " +"scan, including join queries that do not use indexes. Add indexes where " +"applicable." #: po/advisory_rules.php:138 #, php-format @@ -12398,45 +12410,58 @@ msgstr "" "where applicable." #: po/advisory_rules.php:143 -#, php-format +#, fuzzy, php-format msgid "" "Rate of reading next table row: %s, this value should be less than 1 per hour" msgstr "" +"Rate of reading next table row: %s, this value should be less than 1 per " +"hour" #: po/advisory_rules.php:145 +#, fuzzy msgid "tmp_table_size vs. max_heap_table_size" -msgstr "" +msgstr "tmp_table_size vs. max_heap_table_size" #: po/advisory_rules.php:146 +#, fuzzy msgid "tmp_table_size and max_heap_table_size are not the same." -msgstr "" +msgstr "tmp_table_size and max_heap_table_size are not the same." #: po/advisory_rules.php:147 +#, fuzzy msgid "" "If you have deliberately changed one of either: The server uses the lower " "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 "" +"If you have deliberately changed one of either: The server uses the lower " +"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." #: po/advisory_rules.php:148 -#, php-format +#, fuzzy, php-format msgid "Current values are tmp_table_size: %s, max_heap_table_size: %s" -msgstr "" +msgstr "Current values are tmp_table_size: %s, max_heap_table_size: %s" #: po/advisory_rules.php:150 #, fuzzy #| msgid "Where to show the table row links" msgid "Percentage of temp tables on disk" -msgstr "Where to show the table row links" +msgstr "Percentage of temp tables on disk" #: po/advisory_rules.php:151 po/advisory_rules.php:156 +#, fuzzy msgid "" "Many temporary tables are being written to disk instead of being kept in " "memory." msgstr "" +"Many temporary tables are being written to disk instead of being kept in " +"memory." #: po/advisory_rules.php:152 +#, fuzzy msgid "" "Increasing {max_heap_table_size} and {tmp_table_size} might help. However " "some temporary tables are always being written to disk, independent of the " @@ -12446,22 +12471,32 @@ msgid "" "mentioned in the beginning of an <a href=\\\"http://www.facebook.com/note." "php?note_id=10150111255065841&comments\\\">Article by the Pythian Group</a>" msgstr "" +"Increasing {max_heap_table_size} and {tmp_table_size} might help. However " +"some temporary tables are always being written to disk, independent of the " +"value of these variables. To eliminate these you will have to rewrite your " +"queries to avoid those conditions (Within a temporary table: Presence of a " +"BLOB or TEXT column or presence of a column bigger than 512 bytes) as " +"mentioned in the beginning of an <a href=\\\"http://www.facebook.com/note.php?" +"note_id=10150111255065841&comments\\\">Article by the Pythian Group</a>" #: po/advisory_rules.php:153 -#, php-format +#, fuzzy, php-format msgid "" "%s%% of all temporary tables are being written to disk, this value should be " "below 25%%" msgstr "" +"%s%% of all temporary tables are being written to disk, this value should be " +"below 25%%" #: po/advisory_rules.php:155 #, fuzzy #| msgid "%s table" #| msgid_plural "%s tables" msgid "Temp disk rate" -msgstr "%s table" +msgstr "Temp disk rate" #: po/advisory_rules.php:157 +#, fuzzy msgid "" "Increasing {max_heap_table_size} and {tmp_table_size} might help. However " "some temporary tables are always being written to disk, independent of the " @@ -12471,6 +12506,13 @@ msgid "" "mentioned in the <a href=\\\"http://dev.mysql.com/doc/refman/5.5/en/internal-" "temporary-tables.html\\\">MySQL Documentation</a>" msgstr "" +"Increasing {max_heap_table_size} and {tmp_table_size} might help. However " +"some temporary tables are always being written to disk, independent of the " +"value of these variables. To eliminate these you will have to rewrite your " +"queries to avoid those conditions (Within a temporary table: Presence of a " +"BLOB or TEXT column or presence of a column bigger than 512 bytes) as " +"mentioned in the <a href=\\\"http://dev.mysql.com/doc/refman/5.5/en/internal-" +"temporary-tables.html\\\">MySQL Documentation</a>" #: po/advisory_rules.php:158 #, fuzzy, php-format @@ -12480,373 +12522,432 @@ msgid "" "Rate of temporary tables being written to disk: %s, this value should be " "less than 1 per hour" msgstr "" -"Temporary tables average: %s, this value should be less than 1 per hour." +"Rate of temporary tables being written to disk: %s, this value should be " +"less than 1 per hour" #: po/advisory_rules.php:160 #, fuzzy #| msgid "Sort buffer size" msgid "MyISAM key buffer size" -msgstr "Sort buffer size" +msgstr "MyISAM key buffer size" #: po/advisory_rules.php:161 +#, fuzzy msgid "Key buffer is not initialized. No MyISAM indexes will be cached." -msgstr "" +msgstr "Key buffer is not initialized. No MyISAM indexes will be cached." #: po/advisory_rules.php:162 +#, fuzzy msgid "" "Set {key_buffer_size} depending on the size of your MyISAM indexes. 64M is a " "good start." msgstr "" +"Set {key_buffer_size} depending on the size of your MyISAM indexes. 64M is a " +"good start." #: po/advisory_rules.php:163 +#, fuzzy msgid "key_buffer_size is 0" -msgstr "" +msgstr "key_buffer_size is 0" #: po/advisory_rules.php:165 -#, fuzzy, php-format +#, php-format #| msgid "Sort buffer size" msgid "Max %% MyISAM key buffer ever used" -msgstr "Sort buffer size" +msgstr "Max %% MyISAM key buffer ever used" #: po/advisory_rules.php:166 po/advisory_rules.php:171 #, fuzzy, php-format #| msgid "Sort buffer size" msgid "MyISAM key buffer (index cache) %% used is low." -msgstr "Sort buffer size" +msgstr "MyISAM key buffer (index cache) %% used is low." #: po/advisory_rules.php:167 po/advisory_rules.php:172 +#, fuzzy 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 "" +"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." #: po/advisory_rules.php:168 -#, php-format +#, fuzzy, php-format msgid "max %% MyISAM key buffer ever used: %s, this value should be above 95%%" -msgstr "" +msgstr "max %% MyISAM key buffer ever used: %s, this value should be above 95%%" #: po/advisory_rules.php:170 #, fuzzy #| msgid "Sort buffer size" msgid "Percentage of MyISAM key buffer used" -msgstr "Sort buffer size" +msgstr "Percentage of MyISAM key buffer used" #: po/advisory_rules.php:173 -#, php-format +#, fuzzy, php-format msgid "%% MyISAM key buffer used: %s, this value should be above 95%%" -msgstr "" +msgstr "%% MyISAM key buffer used: %s, this value should be above 95%%" #: po/advisory_rules.php:175 +#, fuzzy msgid "Percentage of index reads from memory" -msgstr "" +msgstr "Percentage of index reads from memory" #: po/advisory_rules.php:176 -#, php-format +#, fuzzy, php-format msgid "The %% of indexes that use the MyISAM key buffer is low." -msgstr "" +msgstr "The %% of indexes that use the MyISAM key buffer is low." #: po/advisory_rules.php:177 +#, fuzzy msgid "You may need to increase {key_buffer_size}." -msgstr "" +msgstr "You may need to increase {key_buffer_size}." #: po/advisory_rules.php:178 -#, php-format +#, fuzzy, php-format msgid "Index reads from memory: %s%%, this value should be above 95%%" -msgstr "" +msgstr "Index reads from memory: %s%%, this value should be above 95%%" #: po/advisory_rules.php:180 #, fuzzy #| msgid "Create table" msgid "Rate of table open" -msgstr "Create table" +msgstr "Rate of table open" #: po/advisory_rules.php:181 #, fuzzy #| msgid "The current number of pending writes." msgid "The rate of opening tables is high." -msgstr "The current number of pending writes." +msgstr "The rate of opening tables is high." #: po/advisory_rules.php:182 +#, fuzzy msgid "" "Opening tables requires disk I/O which is costly. Increasing " "{table_open_cache} might avoid this." msgstr "" +"Opening tables requires disk I/O which is costly. Increasing " +"{table_open_cache} might avoid this." #: po/advisory_rules.php:183 -#, php-format +#, fuzzy, php-format msgid "Opened table rate: %s, this value should be less than 10 per hour" -msgstr "" +msgstr "Opened table rate: %s, this value should be less than 10 per hour" #: po/advisory_rules.php:185 #, fuzzy #| msgid "Format of imported file" msgid "Percentage of used open files limit" -msgstr "Format of imported file" +msgstr "Percentage of used open files limit" #: po/advisory_rules.php:186 +#, fuzzy msgid "" "The number of open files is approaching the max number of open files. You " "may get a \\\"Too many open files\\\" error." msgstr "" +"The number of open files is approaching the max number of open files. You " +"may get a \\\"Too many open files\\\" error." #: po/advisory_rules.php:187 po/advisory_rules.php:192 +#, fuzzy msgid "" "Consider increasing {open_files_limit}, and check the error log when " "restarting after changing open_files_limit." msgstr "" +"Consider increasing {open_files_limit}, and check the error log when " +"restarting after changing open_files_limit." #: po/advisory_rules.php:188 -#, php-format +#, fuzzy, php-format msgid "" "The number of opened files is at %s%% of the limit. It should be below 85%%" msgstr "" +"The number of opened files is at %s%% of the limit. It should be below 85%%" #: po/advisory_rules.php:190 #, fuzzy #| msgid "Format of imported file" msgid "Rate of open files" -msgstr "Format of imported file" +msgstr "Rate of open files" #: po/advisory_rules.php:191 #, fuzzy #| msgid "The number of pending log file fsyncs." msgid "The rate of opening files is high." -msgstr "The number of pending log file fsyncs." +msgstr "The rate of opening files is high." #: po/advisory_rules.php:193 -#, php-format +#, fuzzy, php-format msgid "Opened files rate: %s, this value should be less than 5 per hour" -msgstr "" +msgstr "Opened files rate: %s, this value should be less than 5 per hour" #: po/advisory_rules.php:195 -#, fuzzy, php-format +#, php-format #| msgid "Create table on database %s" msgid "Immediate table locks %%" -msgstr "Create table on database %s" +msgstr "Immediate table locks %%" #: po/advisory_rules.php:196 po/advisory_rules.php:201 -#, fuzzy #| msgid "The number of times that a table lock was acquired immediately." msgid "Too many table locks were not granted immediately." -msgstr "The number of times that a table lock was acquired immediately." +msgstr "Too many table locks were not granted immediately." #: po/advisory_rules.php:197 po/advisory_rules.php:202 msgid "Optimize queries and/or use InnoDB to reduce lock wait." -msgstr "" +msgstr "Optimise queries and/or use InnoDB to reduce lock wait." #: po/advisory_rules.php:198 -#, php-format +#, fuzzy, php-format msgid "Immediate table locks: %s%%, this value should be above 95%%" -msgstr "" +msgstr "Immediate table locks: %s%%, this value should be above 95%%" #: po/advisory_rules.php:200 msgid "Table lock wait rate" -msgstr "" +msgstr "Table lock wait rate" #: po/advisory_rules.php:203 -#, php-format +#, fuzzy, php-format msgid "Table lock wait rate: %s, this value should be less than 1 per hour" -msgstr "" +msgstr "Table lock wait rate: %s, this value should be less than 1 per hour" #: po/advisory_rules.php:205 #, fuzzy #| msgid "Key cache" msgid "Thread cache" -msgstr "Key cache" +msgstr "Thread cache" #: po/advisory_rules.php:206 +#, fuzzy msgid "" "Thread cache is disabled, resulting in more overhead from new connections to " "MySQL." msgstr "" +"Thread cache is disabled, resulting in more overhead from new connections to " +"MySQL." #: po/advisory_rules.php:207 +#, fuzzy msgid "Enable the thread cache by setting {thread_cache_size} > 0." -msgstr "" +msgstr "Enable the thread cache by setting {thread_cache_size} > 0." #: po/advisory_rules.php:208 +#, fuzzy msgid "The thread cache is set to 0" -msgstr "" +msgstr "The thread cache is set to 0" #: po/advisory_rules.php:210 #, fuzzy, php-format #| msgid "Tracking is not active." msgid "Thread cache hit rate %%" -msgstr "Tracking is not active." +msgstr "Thread cache hit rate %%" #: po/advisory_rules.php:211 #, fuzzy #| msgid "Tracking is not active." msgid "Thread cache is not efficient." -msgstr "Tracking is not active." +msgstr "Thread cache is not efficient." #: po/advisory_rules.php:212 +#, fuzzy msgid "Increase {thread_cache_size}." -msgstr "" +msgstr "Increase {thread_cache_size}." #: po/advisory_rules.php:213 -#, php-format +#, fuzzy, php-format msgid "Thread cache hitrate: %s%%, this value should be above 80%%" -msgstr "" +msgstr "Thread cache hitrate: %s%%, this value should be above 80%%" #: po/advisory_rules.php:215 +#, fuzzy msgid "Threads that are slow to launch" -msgstr "" +msgstr "Threads that are slow to launch" #: po/advisory_rules.php:216 #, fuzzy #| msgid "The number of threads that are not sleeping." msgid "There are too many threads that are slow to launch." -msgstr "The number of threads that are not sleeping." +msgstr "There are too many threads that are slow to launch." #: po/advisory_rules.php:217 +#, fuzzy msgid "" "This generally happens in case of general system overload as it is pretty " "simple operations. You might want to monitor your system load carefully." msgstr "" +"This generally happens in case of general system overload as it is pretty " +"simple operations. You might want to monitor your system load carefully." #: po/advisory_rules.php:218 -#, php-format +#, fuzzy, php-format msgid "%s thread(s) took longer than %s seconds to start, it should be 0" -msgstr "" +msgstr "%s thread(s) took longer than %s seconds to start, it should be 0" #: po/advisory_rules.php:220 +#, fuzzy msgid "Slow launch time" -msgstr "" +msgstr "Slow launch time" #: po/advisory_rules.php:221 +#, fuzzy msgid "Slow_launch_threads is above 2s" -msgstr "" +msgstr "Slow_launch_threads is above 2s" #: po/advisory_rules.php:222 +#, fuzzy msgid "" "Set slow_launch_time to 1s or 2s to correctly count threads that are slow to " "launch" msgstr "" +"Set slow_launch_time to 1s or 2s to correctly count threads that are slow to " +"launch" #: po/advisory_rules.php:223 #, fuzzy, php-format #| msgid "long_query_time is set to %d second(s)." msgid "slow_launch_time is set to %s" -msgstr "long_query_time is set to %d second(s)." +msgstr "slow_launch_time is set to %s" #: po/advisory_rules.php:225 #, fuzzy #| msgid "Persistent connections" msgid "Percentage of used connections" -msgstr "Persistent connections" +msgstr "Percentage of used connections" #: po/advisory_rules.php:226 +#, fuzzy msgid "" "The maximum amount of used connections is getting close to the value of " "max_connections." msgstr "" +"The maximum amount of used connections is getting close to the value of " +"max_connections." #: po/advisory_rules.php:227 +#, fuzzy msgid "" "Increase max_connections, or decrease wait_timeout so that connections that " "do not close database handlers properly get killed sooner. Make sure the " "code closes database handlers properly." msgstr "" +"Increase max_connections, or decrease wait_timeout so that connections that " +"do not close database handlers properly get killed sooner. Make sure the " +"code closes database handlers properly." #: po/advisory_rules.php:228 -#, php-format +#, fuzzy, php-format msgid "" "Max_used_connections is at %s%% of max_connections, it should be below 80%%" msgstr "" +"Max_used_connections is at %s%% of max_connections, it should be below 80%%" #: po/advisory_rules.php:230 #, fuzzy #| msgid "Persistent connections" msgid "Percentage of aborted connections" -msgstr "Persistent connections" +msgstr "Percentage of aborted connections" #: po/advisory_rules.php:231 po/advisory_rules.php:236 +#, fuzzy msgid "Too many connections are aborted." -msgstr "" +msgstr "Too many connections are aborted." #: po/advisory_rules.php:232 po/advisory_rules.php:237 +#, fuzzy msgid "" "Connections are usually aborted when they cannot be authorized. <a href=\\" "\"http://www.mysqlperformanceblog.com/2008/08/23/how-to-track-down-the-" "source-of-aborted_connects/\\\">This article</a> might help you track down " "the source." msgstr "" +"Connections are usually aborted when they cannot be authorised. <a " +"href=\\\"http://www.mysqlperformanceblog.com/2008/08/23/how-to-track-down-the-" +"source-of-aborted_connects/\\\">This article</a> might help you track down the " +"source." #: po/advisory_rules.php:233 -#, php-format +#, fuzzy, php-format msgid "%s%% of all connections are aborted. This value should be below 1%%" -msgstr "" +msgstr "%s%% of all connections are aborted. This value should be below 1%%" #: po/advisory_rules.php:235 #, fuzzy #| msgid "Persistent connections" msgid "Rate of aborted connections" -msgstr "Persistent connections" +msgstr "Rate of aborted connections" #: po/advisory_rules.php:238 -#, php-format +#, fuzzy, php-format msgid "" "Aborted connections rate is at %s, this value should be less than 1 per hour" msgstr "" +"Aborted connections rate is at %s, this value should be less than 1 per hour" #: po/advisory_rules.php:240 #, fuzzy #| msgid "Format of imported file" msgid "Percentage of aborted clients" -msgstr "Format of imported file" +msgstr "Percentage of aborted clients" #: po/advisory_rules.php:241 po/advisory_rules.php:246 +#, fuzzy msgid "Too many clients are aborted." -msgstr "" +msgstr "Too many clients are aborted." #: po/advisory_rules.php:242 po/advisory_rules.php:247 +#, fuzzy msgid "" "Clients are usually aborted when they did not close their connection to " "MySQL properly. This can be due to network issues or code not closing a " "database handler properly. Check your network and code." msgstr "" +"Clients are usually aborted when they did not close their connection to " +"MySQL properly. This can be due to network issues or code not closing a " +"database handler properly. Check your network and code." #: po/advisory_rules.php:243 -#, php-format +#, fuzzy, php-format msgid "%s%% of all clients are aborted. This value should be below 2%%" -msgstr "" +msgstr "%s%% of all clients are aborted. This value should be below 2%%" #: po/advisory_rules.php:245 #, fuzzy #| msgid "Format of imported file" msgid "Rate of aborted clients" -msgstr "Format of imported file" +msgstr "Rate of aborted clients" #: po/advisory_rules.php:248 -#, php-format +#, fuzzy, php-format msgid "Aborted client rate is at %s, this value should be less than 1 per hour" -msgstr "" +msgstr "Aborted client rate is at %s, this value should be less than 1 per hour" #: po/advisory_rules.php:250 +#, fuzzy msgid "Is InnoDB disabled?" -msgstr "" +msgstr "Is InnoDB disabled?" #: po/advisory_rules.php:251 #, fuzzy #| msgid "Could not save recent table" msgid "You do not have InnoDB enabled." -msgstr "Could not save recent table" +msgstr "You do not have InnoDB enabled." #: po/advisory_rules.php:252 +#, fuzzy msgid "InnoDB is usually the better choice for table engines." -msgstr "" +msgstr "InnoDB is usually the better choice for table engines." #: po/advisory_rules.php:253 +#, fuzzy msgid "have_innodb is set to 'value'" -msgstr "" +msgstr "have_innodb is set to 'value'" #: po/advisory_rules.php:255 #, fuzzy #| msgid "Buffer pool size" msgid "InnoDB log size" -msgstr "Buffer pool size" +msgstr "InnoDB log size" #: po/advisory_rules.php:256 #, fuzzy @@ -12854,10 +12955,12 @@ msgstr "Buffer pool size" msgid "" "The InnoDB log file size is not an appropriate size, in relation to the " "InnoDB buffer pool." -msgstr "The number writes done to the InnoDB buffer pool." +msgstr "" +"The InnoDB log file size is not an appropriate size, in relation to the " +"InnoDB buffer pool." #: po/advisory_rules.php:257 -#, php-format +#, fuzzy, php-format msgid "" "Especially on a system with a lot of writes to InnoDB tables you should set " "innodb_log_file_size to 25%% of {innodb_buffer_pool_size}. However the " @@ -12870,24 +12973,38 @@ msgid "" "com/2007/01/increase-innodblogfilesize-proper-way.html\\\">this blog entry</" "a>" msgstr "" +"Especially on a system with a lot of writes to InnoDB tables you should set " +"innodb_log_file_size to 25%% of {innodb_buffer_pool_size}. However the " +"bigger this value, the longer the recovery time will be when database " +"crashes, so this value should not be set much higher than 256 MiB. Please " +"note however that you cannot simply change the value of this variable. You " +"need to shutdown the server, remove the InnoDB log files, set the new value " +"in my.cnf, start the server, then check the error logs if everything went " +"fine. See also <a " +"href=\\\"http://mysqldatabaseadministration.blogspot.com/2007/01/increase-" +"innodblogfilesize-proper-way.html\\\">this blog entry</a>" #: po/advisory_rules.php:258 -#, php-format +#, fuzzy, php-format msgid "" "Your InnoDB log size is at %s%% in relation to the InnoDB buffer pool size, " "it should not be below 20%%" msgstr "" +"Your InnoDB log size is at %s%% in relation to the InnoDB buffer pool size, " +"it should not be below 20%%" #: po/advisory_rules.php:260 +#, fuzzy msgid "Max InnoDB log size" -msgstr "" +msgstr "Max InnoDB log size" #: po/advisory_rules.php:261 +#, fuzzy msgid "The InnoDB log file size is inadequately large." -msgstr "" +msgstr "The InnoDB log file size is inadequately large." #: po/advisory_rules.php:262 -#, php-format +#, fuzzy, php-format msgid "" "It is usually sufficient to set innodb_log_file_size to 25%% of the size of " "{innodb_buffer_pool_size}. A very big innodb_log_file_size slows down the " @@ -12899,24 +13016,34 @@ msgid "" "\"http://mysqldatabaseadministration.blogspot.com/2007/01/increase-" "innodblogfilesize-proper-way.html\\\">this blog entry</a>" msgstr "" +"It is usually sufficient to set innodb_log_file_size to 25%% of the size of " +"{innodb_buffer_pool_size}. A very big innodb_log_file_size slows down the " +"recovery time after a database crash considerably. See also <a " +"href=\\\"http://www.mysqlperformanceblog.com/2006/07/03/choosing-proper-" +"innodb_log_file_size/\\\">this Article</a>. You need to shutdown the server, " +"remove the InnoDB log files, set the new value in my.cnf, start the server, " +"then check the error logs if everything went fine. See also <a " +"href=\\\"http://mysqldatabaseadministration.blogspot.com/2007/01/increase-" +"innodblogfilesize-proper-way.html\\\">this blog entry</a>" #: po/advisory_rules.php:263 -#, php-format +#, fuzzy, php-format msgid "Your absolute InnoDB log size is %s MiB" -msgstr "" +msgstr "Your absolute InnoDB log size is %s MiB" #: po/advisory_rules.php:265 #, fuzzy #| msgid "Buffer pool size" msgid "InnoDB buffer pool size" -msgstr "Buffer pool size" +msgstr "InnoDB buffer pool size" #: po/advisory_rules.php:266 +#, fuzzy msgid "Your InnoDB buffer pool is fairly small." -msgstr "" +msgstr "Your InnoDB buffer pool is fairly small." #: po/advisory_rules.php:267 -#, php-format +#, fuzzy, php-format msgid "" "The InnoDB buffer pool has a profound impact on performance for InnoDB " "tables. Assign all your remaining memory to this buffer. For database " @@ -12929,36 +13056,57 @@ msgid "" "\"http://www.mysqlperformanceblog.com/2007/11/03/choosing-" "innodb_buffer_pool_size/\\\">this article</a>" msgstr "" +"The InnoDB buffer pool has a profound impact on performance for InnoDB " +"tables. Assign all your remaining memory to this buffer. For database " +"servers that use solely InnoDB as storage engine and have no other services " +"(e.g. a web server) running, you may set this as high as 80%% of your " +"available memory. If that is not the case, you need to carefully assess the " +"memory consumption of your other services and non-InnoDB-Tables and set this " +"variable accordingly. If it is set too high, your system will start " +"swapping, which decreases performance significantly. See also <a " +"href=\\\"http://www.mysqlperformanceblog.com/2007/11/03/choosing-" +"innodb_buffer_pool_size/\\\">this article</a>" #: po/advisory_rules.php:268 -#, php-format +#, fuzzy, php-format msgid "" "You are currently using %s%% of your memory for the InnoDB buffer pool. This " "rule fires if you are assigning less than 60%%, however this might be " "perfectly adequate for your system if you don't have much InnoDB tables or " "other services running on the same machine." msgstr "" +"You are currently using %s%% of your memory for the InnoDB buffer pool. This " +"rule fires if you are assigning less than 60%%, however this might be " +"perfectly adequate for your system if you don't have much InnoDB tables or " +"other services running on the same machine." #: po/advisory_rules.php:270 #, fuzzy #| msgid "max. concurrent connections" msgid "MyISAM concurrent inserts" -msgstr "max. concurrent connections" +msgstr "MyISAM concurrent inserts" #: po/advisory_rules.php:271 +#, fuzzy msgid "Enable concurrent_insert by setting it to 1" -msgstr "" +msgstr "Enable concurrent_insert by setting it to 1" #: po/advisory_rules.php:272 +#, fuzzy msgid "" "Setting {concurrent_insert} to 1 reduces contention between readers and " "writers for a given table. See also <a href=\\\"http://dev.mysql.com/doc/" "refman/5.5/en/concurrent-inserts.html\\\">MySQL Documentation</a>" msgstr "" +"Setting {concurrent_insert} to 1 reduces contention between readers and " +"writers for a given table. See also <a " +"href=\\\"http://dev.mysql.com/doc/refman/5.5/en/concurrent-" +"inserts.html\\\">MySQL Documentation</a>" #: po/advisory_rules.php:273 +#, fuzzy msgid "concurrent_insert is set to 0" -msgstr "" +msgstr "concurrent_insert is set to 0" #~ msgid "Click to unselect" #~ msgstr "Click to unselect" diff --git a/po/fr.po b/po/fr.po index 18c8129..a846829 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-20 15:13+0100\n" -"PO-Revision-Date: 2011-11-19 12:43+0200\n" +"PO-Revision-Date: 2011-11-23 17:16+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" "Language: fr\n" @@ -1108,22 +1108,20 @@ msgid "This is not a number!" msgstr "Ce n'est pas un nombre !" #: js/messages.php:46 -#, fuzzy #| msgid "Add index" msgid "Add Index" -msgstr "Ajouter un index" +msgstr "Ajouter Index" #: js/messages.php:47 -#, fuzzy #| msgid "Edit mode" msgid "Edit Index" -msgstr "Mode édition" +msgstr "Modifier un index" #: js/messages.php:48 tbl_indexes.php:286 -#, fuzzy, php-format +#, php-format #| msgid "Add %s column(s)" msgid "Add %d column(s) to index" -msgstr "Ajouter %s colonne(s)" +msgstr "Ajouter %d colonne(s) à l'index" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:52 @@ -1844,16 +1842,14 @@ msgid "Select two different columns" msgstr "Sélectionnez deux colonnes différentes" #: js/messages.php:290 -#, fuzzy #| msgid "Query results operations" msgid "Query results" -msgstr "Opérations sur les résultats de la requête" +msgstr "Opérations sur les résultats" #: js/messages.php:291 -#, fuzzy #| msgid "Data pointer size" msgid "Data point content" -msgstr "Taille du pointeur de données" +msgstr "Données reliées à ce point" #: js/messages.php:294 tbl_change.php:312 tbl_indexes.php:221 #: tbl_indexes.php:248 @@ -11431,10 +11427,9 @@ msgid "Add index" msgstr "Ajouter un index" #: tbl_indexes.php:175 -#, fuzzy #| msgid "Edit mode" msgid "Edit index" -msgstr "Mode édition" +msgstr "Modifier l'index" #: tbl_indexes.php:186 msgid "Index name:" diff --git a/po/ja.po b/po/ja.po index 554a1f6..388f689 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-20 15:13+0100\n" -"PO-Revision-Date: 2011-11-22 12:31+0200\n" +"PO-Revision-Date: 2011-11-23 12:22+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -877,7 +877,7 @@ msgstr "ベースレイヤーに OpenStreetMap を使用する" #: gis_data_editor.php:134 msgid "SRID" -msgstr "" +msgstr "空間参照識別子" #: gis_data_editor.php:151 js/messages.php:302 #: libraries/display_tbl.lib.php:685 @@ -4486,7 +4486,7 @@ msgstr "root ログインの許可" #: libraries/config/messages.inc.php:368 msgid "HTTP Basic Auth Realm name to display when doing HTTP Auth" -msgstr "HTTP 認証を行うときに表示される HTTP 基本認証領域名" +msgstr "HTTP 認証を行うときに表示される HTTP Basic 認証領域における名称" #: libraries/config/messages.inc.php:369 msgid "HTTP Realm" @@ -4939,9 +4939,7 @@ msgstr "冗長なチェック" msgid "" "A user-friendly description of this server. Leave blank to display the " "hostname instead." -msgstr "" -"このサーバのわかりやすい説明。代わりにホスト名を表示するには、空欄のままにし" -"ます。" +msgstr "このサーバのわかりやすい説明。ホスト名をそのまま表示させる場合には、空欄のままにします。" #: libraries/config/messages.inc.php:454 msgid "Verbose name of this server" @@ -12761,7 +12759,7 @@ msgstr "使用されている接続の比率" msgid "" "The maximum amount of used connections is getting close to the value of " "max_connections." -msgstr "" +msgstr "使用されている接続数が max_connections の値に達すると、閉じられてしまう接続が発生します。" #: po/advisory_rules.php:227 msgid "" @@ -12877,12 +12875,11 @@ msgid "InnoDB log size" msgstr "InnoDB のログサイズ" #: po/advisory_rules.php:256 -#, fuzzy #| msgid "The number writes done to the InnoDB buffer pool." msgid "" "The InnoDB log file size is not an appropriate size, in relation to the " "InnoDB buffer pool." -msgstr "InnoDB バッファプールへの書き込み回数" +msgstr "InnoDB のログサイズが適切ではありません。この値は InnoDB バッファプールと関連があります。" #: po/advisory_rules.php:257 #, php-format @@ -12898,6 +12895,14 @@ msgid "" "com/2007/01/increase-innodblogfilesize-proper-way.html\\\">this blog entry</" "a>" msgstr "" +"特に、InnoDB のテーブルへの書き込みが多いシステムの場合には、innodb_log_file_size は " +"{innodb_buffer_pool_size} の 25%% " +"に設定するといいでしょう。しかしながら、この値が大きくなると、データベースが壊れたときのリカバリに時間がかかるようになります。そのため、この値は 256 " +"MiB を超えないようにしたほうがいいでしょう。なお、この変数は簡単には変更できないので注意してください。サーバを停止させ、InnoDB " +"ログファイルを削除し、my.cnf に新しい値を設定して、そうした後にサーバは起動しなおす必要があります。そして、全ての設定が正しく設定できているのかを" +"、エラーログで確認しなければなりません。<a " +"href=\\\"http://mysqldatabaseadministration.blogspot.com/2007/01/increase-" +"innodblogfilesize-proper-way.html\\\">こちらのブログ記事 (英語)</a>もご覧になってください。" #: po/advisory_rules.php:258 #, php-format @@ -12905,6 +12910,8 @@ msgid "" "Your InnoDB log size is at %s%% in relation to the InnoDB buffer pool size, " "it should not be below 20%%" msgstr "" +"ご使用されている InnoDB のログサイズは、関連のある InnoDB バッファプールの大きさに対して %s%% です。この値は、20%% " +"未満がいいと言われています。" #: po/advisory_rules.php:260 msgid "Max InnoDB log size" diff --git a/po/nl.po b/po/nl.po index 90a6c0b..444cc0c 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-20 15:13+0100\n" -"PO-Revision-Date: 2011-06-04 15:19+0200\n" -"Last-Translator: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>\n" +"PO-Revision-Date: 2011-11-24 03:16+0200\n" +"Last-Translator: dannybeckett <daniel.beckett(a)gmail.com>\n" "Language-Team: dutch <nl(a)li.org>\n" "Language: nl\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: Pootle 2.0.5\n" +"X-Generator: Pootle 2.1.6\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:329 #: libraries/display_tbl.lib.php:358 server_privileges.php:1673 @@ -809,10 +809,9 @@ msgid "ENUM/SET editor" msgstr "" #: enum_editor.php:28 js/messages.php:247 -#, fuzzy #| msgid "Values for the column \"%s\"" msgid "Values for a new column" -msgstr "Waarden voor kolom \"%s\"" +msgstr "Waarden voor een neiuwe kolom" #: enum_editor.php:30 js/messages.php:246 #, fuzzy, php-format @@ -13330,10 +13329,9 @@ msgid "Your absolute InnoDB log size is %s MiB" msgstr "" #: po/advisory_rules.php:265 -#, fuzzy #| msgid "Buffer pool size" msgid "InnoDB buffer pool size" -msgstr "Buffer pool grootte" +msgstr "InnoDB buffer pool grootte" #: po/advisory_rules.php:266 msgid "Your InnoDB buffer pool is fairly small." diff --git a/po/sv.po b/po/sv.po index c81f6e6..dbb7934 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-20 15:13+0100\n" -"PO-Revision-Date: 2011-11-16 21:47+0200\n" +"PO-Revision-Date: 2011-11-24 01:21+0200\n" "Last-Translator: ProUser <stefan(a)inkopsforum.se>\n" "Language-Team: swedish <sv(a)li.org>\n" "Language: sv\n" @@ -1096,22 +1096,20 @@ msgid "This is not a number!" msgstr "Detta är inte ett nummer!" #: js/messages.php:46 -#, fuzzy #| msgid "Add index" msgid "Add Index" -msgstr "Lägg till index" +msgstr "Addera index" #: js/messages.php:47 -#, fuzzy #| msgid "Edit mode" msgid "Edit Index" -msgstr "Redigeringsläge" +msgstr "Redigera index" #: js/messages.php:48 tbl_indexes.php:286 -#, fuzzy, php-format +#, php-format #| msgid "Add %s column(s)" msgid "Add %d column(s) to index" -msgstr "Lägg till %s fält" +msgstr "Lägg till %d kolumner till index" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:52 @@ -1828,16 +1826,14 @@ msgid "Select two different columns" msgstr "Välj två olika kolumner" #: js/messages.php:290 -#, fuzzy #| msgid "Query results operations" msgid "Query results" -msgstr "Operationer för frågeresultat" +msgstr "Frågeresultat" #: js/messages.php:291 -#, fuzzy #| msgid "Data pointer size" msgid "Data point content" -msgstr "Storlek för datapekare" +msgstr "Innehåll för datapunkt" #: js/messages.php:294 tbl_change.php:312 tbl_indexes.php:221 #: tbl_indexes.php:248 @@ -11296,10 +11292,9 @@ msgid "Add index" msgstr "Lägg till index" #: tbl_indexes.php:175 -#, fuzzy #| msgid "Edit mode" msgid "Edit index" -msgstr "Redigeringsläge" +msgstr "Redigera index" #: tbl_indexes.php:186 msgid "Index name:" hooks/post-receive -- phpMyAdmin

1 0