- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-872-gc3db2ad
by Marc Delisle 19 Dec '10

19 Dec '10

The branch, master has been updated via c3db2ade118cd21b38771335bda2e2b258432bb7 (commit) from 386581bcb68c2754f99f42ee398a897351c6a12a (commit) - Log ----------------------------------------------------------------- commit c3db2ade118cd21b38771335bda2e2b258432bb7 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Dec 19 05:49:38 2010 -0500 Makes sense to use MaxRows instead of a hard-coded value ----------------------------------------------------------------------- Summary of changes: browse_foreigners.php | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/browse_foreigners.php b/browse_foreigners.php index fd9c882..4b07400 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -21,7 +21,6 @@ require_once './libraries/header_http.inc.php'; /** * Displays the frame */ -$per_page = 200; require_once './libraries/transformations.lib.php'; // Transformations $cfgRelation = PMA_getRelationsParam(); $foreigners = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : FALSE); @@ -32,7 +31,7 @@ if (!isset($pos)) { $pos = 0; } -$foreign_limit = 'LIMIT ' . $pos . ', ' . $per_page . ' '; +$foreign_limit = 'LIMIT ' . $pos . ', ' . $GLOBALS['cfg']['MaxRows'] . ' '; if (isset($foreign_navig) && $foreign_navig == __('Show all')) { unset($foreign_limit); } @@ -53,15 +52,15 @@ $showall = ''; if (is_array($foreignData['disp_row'])) { - if ($cfg['ShowAll'] && ($foreignData['the_total'] > $per_page)) { + if ($cfg['ShowAll'] && ($foreignData['the_total'] > $GLOBALS['cfg']['MaxRows'])) { $showall = '<input type="submit" name="foreign_navig" value="' . __('Show all') . '" />'; } - $session_max_rows = $per_page; + $session_max_rows = $GLOBALS['cfg']['MaxRows']; $pageNow = @floor($pos / $session_max_rows) + 1; $nbTotalPage = @ceil($foreignData['the_total'] / $session_max_rows); - if ($foreignData['the_total'] > $per_page) { + if ($foreignData['the_total'] > $GLOBALS['cfg']['MaxRows']) { $gotopage = PMA_pageselector( 'browse_foreigners.php?field=' . urlencode($field) . '&' . PMA_generate_common_url($db, $table) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-871-g386581b
by Marc Delisle 19 Dec '10

19 Dec '10

The branch, master has been updated via 386581bcb68c2754f99f42ee398a897351c6a12a (commit) from 02b9dc80089d3277f5c96d526d0b9fca8c189cb3 (commit) - Log ----------------------------------------------------------------- commit 386581bcb68c2754f99f42ee398a897351c6a12a Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Dec 19 05:42:40 2010 -0500 This is not a primary key but a row number ----------------------------------------------------------------------- Summary of changes: browse_foreigners.php | 18 +++++++++--------- js/tbl_change.js | 4 ++-- tbl_change.php | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/browse_foreigners.php b/browse_foreigners.php index ef7cf2c..fd9c882 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -39,13 +39,13 @@ if (isset($foreign_navig) && $foreign_navig == __('Show all')) { $foreignData = PMA_getForeignData($foreigners, $field, $override_total, isset($foreign_filter) ? $foreign_filter : '', $foreign_limit); -if (isset($pk)) { - $pk_uri = '&pk=' . urlencode($pk); +if (isset($rownumber)) { + $rownumber_param = '&rownumber=' . urlencode($rownumber); ?> -<input type="hidden" name="pk" value="<?php echo htmlspecialchars($pk); ?>" /> +<input type="hidden" name="rownumber" value="<?php echo htmlspecialchars($rownumber); ?>" /> <?php } else { - $pk_uri = ''; + $rownumber_param = ''; } $gotopage = ''; @@ -65,7 +65,7 @@ if (is_array($foreignData['disp_row'])) { $gotopage = PMA_pageselector( 'browse_foreigners.php?field=' . urlencode($field) . '&' . PMA_generate_common_url($db, $table) - . $pk_uri . + . $rownumber_param . '&fieldkey=' . (isset($fieldkey) ? urlencode($fieldkey) : '') . '&foreign_filter=' . (isset($foreign_filter) ? urlencode($foreign_filter) : '') . '&', @@ -102,8 +102,8 @@ if (is_array($foreignData['disp_row'])) { if (opener && opener.document && opener.document.insertForm) { var field = 'fields'; - <?php if (isset($pk)) { ?> - var element_name = field + '[multi_edit][<?php echo htmlspecialchars($pk); ?>][' + fieldmd5 + ']'; + <?php if (isset($rownumber)) { ?> + var element_name = field + '[multi_edit][<?php echo htmlspecialchars($rownumber); ?>][' + fieldmd5 + ']'; <?php } else { ?> var element_name = field + '[]'; <?php } ?> @@ -141,8 +141,8 @@ if (is_array($foreignData['disp_row'])) { <input type="hidden" name="field" value="<?php echo htmlspecialchars($field); ?>" /> <input type="hidden" name="fieldkey" value="<?php echo isset($fieldkey) ? htmlspecialchars($fieldkey) : ''; ?>" /> -<?php if (isset($pk)) { ?> -<input type="hidden" name="pk" value="<?php echo htmlspecialchars($pk); ?>" /> +<?php if (isset($rownumber)) { ?> +<input type="hidden" name="rownumber" value="<?php echo htmlspecialchars($rownumber); ?>" /> <?php } ?> <span class="formelement"> <label for="input_foreign_filter"><?php echo __('Search') . ':'; ?></label> diff --git a/js/tbl_change.js b/js/tbl_change.js index 90d28fe..41aecd0 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -430,10 +430,10 @@ $(document).ready(function() { .find('.foreign_values_anchor') .each(function() { $anchor = $(this); - var new_value = 'pk=' + new_row_index; + var new_value = 'rownumber=' + new_row_index; // needs improvement in case something else inside // the href contains this pattern - var new_href = $anchor.attr('href').replace(/pk=\d+/, new_value); + var new_href = $anchor.attr('href').replace(/rownumber=\d+/, new_value); $anchor.attr('href', new_href ); }); diff --git a/tbl_change.php b/tbl_change.php index 60f3bf5..eff5ead 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -285,7 +285,7 @@ foreach ($rows as $row_id => $vrow) { } $jsvkey = $row_id; - $browse_foreigners_uri = '&pk=' . $row_id; + $rownumber_param = '&rownumber=' . $row_id; $vkey = '[multi_edit][' . $jsvkey . ']'; $vresult = (isset($result) && is_array($result) && isset($result[$row_id]) ? $result[$row_id] : $result); @@ -659,7 +659,7 @@ foreach ($rows as $row_id => $vrow) { tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" id="field_<?php echo ($idindex); ?>_3" value="<?php echo htmlspecialchars($data); ?>" /> - <a class="hide foreign_values_anchor" target="_blank" onclick="window.open(this.href, 'foreigners', 'width=640,height=240,scrollbars=yes,resizable=yes'); return false;" href="browse_foreigners.php?<?php echo PMA_generate_common_url($db, $table); ?>&field=<?php echo PMA_escapeJsString(urlencode($field['Field']) . $browse_foreigners_uri); ?>"><?php echo str_replace("'", "\'", $titles['Browse']); ?></a> + <a class="hide foreign_values_anchor" target="_blank" onclick="window.open(this.href, 'foreigners', 'width=640,height=240,scrollbars=yes,resizable=yes'); return false;" href="browse_foreigners.php?<?php echo PMA_generate_common_url($db, $table); ?>&field=<?php echo PMA_escapeJsString(urlencode($field['Field']) . $rownumber_param); ?>"><?php echo str_replace("'", "\'", $titles['Browse']); ?></a> <?php } elseif (is_array($foreignData['disp_row'])) { echo $backup_field . "\n"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-870-g02b9dc8
by Marc Delisle 18 Dec '10

18 Dec '10

The branch, master has been updated via 02b9dc80089d3277f5c96d526d0b9fca8c189cb3 (commit) from 45ec0da621e96c108bc70395eb01ad9495f281d0 (commit) - Log ----------------------------------------------------------------- commit 02b9dc80089d3277f5c96d526d0b9fca8c189cb3 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Dec 18 08:47:50 2010 -0500 "Continue insertion" feature did not work with "Browse foreign values" links ----------------------------------------------------------------------- Summary of changes: js/tbl_change.js | 25 +++++++++++++++++++++---- tbl_change.php | 12 ++---------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/js/tbl_change.js b/js/tbl_change.js index 758add1..90d28fe 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -258,6 +258,9 @@ function unNullify(urlField, multi_edit) */ $(document).ready(function() { + // these were hidden via the "hide" class + $('.foreign_values_anchor').show(); + /** * Handles all current checkboxes for Null * @@ -363,10 +366,15 @@ $(document).ready(function() { */ var last_row = $("#insertForm").find(".insertRowTable:last"); + // need to access this at more than one level + // (also needs improvement because it should be calculated + // just once per cloned row, not once per column) + var new_row_index = 0; + //Clone the insert tables $(last_row) .clone() - .insertBefore("#insertForm > fieldset") + .insertBefore("#actions_panel") .find('input[name*=multi_edit],select[name*=multi_edit]') .each(function() { @@ -387,7 +395,7 @@ $(document).ready(function() { var old_row_index = parseInt(old_row_index_string.match(/\d+/)[0]); /** calculate next index i.e. 11 */ - var new_row_index = old_row_index + 1; + new_row_index = old_row_index + 1; /** generate the new name i.e. funcs[multi_edit][11][foobarbaz] */ var new_name = name_parts[0] + '[' + new_row_index + ']' + name_parts[1]; @@ -417,8 +425,17 @@ $(document).ready(function() { ); }) .end(); - - }); + }) + .end() + .find('.foreign_values_anchor') + .each(function() { + $anchor = $(this); + var new_value = 'pk=' + new_row_index; + // needs improvement in case something else inside + // the href contains this pattern + var new_href = $anchor.attr('href').replace(/pk=\d+/, new_value); + $anchor.attr('href', new_href ); + }); //Insert/Clone the ignore checkboxes if(curr_rows == 1 ) { diff --git a/tbl_change.php b/tbl_change.php index eaf0bc3..60f3bf5 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -659,15 +659,7 @@ foreach ($rows as $row_id => $vrow) { tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" id="field_<?php echo ($idindex); ?>_3" value="<?php echo htmlspecialchars($data); ?>" /> - <script type="text/javascript"> - //<![CDATA[ - document.writeln('<a target="_blank" onclick="window.open(this.href, \'foreigners\', \'width=640,height=240,scrollbars=yes,resizable=yes\'); return false"'); - document.write(' href="browse_foreigners.php?'); - document.write('<?php echo PMA_generate_common_url($db, $table); ?>'); - document.writeln('&field=<?php echo PMA_escapeJsString(urlencode($field['Field']) . $browse_foreigners_uri); ?>">'); - document.writeln('<?php echo str_replace("'", "\'", $titles['Browse']); ?></a>'); - //]]> - </script> + <a class="hide foreign_values_anchor" target="_blank" onclick="window.open(this.href, 'foreigners', 'width=640,height=240,scrollbars=yes,resizable=yes'); return false;" href="browse_foreigners.php?<?php echo PMA_generate_common_url($db, $table); ?>&field=<?php echo PMA_escapeJsString(urlencode($field['Field']) . $browse_foreigners_uri); ?>"><?php echo str_replace("'", "\'", $titles['Browse']); ?></a> <?php } elseif (is_array($foreignData['disp_row'])) { echo $backup_field . "\n"; @@ -1015,7 +1007,7 @@ $(function() { ?> <br /> - <fieldset> + <fieldset id="actions_panel"> <table border="0" cellpadding="5" cellspacing="0"> <tr> <td valign="middle" nowrap="nowrap"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-869-g45ec0da
by Marc Delisle 17 Dec '10

17 Dec '10

The branch, master has been updated via 45ec0da621e96c108bc70395eb01ad9495f281d0 (commit) from 4a71a1e5f1eee17a5ef2349e9a62cbcab7ec4971 (commit) - Log ----------------------------------------------------------------- commit 45ec0da621e96c108bc70395eb01ad9495f281d0 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Dec 17 09:31:42 2010 -0500 Problems with latest fix and SET columns ----------------------------------------------------------------------- Summary of changes: libraries/tbl_replace_fields.inc.php | 61 +++++++++++++-------------------- tbl_change.php | 2 +- 2 files changed, 25 insertions(+), 38 deletions(-) diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php index 3ba08c4..84377bf 100644 --- a/libraries/tbl_replace_fields.inc.php +++ b/libraries/tbl_replace_fields.inc.php @@ -69,44 +69,31 @@ if (false !== $possibly_uploaded_val) { // $key contains the md5() of the fieldname if (0 === strlen($val)) { - // default - $val = "''"; - - switch ($type) { - case 'enum': - // if we have an enum, then construct the value - case 'set': - // if we have a set, then construct the value - case 'foreign': - // if we have a foreign key, then construct the value - if (! empty($_REQUEST['fields']['multi_edit'][$rownumber][$key])) { - $val = implode(',', $_REQUEST['fields']['multi_edit'][$rownumber][$key]); - $val = "'" . PMA_sqlAddslashes($val) . "'"; - } - break; - case 'protected': - // here we are in protected mode (asked in the config) - // so tbl_change has put this special value in the - // fields array, so we do not change the field value - // but we can still handle field upload - - // when in UPDATE mode, do not alter field's contents. When in INSERT - // mode, insert empty field because no values were submitted. If protected - // blobs where set, insert original fields content. - if (! empty($prot_row[$me_fields_name[$key]])) { - $val = '0x' . bin2hex($prot_row[$me_fields_name[$key]]); - } else { - $val = ''; - } - - break; - default: - // best way to avoid problems in strict mode (works also in non-strict mode) - if (isset($me_auto_increment) && isset($me_auto_increment[$key])) { - $val = 'NULL'; - } - break; + // best way to avoid problems in strict mode (works also in non-strict mode) + if (isset($me_auto_increment) && isset($me_auto_increment[$key])) { + $val = 'NULL'; + } else { + $val = "''"; + } + } elseif ($type == 'set') { + if (! empty($_REQUEST['fields']['multi_edit'][$rownumber][$key])) { + $val = implode(',', $_REQUEST['fields']['multi_edit'][$rownumber][$key]); + $val = "'" . PMA_sqlAddslashes($val) . "'"; } + } elseif ($type == 'protected') { + // here we are in protected mode (asked in the config) + // so tbl_change has put this special value in the + // fields array, so we do not change the field value + // but we can still handle field upload + + // when in UPDATE mode, do not alter field's contents. When in INSERT + // mode, insert empty field because no values were submitted. If protected + // blobs where set, insert original fields content. + if (! empty($prot_row[$me_fields_name[$key]])) { + $val = '0x' . bin2hex($prot_row[$me_fields_name[$key]]); + } else { + $val = ''; + } } elseif ($type == 'bit') { $val = preg_replace('/[^01]/', '0', $val); $val = "b'" . PMA_sqlAddslashes($val) . "'"; diff --git a/tbl_change.php b/tbl_change.php index 6b4446e..eaf0bc3 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -804,7 +804,7 @@ foreach ($rows as $row_id => $vrow) { echo $backup_field . "\n"; ?> <input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>" value="set" /> - <select name="fields<?php echo $field_name_appendix; ?>" + <select name="fields<?php echo $field_name_appendix . '[]'; ?>" class="textfield" size="<?php echo $select_size; ?>" multiple="multiple" <?php echo $unnullify_trigger; ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-868-g4a71a1e
by Marc Delisle 16 Dec '10

16 Dec '10

The branch, master has been updated via 4a71a1e5f1eee17a5ef2349e9a62cbcab7ec4971 (commit) from 62fd44d51e2ca500300fd992c3be4ab070f7a76c (commit) - Log ----------------------------------------------------------------- commit 4a71a1e5f1eee17a5ef2349e9a62cbcab7ec4971 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Dec 16 11:37:24 2010 -0500 bug #3138572 "Continue insertion" problems ----------------------------------------------------------------------- Summary of changes: browse_foreigners.php | 6 +++--- libraries/tbl_replace_fields.inc.php | 8 +++----- tbl_change.php | 21 +++++++++------------ 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/browse_foreigners.php b/browse_foreigners.php index 4cfa543..ef7cf2c 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -98,12 +98,12 @@ if (is_array($foreignData['disp_row'])) { <script type="text/javascript"> //<![CDATA[ self.focus(); - function formupdate(field, key) { + function formupdate(fieldmd5, key) { if (opener && opener.document && opener.document.insertForm) { - var field = 'field_' + field; + var field = 'fields'; <?php if (isset($pk)) { ?> - var element_name = field + '[multi_edit][<?php echo htmlspecialchars($pk); ?>][]'; + var element_name = field + '[multi_edit][<?php echo htmlspecialchars($pk); ?>][' + fieldmd5 + ']'; <?php } else { ?> var element_name = field + '[]'; <?php } ?> diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php index 935587d..3ba08c4 100644 --- a/libraries/tbl_replace_fields.inc.php +++ b/libraries/tbl_replace_fields.inc.php @@ -68,8 +68,6 @@ if (false !== $possibly_uploaded_val) { } // $key contains the md5() of the fieldname - $f = 'field_' . $key; - if (0 === strlen($val)) { // default $val = "''"; @@ -81,8 +79,8 @@ if (false !== $possibly_uploaded_val) { // if we have a set, then construct the value case 'foreign': // if we have a foreign key, then construct the value - if (! empty($_REQUEST[$f]['multi_edit'][$rownumber])) { - $val = implode(',', $_REQUEST[$f]['multi_edit'][$rownumber]); + if (! empty($_REQUEST['fields']['multi_edit'][$rownumber][$key])) { + $val = implode(',', $_REQUEST['fields']['multi_edit'][$rownumber][$key]); $val = "'" . PMA_sqlAddslashes($val) . "'"; } break; @@ -129,5 +127,5 @@ if (false !== $possibly_uploaded_val) { $val = "''"; } } // end else (field value in the form) -unset($type, $f); +unset($type); ?> diff --git a/tbl_change.php b/tbl_change.php index edbddb0..6b4446e 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -411,8 +411,6 @@ foreach ($rows as $row_id => $vrow) { // Use an MD5 as an array index to avoid having special characters in the name atttibute (see bug #1746964 ) $field_name_appendix = $vkey . '[' . $field['Field_md5'] . ']'; - $field_name_appendix_md5 = $field['Field_md5'] . $vkey . '[]'; - if ($field['Type'] == 'datetime' && ! isset($field['Default']) @@ -656,9 +654,7 @@ foreach ($rows as $row_id => $vrow) { ?> <input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>" value="foreign" /> - <input type="hidden" name="fields<?php echo $field_name_appendix; ?>" - value="" id="field_<?php echo ($idindex); ?>_3A" /> - <input type="text" name="field_<?php echo $field_name_appendix_md5; ?>" + <input type="text" name="fields<?php echo $field_name_appendix; ?>" class="textfield" <?php echo $unnullify_trigger; ?> tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" id="field_<?php echo ($idindex); ?>_3" @@ -678,10 +674,9 @@ foreach ($rows as $row_id => $vrow) { ?> <input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>" value="foreign" /> - <input type="hidden" name="fields<?php echo $field_name_appendix; ?>" - value="" id="field_<?php echo $idindex; ?>_3A" /> - <select name="field_<?php echo $field_name_appendix_md5; ?>" + <select name="fields<?php echo $field_name_appendix; ?>" <?php echo $unnullify_trigger; ?> + class="textfield" tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" id="field_<?php echo ($idindex); ?>_3"> <?php echo PMA_foreignDropdown($foreignData['disp_row'], $foreignData['foreign_field'], $foreignData['foreign_display'], $data, $cfg['ForeignKeyMaxLimit']); ?> @@ -744,8 +739,9 @@ foreach ($rows as $row_id => $vrow) { // show dropdown or radio depend on length if (strlen($field['Type']) > 20) { ?> - <select name="field_<?php echo $field_name_appendix_md5; ?>" + <select name="fields<?php echo $field_name_appendix; ?>" <?php echo $unnullify_trigger; ?> + class="textfield" tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" id="field_<?php echo ($idindex); ?>_3"> <option value=""> </option> @@ -772,7 +768,8 @@ foreach ($rows as $row_id => $vrow) { $j = 0; foreach ($field_enum_values as $enum_value) { echo ' '; - echo '<input type="radio" name="field_' . $field_name_appendix_md5 . '"'; + echo '<input type="radio" name="fields' . $field_name_appendix . '"'; + echo ' class="textfield"'; echo ' value="' . $enum_value['html'] . '"'; echo ' id="field_' . ($idindex) . '_3_' . $j . '"'; echo $unnullify_trigger; @@ -807,8 +804,8 @@ foreach ($rows as $row_id => $vrow) { echo $backup_field . "\n"; ?> <input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>" value="set" /> - <input type="hidden" name="fields<?php echo $field_name_appendix; ?>" value="" /> - <select name="field_<?php echo $field_name_appendix_md5; ?>" + <select name="fields<?php echo $field_name_appendix; ?>" + class="textfield" size="<?php echo $select_size; ?>" multiple="multiple" <?php echo $unnullify_trigger; ?> tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-867-g62fd44d
by Michal Čihař 16 Dec '10

16 Dec '10

The branch, master has been updated via 62fd44d51e2ca500300fd992c3be4ab070f7a76c (commit) via 6ba0ee62f589b6d7570daeb7da92f3f72e65c145 (commit) via b5deff1c9f8f7fd8ed8e8d46762d3039701a56e2 (commit) via f8f1de61bef5c504a212ebeb37c637ad121aa8ca (commit) via 8a24231004ce1b3bd6ac8b54a48d5f9633166eac (commit) via 8464670489cb85ebe7c11a29850f2dec98416231 (commit) via 7232aed1160483aaf4580b3634e865ca182161fc (commit) via 0790536797f3004a9315dddb7cd43bbc2a9bf52f (commit) via 35827f22f44e8c9fda7dc3367cb122ef4e8c152c (commit) via d60ba5d2e93fb3ffa924af7da50f1e6a9afa35ae (commit) via b201492806a98bf943e1a7d4aa4c0f1c90d76877 (commit) via ad5549831ddd3fa6a9e67a89b14b92259d1b375c (commit) via 0d8371d0535fde1ffe9deaeb6caa45bb674ada63 (commit) via dc2b1847aaac26bad17a461942908eedd7d20d0e (commit) via 9c15bbe3d64bad1937348bcb6058c3dc14c1c3f3 (commit) via 3aff11fdd626e9dbc3871f2896d3d81bcc9114c3 (commit) via e8a7dd01a2d5d8a0ff26c1ce2526187a46d62778 (commit) via 9c8db77d9f1cba7b94069d8ec9a27119f2a9780f (commit) via 1161235a98e4e6040634c8627ffd3c7128a96e05 (commit) via 88975e07c93f6a01ea4db5a35164271766ee1295 (commit) via 82fa07a19955a4229459fc7f7b3dc40fa2c6b963 (commit) via ebf0324f22e6f6ba4f5a337e2b37405ebdf8445f (commit) via ddf0f29b3251b547dfc1373a232551a45bd780a1 (commit) via 3e1ae88faaee4d25afcece2310bd951977aa49c6 (commit) via 52a3b77eb8e6ba06b10d5746edda31f6e3a3a093 (commit) via f74f294e838e1514b47fd2330d632b037e949548 (commit) via 00c6b82ae7b22e0c84a8461f090bf992f45c45cc (commit) via 4d26da6cfd9256e5a021c4e3bf7d71506f671d09 (commit) via f50b2991d2aeaf838c4b9ec1769454068bd0c985 (commit) via 1aa24c87dabb00ea8aca4beb06a63104940c861c (commit) via 3ec261a4e11fec21ec5a3de90c3175f0444c43e8 (commit) via 089ce7155b3bfd233b9a06126a751a056459a5c2 (commit) via 8970d181c7607e72e76826396840ff20dc5a5694 (commit) via b0acb02695cced80febea15a7cc32f57723d42e8 (commit) via 76db77c0ca94c412945ac50e60c9cdc55dc6b3f7 (commit) via 1d88a1ddf11bb1114670da45dc8d013ed589df47 (commit) via 0aaa0769370916b7a9108a5441fbf54c8188c2f6 (commit) via 15af1dead0281d214c4a1edf7bd48857d201cfe2 (commit) via e6f9a7086a28494db47d19ba223593d09c3e4463 (commit) via cf0a87de6152dec78375bb31417e7710b1e5c7b7 (commit) via 2617ce57429671a446e8f89af4a99648004e1a56 (commit) via 3087237f3a439aa0a4bb3caca77385ab334b1de2 (commit) via 8fd78e7924b300bfa7b78706bacfe6f0a7e7df95 (commit) via 39734d025766178be271d850554b5219b79ec8b5 (commit) via 167bdc60b13c37f5825f754f2b5ac697bffc38a7 (commit) via 5fc01e2bffee3ba73412aa48c77bd55e52269351 (commit) via 4261e517dd861aff0da00da24c9c29f4ddfdccad (commit) via e2a9fc2b72be9a62890853f16252ed03f4203f89 (commit) via 5f868061fad5485b8b18753c7d992b24d526d340 (commit) via fef6f755976c798b57c3c4fa5478bae3cbec984d (commit) via 56bf16f91fac5093cb82b481e4af4d82b8b75d12 (commit) via 52067d5d89459aa10273e92573f0ffe0d8ad42dd (commit) via ff0b9e0ef6c6fafd04f1a12f799b3f01e6f90f22 (commit) via df058023ea452cec358a916aca9af96b7018f5a6 (commit) via bcc90ddfaddac5a1abaa39c2f98478e46a5ec0c9 (commit) via ca1c8a6b051982783a71cdef933cceb01e10423b (commit) via 35a48503e83c7b0f0b9efcfbf28a9777aa90a711 (commit) via 50ec4f0fc567de0b4e678d65d638f3ea5052e069 (commit) via 011aa8c866cf114330a9fd20097174f21fc27959 (commit) via 8c5e52c9c2973e112b41427ba5c2379f2106858c (commit) via bceb8d076625b17e9f9f484896e1d7ed99de02a2 (commit) from 92008fc9b1677fada4c41bc89dc5a29e6f584684 (commit) - Log ----------------------------------------------------------------- commit 62fd44d51e2ca500300fd992c3be4ab070f7a76c Author: Michal Čihař <michal(a)cihar.com> Date: Thu Dec 16 09:05:45 2010 +0100 Fix format string. commit 6ba0ee62f589b6d7570daeb7da92f3f72e65c145 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 02:40:07 2010 +0200 Translation update done using Pootle. commit b5deff1c9f8f7fd8ed8e8d46762d3039701a56e2 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 02:39:39 2010 +0200 Translation update done using Pootle. commit f8f1de61bef5c504a212ebeb37c637ad121aa8ca Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 02:39:30 2010 +0200 Translation update done using Pootle. commit 8a24231004ce1b3bd6ac8b54a48d5f9633166eac Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 02:39:18 2010 +0200 Translation update done using Pootle. commit 8464670489cb85ebe7c11a29850f2dec98416231 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 02:38:45 2010 +0200 Translation update done using Pootle. commit 7232aed1160483aaf4580b3634e865ca182161fc Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 02:38:23 2010 +0200 Translation update done using Pootle. commit 0790536797f3004a9315dddb7cd43bbc2a9bf52f Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 02:37:59 2010 +0200 Translation update done using Pootle. commit 35827f22f44e8c9fda7dc3367cb122ef4e8c152c Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 02:37:15 2010 +0200 Translation update done using Pootle. commit d60ba5d2e93fb3ffa924af7da50f1e6a9afa35ae Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 02:36:07 2010 +0200 Translation update done using Pootle. commit b201492806a98bf943e1a7d4aa4c0f1c90d76877 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 02:35:49 2010 +0200 Translation update done using Pootle. commit ad5549831ddd3fa6a9e67a89b14b92259d1b375c Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 02:34:54 2010 +0200 Translation update done using Pootle. commit 0d8371d0535fde1ffe9deaeb6caa45bb674ada63 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 01:33:44 2010 +0200 Translation update done using Pootle. commit dc2b1847aaac26bad17a461942908eedd7d20d0e Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 01:14:36 2010 +0200 Translation update done using Pootle. commit 9c15bbe3d64bad1937348bcb6058c3dc14c1c3f3 Author: Domen <dbc334(a)gmail.com> Date: Thu Dec 16 00:56:44 2010 +0200 Translation update done using Pootle. commit 3aff11fdd626e9dbc3871f2896d3d81bcc9114c3 Author: Domen <dbc334(a)gmail.com> Date: Thu Dec 16 00:56:35 2010 +0200 Translation update done using Pootle. commit e8a7dd01a2d5d8a0ff26c1ce2526187a46d62778 Author: Domen <dbc334(a)gmail.com> Date: Thu Dec 16 00:56:25 2010 +0200 Translation update done using Pootle. commit 9c8db77d9f1cba7b94069d8ec9a27119f2a9780f Author: Domen <dbc334(a)gmail.com> Date: Thu Dec 16 00:56:21 2010 +0200 Translation update done using Pootle. commit 1161235a98e4e6040634c8627ffd3c7128a96e05 Author: Domen <dbc334(a)gmail.com> Date: Thu Dec 16 00:56:10 2010 +0200 Translation update done using Pootle. commit 88975e07c93f6a01ea4db5a35164271766ee1295 Author: Domen <dbc334(a)gmail.com> Date: Thu Dec 16 00:56:03 2010 +0200 Translation update done using Pootle. commit 82fa07a19955a4229459fc7f7b3dc40fa2c6b963 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:54:12 2010 +0200 Translation update done using Pootle. commit ebf0324f22e6f6ba4f5a337e2b37405ebdf8445f Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:41:57 2010 +0200 Translation update done using Pootle. commit ddf0f29b3251b547dfc1373a232551a45bd780a1 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:37:02 2010 +0200 Translation update done using Pootle. commit 3e1ae88faaee4d25afcece2310bd951977aa49c6 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:18:16 2010 +0200 Translation update done using Pootle. commit 52a3b77eb8e6ba06b10d5746edda31f6e3a3a093 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:16:42 2010 +0200 Translation update done using Pootle. commit f74f294e838e1514b47fd2330d632b037e949548 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:16:28 2010 +0200 Translation update done using Pootle. commit 00c6b82ae7b22e0c84a8461f090bf992f45c45cc Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:15:09 2010 +0200 Translation update done using Pootle. commit 4d26da6cfd9256e5a021c4e3bf7d71506f671d09 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:13:50 2010 +0200 Translation update done using Pootle. commit f50b2991d2aeaf838c4b9ec1769454068bd0c985 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:13:41 2010 +0200 Translation update done using Pootle. commit 1aa24c87dabb00ea8aca4beb06a63104940c861c Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:12:43 2010 +0200 Translation update done using Pootle. commit 3ec261a4e11fec21ec5a3de90c3175f0444c43e8 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:11:47 2010 +0200 Translation update done using Pootle. commit 089ce7155b3bfd233b9a06126a751a056459a5c2 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:09:33 2010 +0200 Translation update done using Pootle. commit 8970d181c7607e72e76826396840ff20dc5a5694 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:08:07 2010 +0200 Translation update done using Pootle. commit b0acb02695cced80febea15a7cc32f57723d42e8 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:07:36 2010 +0200 Translation update done using Pootle. commit 76db77c0ca94c412945ac50e60c9cdc55dc6b3f7 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:06:54 2010 +0200 Translation update done using Pootle. commit 1d88a1ddf11bb1114670da45dc8d013ed589df47 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:06:13 2010 +0200 Translation update done using Pootle. commit 0aaa0769370916b7a9108a5441fbf54c8188c2f6 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:04:16 2010 +0200 Translation update done using Pootle. commit 15af1dead0281d214c4a1edf7bd48857d201cfe2 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:03:17 2010 +0200 Translation update done using Pootle. commit e6f9a7086a28494db47d19ba223593d09c3e4463 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:00:40 2010 +0200 Translation update done using Pootle. commit cf0a87de6152dec78375bb31417e7710b1e5c7b7 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:00:01 2010 +0200 Translation update done using Pootle. commit 2617ce57429671a446e8f89af4a99648004e1a56 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 23:59:33 2010 +0200 Translation update done using Pootle. commit 3087237f3a439aa0a4bb3caca77385ab334b1de2 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 23:58:33 2010 +0200 Translation update done using Pootle. commit 8fd78e7924b300bfa7b78706bacfe6f0a7e7df95 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 23:48:51 2010 +0200 Translation update done using Pootle. commit 39734d025766178be271d850554b5219b79ec8b5 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 23:46:28 2010 +0200 Translation update done using Pootle. commit 167bdc60b13c37f5825f754f2b5ac697bffc38a7 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 23:44:05 2010 +0200 Translation update done using Pootle. commit 5fc01e2bffee3ba73412aa48c77bd55e52269351 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 23:40:40 2010 +0200 Translation update done using Pootle. commit 4261e517dd861aff0da00da24c9c29f4ddfdccad Merge: e2a9fc2b72be9a62890853f16252ed03f4203f89 92008fc9b1677fada4c41bc89dc5a29e6f584684 Author: Pootle server <pootle(a)cihar.com> Date: Wed Dec 15 20:40:08 2010 +0100 Merge remote branch 'origin/master' commit e2a9fc2b72be9a62890853f16252ed03f4203f89 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 20:33:34 2010 +0200 Translation update done using Pootle. commit 5f868061fad5485b8b18753c7d992b24d526d340 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 20:31:31 2010 +0200 Translation update done using Pootle. commit fef6f755976c798b57c3c4fa5478bae3cbec984d Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 20:30:23 2010 +0200 Translation update done using Pootle. commit 56bf16f91fac5093cb82b481e4af4d82b8b75d12 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 20:29:38 2010 +0200 Translation update done using Pootle. commit 52067d5d89459aa10273e92573f0ffe0d8ad42dd Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 15 19:14:21 2010 +0200 Translation update done using Pootle. commit ff0b9e0ef6c6fafd04f1a12f799b3f01e6f90f22 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 15 19:14:12 2010 +0200 Translation update done using Pootle. commit df058023ea452cec358a916aca9af96b7018f5a6 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 15 19:14:07 2010 +0200 Translation update done using Pootle. commit bcc90ddfaddac5a1abaa39c2f98478e46a5ec0c9 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 15 19:14:02 2010 +0200 Translation update done using Pootle. commit ca1c8a6b051982783a71cdef933cceb01e10423b Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 15 19:13:56 2010 +0200 Translation update done using Pootle. commit 35a48503e83c7b0f0b9efcfbf28a9777aa90a711 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 15 19:13:38 2010 +0200 Translation update done using Pootle. commit 50ec4f0fc567de0b4e678d65d638f3ea5052e069 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 15 19:13:19 2010 +0200 Translation update done using Pootle. commit 011aa8c866cf114330a9fd20097174f21fc27959 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 15 19:13:00 2010 +0200 Translation update done using Pootle. commit 8c5e52c9c2973e112b41427ba5c2379f2106858c Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 15 16:12:18 2010 +0200 Translation update done using Pootle. commit bceb8d076625b17e9f9f484896e1d7ed99de02a2 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 15 16:11:35 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/en_GB.po | 136 +++------------------------------------------------------- po/fr.po | 19 +++----- po/sl.po | 23 ++++------ po/uk.po | 103 +++++++++++++++++++------------------------- 4 files changed, 68 insertions(+), 213 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 44934b1..d18ef9f 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-14 11:27-0500\n" -"PO-Revision-Date: 2010-12-08 12:48+0200\n" +"PO-Revision-Date: 2010-12-15 19:14+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -7000,34 +7000,29 @@ msgid "Page creation failed" msgstr "Page creation failed" #: pmd_pdf.php:89 -#, fuzzy #| msgid "pages" msgid "Page" -msgstr "pages" +msgstr "Page" #: pmd_pdf.php:99 -#, fuzzy #| msgid "Import from file" msgid "Import from selected page" -msgstr "Import from file" +msgstr "Import from selected page" #: pmd_pdf.php:100 -#, fuzzy #| msgid "Export/Import to scale" msgid "Export to selected page" -msgstr "Export/Import to scale" +msgstr "Export to selected page" #: pmd_pdf.php:102 -#, fuzzy #| msgid "Create a new index" msgid "Create a page and export to it" -msgstr "Create a new index" +msgstr "Create a page and export to it" #: pmd_pdf.php:111 -#, fuzzy #| msgid "New name" msgid "New page name: " -msgstr "New name" +msgstr "New page name: " #: pmd_pdf.php:114 msgid "Export/Import to scale" @@ -9804,120 +9799,3 @@ msgstr "Rename view to" #~ msgid "Disable Statistics" #~ msgstr "Disable Statistics" - -#~| msgid "Hide query box" -#~ msgid "Hide query chart" -#~ msgstr "Hide query chart" - -#~ msgid "Start" -#~ msgstr "Start" - -#~ msgid "Stop" -#~ msgstr "Stop" - -#~ msgid "Display table filter" -#~ msgstr "Display table filter" - -#~ msgid "" -#~ "The additional features for working with linked tables have been " -#~ "deactivated. To find out why click %shere%s." -#~ msgstr "" -#~ "The additional features for working with linked tables have been " -#~ "deactivated. To find out why click %shere%s." - -#~ msgid "Ignore duplicate rows" -#~ msgstr "Ignore duplicate rows" - -#~ msgid "Execute bookmarked query" -#~ msgstr "Execute bookmarked query" - -#~ msgid "No tables" -#~ msgstr "No tables" - -#~ msgid "Field navigation using Ctrl+Arrows" -#~ msgstr "Field navigation using Ctrl+Arrows" - -#~ msgid "Toggle Query Box Visibility" -#~ msgstr "Toggle Query Box Visibility" - -#~ msgid "SVG" -#~ msgstr "SVG" - -#~ msgid "DIA" -#~ msgstr "DIA" - -#~ msgid "VISIO" -#~ msgstr "VISIO" - -#~ msgid "EPS" -#~ msgstr "EPS" - -#~ msgid "" -#~ "This [a@?page=form&formset=features#tab_Security]option[/a] should be " -#~ "enabled if your web server supports it" -#~ msgstr "" -#~ "This [a@?page=form&formset=features#tab_Security]option[/a] should be " -#~ "enabled if your web server supports it" - -#~ msgid "" -#~ "Enter each value in a separate field, enclosed in single quotes. If you " -#~ "ever need to put a backslash (\"\\\") or a single quote (\"'\") amongst " -#~ "those values, precede it with a backslash (for example '\\\\xyz' or 'a" -#~ "\\'b')." -#~ msgstr "" -#~ "Enter each value in a separate field, enclosed in single quotes. If you " -#~ "ever need to put a backslash (\"\\\") or a single quote (\"'\") amongst " -#~ "those values, precede it with a backslash (for example '\\\\xyz' or 'a" -#~ "\\'b')." - -#~ msgid "" -#~ "Enter each value in a separate field. If you ever need to put a backslash " -#~ "(\"\\\") or a single quote (\"'\") amongst those values, precede it with " -#~ "a backslash (for example '\\\\xyz' or 'a\\'b')." -#~ msgstr "" -#~ "Enter each value in a separate field. If you ever need to put a backslash " -#~ "(\"\\\") or a single quote (\"'\") amongst those values, precede it with " -#~ "a backslash (for example '\\\\xyz' or 'a\\'b')." - -#~ msgid "Debug PHP" -#~ msgstr "Debug PHP" - -#~ msgid "New table" -#~ msgstr "New table" - -#~ msgid "server name" -#~ msgstr "server name" - -#~ msgid "database name" -#~ msgstr "database name" - -#~ msgid "Edit PDF Pages" -#~ msgstr "Edit PDF Pages" - -#~ msgid "Data Dictionary Format" -#~ msgstr "Data Dictionary Format" - -#~ msgid "Method" -#~ msgstr "Method" - -#~ msgid "no" -#~ msgstr "no" - -#~ msgid "Enter login options for signon authentication" -#~ msgstr "Enter login options for signon authentication" - -#~ msgid "Signon login options" -#~ msgstr "Signon login options" - -#~ msgid "PMA database" -#~ msgstr "PMA database" - -#~ msgid "" -#~ "SQL queries settings, for SQL Query box options see [a@?page=form&" -#~ "formset=main_frame#tab_Sql_box]Navigation frame[/a] settings" -#~ msgstr "" -#~ "SQL queries settings, for SQL Query box options see [a@?page=form&" -#~ "formset=main_frame#tab_Sql_box]Navigation frame[/a] settings" - -#~ msgid "yes" -#~ msgstr "yes" diff --git a/po/fr.po b/po/fr.po index 5309141..e59c981 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-14 11:27-0500\n" -"PO-Revision-Date: 2010-12-14 18:08+0200\n" +"PO-Revision-Date: 2010-12-15 19:13+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -7085,34 +7085,29 @@ msgid "Page creation failed" msgstr "Échec de création de page" #: pmd_pdf.php:89 -#, fuzzy #| msgid "pages" msgid "Page" -msgstr "pages" +msgstr "Page" #: pmd_pdf.php:99 -#, fuzzy #| msgid "Import from file" msgid "Import from selected page" -msgstr "Importer depuis le fichier" +msgstr "Importer depuis la page sélectionnée" #: pmd_pdf.php:100 -#, fuzzy #| msgid "Export/Import to scale" msgid "Export to selected page" -msgstr "Exporter/Importer à l'échelle" +msgstr "Exporter vers la page sélectionnée" #: pmd_pdf.php:102 -#, fuzzy #| msgid "Create a new index" msgid "Create a page and export to it" -msgstr "Créer un nouvel index" +msgstr "Créer une page et y exporter" #: pmd_pdf.php:111 -#, fuzzy #| msgid "New name" msgid "New page name: " -msgstr "Nouveau nom" +msgstr "Nom de la nouvelle page : " #: pmd_pdf.php:114 msgid "Export/Import to scale" diff --git a/po/sl.po b/po/sl.po index 533bc8f..9a8d641 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-14 11:27-0500\n" -"PO-Revision-Date: 2010-12-12 13:02+0200\n" +"PO-Revision-Date: 2010-12-16 00:56+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -7038,34 +7038,29 @@ msgid "Page creation failed" msgstr "Ustvarjanje strani je spodletelo" #: pmd_pdf.php:89 -#, fuzzy #| msgid "pages" msgid "Page" -msgstr "strani" +msgstr "Stran" #: pmd_pdf.php:99 -#, fuzzy #| msgid "Import from file" msgid "Import from selected page" -msgstr "Uvozi iz datoteke" +msgstr "Uvozi z izbrane strani" #: pmd_pdf.php:100 -#, fuzzy #| msgid "Export/Import to scale" msgid "Export to selected page" -msgstr "Izvozi/Uvozi v razmerju" +msgstr "Izvozi na izbrano stran" #: pmd_pdf.php:102 -#, fuzzy #| msgid "Create a new index" msgid "Create a page and export to it" -msgstr "Ustvari nov indeks" +msgstr "Ustvari stran in izvozi nanjo" #: pmd_pdf.php:111 -#, fuzzy #| msgid "New name" msgid "New page name: " -msgstr "Novo ime" +msgstr "Ime nove strani: " #: pmd_pdf.php:114 msgid "Export/Import to scale" diff --git a/po/uk.po b/po/uk.po index 86a8683..93a63f3 100644 --- a/po/uk.po +++ b/po/uk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-14 11:27-0500\n" -"PO-Revision-Date: 2010-12-15 01:52+0200\n" +"PO-Revision-Date: 2010-12-16 02:40+0200\n" "Last-Translator: Olexiy Zagorskyi <zalex_ua(a)i.ua>\n" "Language-Team: ukrainian <uk(a)li.org>\n" "Language: uk\n" @@ -298,7 +298,7 @@ msgstr "Лише дані" #: db_operations.php:491 msgid "CREATE DATABASE before copying" -msgstr "" +msgstr "Перед копіюванням створити базу даних (CREATE DATABASE)" #: db_operations.php:494 libraries/config/messages.inc.php:122 #: libraries/config/messages.inc.php:123 libraries/config/messages.inc.php:125 @@ -310,11 +310,11 @@ msgstr "Додати %s" #: db_operations.php:498 libraries/config/messages.inc.php:115 #: tbl_operations.php:296 tbl_operations.php:540 msgid "Add AUTO_INCREMENT value" -msgstr "" +msgstr "Додати AUTO_INCREMENT значення" #: db_operations.php:502 tbl_operations.php:547 msgid "Add constraints" -msgstr "" +msgstr "Додати constraints" #: db_operations.php:515 msgid "Switch to copied database" @@ -331,7 +331,7 @@ msgid "Collation" msgstr "Порівняння" #: db_operations.php:548 -#, fuzzy, php-format +#, php-format #| msgid "" #| "The additional features for working with linked tables have been " #| "deactivated. To find out why click %shere%s." @@ -339,8 +339,8 @@ msgid "" "The phpMyAdmin configuration storage has been deactivated. To find out why " "click %shere%s." msgstr "" -"Додаткова можливість роботи із залінкованими таблицями деактивована. Для " -"того, щоб довідатись чому, натисніть %sтут%s." +"Сховище конфігурації phpMyAdmin деактивовано. Для того, щоб довідатись чому, " +"натисніть %sтут%s." #: db_operations.php:581 #, fuzzy @@ -356,7 +356,7 @@ msgstr "Схема зв'язків" #: server_synchronize.php:421 server_synchronize.php:864 tbl_tracking.php:586 #: test/theme.php:74 msgid "Table" -msgstr "таблиця " +msgstr "Таблиця" #: db_printview.php:103 libraries/build_html_for_db.lib.php:30 #: libraries/db_structure.lib.php:47 libraries/header_printview.inc.php:62 @@ -467,7 +467,7 @@ msgstr "Видалити" #: libraries/tbl_properties.inc.php:778 server_privileges.php:298 #: tbl_change.php:928 tbl_indexes.php:248 tbl_select.php:284 msgid "Or" -msgstr "або" +msgstr "Або" #: db_qbe.php:526 msgid "Modify" @@ -527,12 +527,13 @@ msgid "Search results for \"<i>%s</i>\" %s:" msgstr "Результати пошуку \"<i>%s</i>\" %s:" #: db_search.php:248 -#, fuzzy, php-format +#, php-format #| msgid "%s match(es) inside table <i>%s</i>" msgid "%s match inside table <i>%s</i>" msgid_plural "%s matches inside table <i>%s</i>" msgstr[0] "%s співпадіння у таблиці <i>%s</i>" msgstr[1] "%s співпадіння у таблиці <i>%s</i>" +msgstr[2] "%s співпадінь у таблиці <i>%s</i>" #: db_search.php:255 libraries/common.lib.php:2818 #: libraries/common.lib.php:2996 libraries/common.lib.php:2997 @@ -911,7 +912,7 @@ msgstr "Назад" #: index.php:183 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser." -msgstr "Для роботи phpMyAdmin потрібно браузер з підтримкою <b>фреймів</b>." +msgstr "phpMyAdmin є більш зручним в браузері з підтримкою <b>фреймів</b>." #: js/messages.php:25 server_synchronize.php:343 server_synchronize.php:355 #: server_synchronize.php:371 server_synchronize.php:378 @@ -992,28 +993,24 @@ msgid "The passwords aren't the same!" msgstr "Паролі не однакові!" #: js/messages.php:52 -#, fuzzy #| msgid "Add a new User" msgid "Add a New User" msgstr "Додати нового користувача" #: js/messages.php:53 -#, fuzzy #| msgid "Create" msgid "Create User" -msgstr "Створити" +msgstr "Створити користувача" #: js/messages.php:54 -#, fuzzy #| msgid "Reloading the privileges" msgid "Reloading Privileges" msgstr "Перезавантаження прав" #: js/messages.php:55 -#, fuzzy #| msgid "Remove selected users" msgid "Removing Selected Users" -msgstr "Усунути відмічених користувачів" +msgstr "Видалити відмічених користувачів" #: js/messages.php:56 tbl_tracking.php:245 tbl_tracking.php:373 msgid "Close" @@ -1096,10 +1093,9 @@ msgid "Searching" msgstr "Шукати" #: js/messages.php:84 -#, fuzzy #| msgid "in query" msgid "Hide query box" -msgstr "по запиту" +msgstr "Сховати блок запиту" #: js/messages.php:85 #, fuzzy @@ -1444,10 +1440,9 @@ msgid "Hour" msgstr "" #: js/messages.php:208 -#, fuzzy #| msgid "in use" msgid "Minute" -msgstr "використовується" +msgstr "Хвилина" #: js/messages.php:209 #, fuzzy @@ -1885,13 +1880,13 @@ msgid "" "semicolon is missing somewhere.<br />If you receive a blank page, everything " "is fine." msgstr "" -"phpMyAdmin не може прочитати ваш конфігураційний файл <br />Це може статися " -"у тому випадку, коли php натрапить на синтаксичну помилку (parse error) у " -"ньому, або не може знайти самого файлу.<br />Завантажте конфігураційний файл " -"безпосередньо за допомогою посилання поданого нижче і прочитайте отримані " -"повідомлення про помилки (php error messages). Найчастіше десь у файлі " -"просто бракує лапок чи двокрапки. <br />Якщо Ви отримаєте порожню сторінку, " -"- значить все в порядку." +"phpMyAdmin не може прочитати ваш конфігураційний файл!<br />Це може статися " +"у тому випадку, коли PHP натрапить на синтаксичну помилку у ньому, або не " +"може знайти самого файлу.<br />Завантажте конфігураційний файл безпосередньо " +"за допомогою посилання поданого нижче і прочитайте отримані повідомлення " +"про помилки (PHP error messages). Найчастіше десь у файлі просто бракує " +"лапок чи крапки з комою. <br />Якщо Ви отримаєте порожню сторінку - значить " +"все в порядку." #: libraries/common.inc.php:586 #, php-format @@ -1904,7 +1899,7 @@ msgid "" "configuration file!" msgstr "" "Змінна <tt>$cfg['PmaAbsoluteUri']</tt> ПОВИННА бути встановлена у Вашому " -"конфіґураційному файлі!" +"конфігураційному файлі!" #: libraries/common.inc.php:621 #, php-format @@ -2130,10 +2125,10 @@ msgid "Browse your computer:" msgstr "" #: libraries/common.lib.php:2963 -#, fuzzy, php-format +#, php-format #| msgid "web server upload directory" msgid "Select from the web server upload directory <b>%s</b>:" -msgstr "каталог веб-сервера для завантаження файлів (upload directory)" +msgstr "Виберіть з каталога веб-сервера для завантаження файлів <b>%s</b>:" #: libraries/common.lib.php:2975 libraries/sql_query_form.lib.php:496 #: tbl_change.php:925 @@ -2253,10 +2248,9 @@ msgid "SQL Validator is disabled" msgstr "" #: libraries/config/FormDisplay.class.php:764 -#, fuzzy #| msgid "Link not found" msgid "SOAP extension not found" -msgstr "Лінк не знайдено" +msgstr "SOA розширення не знайдено" #: libraries/config/FormDisplay.class.php:772 #, php-format @@ -2613,11 +2607,10 @@ msgstr "" #: libraries/config/messages.inc.php:138 libraries/export/htmlword.php:23 #: libraries/export/latex.php:39 libraries/export/odt.php:31 #: libraries/export/sql.php:77 libraries/export/texytext.php:22 -#, fuzzy #| msgid "%s table" #| msgid_plural "%s tables" msgid "Dump table" -msgstr "%s таблиця" +msgstr "Дамп таблиці" #: libraries/config/messages.inc.php:88 libraries/export/latex.php:31 msgid "Include table caption" @@ -2998,10 +2991,9 @@ msgid "Customize links shown in SQL Query boxes" msgstr "" #: libraries/config/messages.inc.php:214 -#, fuzzy #| msgid "Server variables and settings" msgid "SQL queries settings" -msgstr "Змінні сервера та налаштування" +msgstr "Налаштування SQL запитів" #: libraries/config/messages.inc.php:215 #, fuzzy @@ -3490,10 +3482,9 @@ msgid "Query window height" msgstr "Вікно запиту" #: libraries/config/messages.inc.php:339 -#, fuzzy #| msgid "Query window" msgid "Query window width (in pixels)" -msgstr "Вікно запиту" +msgstr "Ширина вікна запиту (в пікселях)" #: libraries/config/messages.inc.php:340 #, fuzzy @@ -4450,16 +4441,14 @@ msgid "Custom - display all possible options" msgstr "" #: libraries/display_export.lib.php:137 -#, fuzzy #| msgid "Databases" msgid "Database(s):" -msgstr "Бази Даних" +msgstr "База(и) даних:" #: libraries/display_export.lib.php:139 -#, fuzzy #| msgid "Tables" msgid "Table(s):" -msgstr "Таблиць" +msgstr "Таблиця(ь):" #: libraries/display_export.lib.php:149 #, fuzzy @@ -4682,20 +4671,20 @@ msgstr "рядків з" #: libraries/display_tbl.lib.php:314 msgid "horizontal" -msgstr " горизонтально " +msgstr " горизонтальному" #: libraries/display_tbl.lib.php:315 msgid "horizontal (rotated headers)" -msgstr "горизонтально (rotated headers)" +msgstr "горизонтальному (повернуті заголовки)" #: libraries/display_tbl.lib.php:316 msgid "vertical" -msgstr " вертикально " +msgstr "вертикальному" #: libraries/display_tbl.lib.php:322 #, php-format msgid "in %s mode and repeat headers after %s cells" -msgstr "-го %s і дублювати заголовки через кожні %s рядків " +msgstr "в %s режимі і дублювати заголовки через кожні %s рядків " #: libraries/display_tbl.lib.php:510 msgid "Sort by key" @@ -5236,10 +5225,9 @@ msgid "(continued)" msgstr "" #: libraries/export/latex.php:15 -#, fuzzy #| msgid "Table structure for table" msgid "Structure of table @TABLE@" -msgstr "Структура таблиці" +msgstr "Структура таблиці @TABLE@" #: libraries/export/latex.php:47 libraries/export/odt.php:39 #: libraries/export/sql.php:87 @@ -6373,8 +6361,8 @@ msgid "" "The SQL validator could not be initialized. Please check if you have " "installed the necessary PHP extensions as described in the %sdocumentation%s." msgstr "" -"Не можу запустити перевірку SQL. Прошу проконтролювати чи заінстальовано " -"необхідні php extensions як описано в %sдокументації%s." +"Не можу запустити перевірку SQL. Прошу проконтролювати чи інстальовані " +"необхідні PHP extensions як описано в %sдокументації%s." #: libraries/tbl_links.inc.php:106 libraries/tbl_links.inc.php:107 msgid "Table seems to be empty!" @@ -6459,8 +6447,8 @@ msgid "" "No description is available for this transformation.<br />Please ask the " "author what %s does." msgstr "" -"Немає опису для цього перетворення.<br />Прошу питатися автора, що робить %" -"s." +"Немає опису для цього перетворення.<br />Будь ласка запитайте автора, що " +"робить %s." #: libraries/tbl_properties.inc.php:725 server_engines.php:56 #: tbl_operations.php:352 @@ -6579,9 +6567,9 @@ msgid "" "option is a URL prefix like \"http://www.example.com/\". The second and " "third options are the width and the height in pixels." msgstr "" -"Показує посилання, поле містить назву файлу. Перша опція - префікс " -"посилання, подібно до \"http://www.example.com/\". Друга опція - заголовок для " -"посилання." +"Показує картинку та посилання; поле містить назву файлу. Перша опція - " +"префікс посилання, подібно до \"http://www.example.com/\". Друга та третя " +"опції це відповідно висота та ширина в пікселях." #: libraries/transformations/text_plain__link.inc.php:9 #| msgid "" @@ -9278,10 +9266,9 @@ msgid "Empty the table (TRUNCATE)" msgstr "" #: tbl_operations.php:682 -#, fuzzy #| msgid "No databases" msgid "Delete the table (DROP)" -msgstr "БД відсутні" +msgstr "Видалити таюлицю (DROP)" #: tbl_operations.php:703 msgid "Partition maintenance" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-806-g92008fc
by Marc Delisle 15 Dec '10

15 Dec '10

The branch, master has been updated via 92008fc9b1677fada4c41bc89dc5a29e6f584684 (commit) via 3b7a23ca21988099e4f1a5e4d1832dfc4540e4fa (commit) from d33594fcb96520b9d9bf0be672d3b48ab72d9146 (commit) - Log ----------------------------------------------------------------- commit 92008fc9b1677fada4c41bc89dc5a29e6f584684 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 15 13:26:33 2010 -0500 Avoid recreating a jQuery object Remove tab characters commit 3b7a23ca21988099e4f1a5e4d1832dfc4540e4fa Author: dylfin <dylfin(a)gmail.com> Date: Wed Dec 15 13:16:28 2010 -0500 Fix clear button Script was adapted to use jquery Fix input box for all browsers ----------------------------------------------------------------------- Summary of changes: js/navigation.js | 36 ++++++------------------ navigation.php | 2 +- themes/darkblue_orange/css/theme_right.css.php | 10 ++++-- themes/original/css/theme_left.css.php | 10 ++++-- 4 files changed, 22 insertions(+), 36 deletions(-) diff --git a/js/navigation.js b/js/navigation.js index 280117f..ed6dcb1 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -141,36 +141,18 @@ function PMA_setCookie(name, value, expires, path, domain, secure) { /** * hide all LI elements with second A tag which doesn`t contain requested value * - * @param string value requested value + * @param string value requested value * */ function fast_filter(value){ - var oTarget = document.getElementById("subel0"); - if(!oTarget || !document.getElementById('fast_filter')) return false; - if(value!=document.getElementById('fast_filter').value) return false; - document.getElementById('fast_filter').disabled=true; - for(var iCh in oTarget.childNodes){ - var oCh = oTarget.childNodes.item(iCh); - if(!oCh) continue; - if(oCh.nodeName=="LI"){ - if(value=="") oCh.style.display=""; - else{ - var i=0; - for(var iA in oCh.childNodes){ - var oA = oCh.childNodes.item(iA); - if(!oA) continue; - if(oA.nodeName=="A"){ - if(i==0) i = 1; - else{ - if(oA.innerHTML.indexOf(value)==-1) oCh.style.display="none"; - else oCh.style.display=""; - } - } - } - } - } - } - document.getElementById('fast_filter').disabled=false; + $("#subel0 a[class!='tableicon']").each(function(idx,elem){ + $elem = $(elem); + if (value && $elem.html().indexOf(value) == -1) { + $elem.parent().hide(); + } else { + $elem.parent().show(); + } + }); } /** diff --git a/navigation.php b/navigation.php index d312a0c..fdb6502 100644 --- a/navigation.php +++ b/navigation.php @@ -289,8 +289,8 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { if ($table_count >= $GLOBALS['cfg']['LeftDisplayTableFilterMinimum']) { ?> <span id="NavFilter"> - <input type="text" name="fast_filter" id="fast_filter" title="<?php echo __('Filter'); ?>" value="<?php echo __('filter tables by name'); ?>" /> <span id="clear_fast_filter" title="<?php echo __('Clear'); ?>">X</span> + <input type="text" name="fast_filter" id="fast_filter" title="<?php echo __('Filter'); ?>" value="<?php echo __('filter tables by name'); ?>" /> </span> <?php } diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php index e36f770..438e04d 100644 --- a/themes/darkblue_orange/css/theme_right.css.php +++ b/themes/darkblue_orange/css/theme_right.css.php @@ -1402,14 +1402,16 @@ table#serverconnection_trg_local { color: black; cursor: pointer; padding: 0; - margin: 0; + margin: 3px 5px 0 -23px; position: relative; - right: 3ex; + float: right; } #fast_filter { - width: 85%; - padding: 0.1em; + width: 100%; + padding:2px 0px; + margin:0; + border:0; } /** * Validation error message styles diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php index 0fcaf21..9bb3c39 100644 --- a/themes/original/css/theme_left.css.php +++ b/themes/original/css/theme_left.css.php @@ -247,12 +247,14 @@ div#left_tableList ul ul { color: black; cursor: pointer; padding: 0; - margin: 0; + margin: 3px 5px 0 -23px; position: relative; - right: 3ex; + float: right; } #fast_filter { - width: 85%; - padding: 0.1em; + width: 100%; + padding:2px 0px; + margin:0; + border:0; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-804-gd33594f
by Michal Čihař 15 Dec '10

15 Dec '10

The branch, master has been updated via d33594fcb96520b9d9bf0be672d3b48ab72d9146 (commit) from a4fc99ec089e535bbb839e1527065ae372d91526 (commit) - Log ----------------------------------------------------------------- commit d33594fcb96520b9d9bf0be672d3b48ab72d9146 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Dec 15 09:22:47 2010 +0100 Czech translation update. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 57 ++++++++++++++++++++++++++------------------------------- 1 files changed, 26 insertions(+), 31 deletions(-) diff --git a/po/cs.po b/po/cs.po index e00d07f..25eee66 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-14 11:27-0500\n" -"PO-Revision-Date: 2010-12-07 15:56+0100\n" +"PO-Revision-Date: 2010-12-15 09:21+0100\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "MIME-Version: 1.0\n" @@ -617,8 +617,8 @@ msgstr "Sledování není zapnuté." #: db_structure.php:372 libraries/display_tbl.lib.php:1940 #, php-format msgid "" -"This view has at least this number of rows. Please refer to %sdocumentation%" -"s." +"This view has at least this number of rows. Please refer to %sdocumentation" +"%s." msgstr "" "Tento pohled má alespoň tolik řádek. Podrobnosti naleznete v %sdokumentaci%s." @@ -840,8 +840,8 @@ msgstr "Výpis byl uložen do souboru %s." #: import.php:58 #, php-format msgid "" -"You probably tried to upload too large file. Please refer to %sdocumentation%" -"s for ways to workaround this limit." +"You probably tried to upload too large file. Please refer to %sdocumentation" +"%s for ways to workaround this limit." msgstr "" "Pravděpodobně jste se pokusili nahrát příliš velký soubor. Přečtěte si " "prosím %sdokumentaci%s, jak toto omezení obejít." @@ -1598,8 +1598,8 @@ msgstr "Vítejte v %s" #: libraries/auth/config.auth.lib.php:106 #, php-format msgid "" -"You probably did not create a configuration file. You might want to use the %" -"1$ssetup script%2$s to create one." +"You probably did not create a configuration file. You might want to use the " +"%1$ssetup script%2$s to create one." msgstr "" "Pravděpodobná příčina je, že nemáte vytvořený konfigurační soubor. Pro jeho " "vytvoření by se vám mohl hodit %1$snastavovací skript%2$s." @@ -4523,8 +4523,8 @@ msgstr ", @TABLE@ bude nahrazen jménem tabulky" #, php-format msgid "" "This value is interpreted using %1$sstrftime%2$s, so you can use time " -"formatting strings. Additionally the following transformations will happen: %" -"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." +"formatting strings. Additionally the following transformations will happen: " +"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." msgstr "" "Tato hodnota je interpretována pomocí %1$sstrftime%2$s, takže můžete použít " "libovolné řetězce pro formátování data a času. Dále budou provedena " @@ -6447,8 +6447,8 @@ msgid "" "For a list of available transformation options and their MIME type " "transformations, click on %stransformation descriptions%s" msgstr "" -"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na %" -"spopisy transformací%s" +"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na " +"%spopisy transformací%s" #: libraries/tbl_properties.inc.php:143 msgid "Transformation options" @@ -6489,8 +6489,8 @@ msgid "" "No description is available for this transformation.<br />Please ask the " "author what %s does." msgstr "" -"Pro tuto transformaci není dostupný žádný popis.<br />Zeptejte se autora co %" -"s dělá." +"Pro tuto transformaci není dostupný žádný popis.<br />Zeptejte se autora co " +"%s dělá." #: libraries/tbl_properties.inc.php:725 server_engines.php:56 #: tbl_operations.php:352 @@ -7008,34 +7008,29 @@ msgid "Page creation failed" msgstr "Vytvoření stránky selhalo" #: pmd_pdf.php:89 -#, fuzzy #| msgid "pages" msgid "Page" -msgstr "stránek" +msgstr "Stránka" #: pmd_pdf.php:99 -#, fuzzy #| msgid "Import from file" msgid "Import from selected page" -msgstr "Importovat ze souboru" +msgstr "Importovat ze zvolené stránky" #: pmd_pdf.php:100 -#, fuzzy #| msgid "Export/Import to scale" msgid "Export to selected page" -msgstr "Exportovat/Importovat v měřítku" +msgstr "Exportovat na zvolenou stránku" #: pmd_pdf.php:102 -#, fuzzy #| msgid "Create a new index" msgid "Create a page and export to it" -msgstr "Vytvořit nový index" +msgstr "Vytvořit novou stránku a exportovat na ní" #: pmd_pdf.php:111 -#, fuzzy #| msgid "New name" msgid "New page name: " -msgstr "Nové jméno" +msgstr "Název nové stránky:" #: pmd_pdf.php:114 msgid "Export/Import to scale" @@ -7123,8 +7118,8 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" -"Více věcí můžete nastavit úpravou config.inc.php, např. použitím %" -"sNastavovacího skriptu%s." +"Více věcí můžete nastavit úpravou config.inc.php, např. použitím " +"%sNastavovacího skriptu%s." #: prefs_manage.php:302 msgid "Save to browser's storage" @@ -7572,8 +7567,8 @@ msgstr "Odstranit databáze se stejnými jmény jako uživatelé." msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " "tables. The content of these tables may differ from the privileges the " -"server uses, if they have been changed manually. In this case, you should %" -"sreload the privileges%s before you continue." +"server uses, if they have been changed manually. In this case, you should " +"%sreload the privileges%s before you continue." msgstr "" "Poznámka: phpMyAdmin získává oprávnění přímo z tabulek MySQL. Obsah těchto " "tabulek se může lišit od oprávnění, která server právě používá, pokud byly " @@ -9044,8 +9039,8 @@ msgid "" "If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin " "cookie validity%s must be set to a value less or equal to it." msgstr "" -"Při použití přihlašování přes cookies a při %sUkládádání přihlašovaci cookie%" -"s vyšší než 0 musí být %sPlatnost přihlašovací cookie%s nastavena na vyšší " +"Při použití přihlašování přes cookies a při %sUkládádání přihlašovaci cookie" +"%s vyšší než 0 musí být %sPlatnost přihlašovací cookie%s nastavena na vyšší " "hodnotu než je tato." #: setup/lib/index.lib.php:266 @@ -9056,8 +9051,8 @@ msgid "" "protection may not be reliable if your IP belongs to an ISP where thousands " "of users, including you, are connected to." msgstr "" -"Pokud to považujete za nutné, použijte další možnosti zabezpečení - %" -"somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení " +"Pokud to považujete za nutné, použijte další možnosti zabezpečení - " +"%somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení " "založené na IP adresách nemusí být spolehlivé, pokud je vaše IP adresa " "dynamicky přidělována poskytovatelem spolu s mnoha dalšími uživateli." hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-803-ga4fc99e
by Michal Čihař 15 Dec '10

15 Dec '10

The branch, master has been updated via a4fc99ec089e535bbb839e1527065ae372d91526 (commit) via a00ed5fb4c3361a4a556ea95bae8ec73af75ed0b (commit) via 75ca941fbaa43beaa0c2a283267fe37dec6b0049 (commit) via 68937a3c62161e39313f25a80757c43c1b9263ed (commit) via 5bff6f9fe89a8fdb539c60a744eb25d2d5b0ea53 (commit) via ec81c35507585c34f90b8a5e38b2118d45529ae4 (commit) via 08fa8305b23594b4cae5d661c2901a963ae105b3 (commit) via afd267c9e6937be90c77656a1c9c51b305a3da24 (commit) via b2b2e50d495ef85ada5fc67376b9ce0484bb8fb9 (commit) via 76306e3c23d40c7716582c49a00e53345e1e3d01 (commit) via 0ca9ad6e3fd2b0a630baf4e34afa1493cbcdf011 (commit) via c8eb95d9052547ece2b3d5a361e9bc18e3dbc4b1 (commit) via f7955fbbeb067e94862fa983d7f46a9b5283c37b (commit) via fd2a4169ba58acc10c2d91674589fc637ea8baec (commit) via a974ce6baa738a940f9cbfbd2f1c25711fc17997 (commit) from 55c2dcb6648ffa78f698a4cca453662ba6a14189 (commit) - Log ----------------------------------------------------------------- commit a4fc99ec089e535bbb839e1527065ae372d91526 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 01:52:14 2010 +0200 Translation update done using Pootle. commit a00ed5fb4c3361a4a556ea95bae8ec73af75ed0b Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 01:51:07 2010 +0200 Translation update done using Pootle. commit 75ca941fbaa43beaa0c2a283267fe37dec6b0049 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 01:50:15 2010 +0200 Translation update done using Pootle. commit 68937a3c62161e39313f25a80757c43c1b9263ed Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 01:49:42 2010 +0200 Translation update done using Pootle. commit 5bff6f9fe89a8fdb539c60a744eb25d2d5b0ea53 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 01:38:12 2010 +0200 Translation update done using Pootle. commit ec81c35507585c34f90b8a5e38b2118d45529ae4 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 01:36:51 2010 +0200 Translation update done using Pootle. commit 08fa8305b23594b4cae5d661c2901a963ae105b3 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 01:36:00 2010 +0200 Translation update done using Pootle. commit afd267c9e6937be90c77656a1c9c51b305a3da24 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 01:35:17 2010 +0200 Translation update done using Pootle. commit b2b2e50d495ef85ada5fc67376b9ce0484bb8fb9 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 01:33:42 2010 +0200 Translation update done using Pootle. commit 76306e3c23d40c7716582c49a00e53345e1e3d01 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 01:29:18 2010 +0200 Translation update done using Pootle. commit 0ca9ad6e3fd2b0a630baf4e34afa1493cbcdf011 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 01:29:00 2010 +0200 Translation update done using Pootle. commit c8eb95d9052547ece2b3d5a361e9bc18e3dbc4b1 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 01:28:35 2010 +0200 Translation update done using Pootle. commit f7955fbbeb067e94862fa983d7f46a9b5283c37b Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 01:28:16 2010 +0200 Translation update done using Pootle. commit fd2a4169ba58acc10c2d91674589fc637ea8baec Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 01:21:41 2010 +0200 Translation update done using Pootle. commit a974ce6baa738a940f9cbfbd2f1c25711fc17997 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 01:20:46 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/uk.po | 125 ++++++++++++-------------------------------------------------- 1 files changed, 24 insertions(+), 101 deletions(-) diff --git a/po/uk.po b/po/uk.po index 75ed42b..86a8683 100644 --- a/po/uk.po +++ b/po/uk.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-14 11:27-0500\n" -"PO-Revision-Date: 2010-07-27 23:41+0200\n" +"PO-Revision-Date: 2010-12-15 01:52+0200\n" "Last-Translator: Olexiy Zagorskyi <zalex_ua(a)i.ua>\n" "Language-Team: ukrainian <uk(a)li.org>\n" +"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: uk\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.1\n" +"X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:36 browse_foreigners.php:57 #: libraries/display_tbl.lib.php:415 server_privileges.php:1594 @@ -457,7 +457,7 @@ msgstr "Вставити" #: db_qbe.php:376 db_qbe.php:458 db_qbe.php:543 db_qbe.php:574 msgid "And" -msgstr "І" +msgstr "Та" #: db_qbe.php:385 db_qbe.php:466 db_qbe.php:548 db_qbe.php:579 msgid "Del" @@ -1885,8 +1885,8 @@ msgid "" "semicolon is missing somewhere.<br />If you receive a blank page, everything " "is fine." msgstr "" -"phpMyAdmin не може прочитати конфігураційний файл <br />Це може статися у " -"тому випадку, коли php натрапить на синтаксичну помилку (parse error) у " +"phpMyAdmin не може прочитати ваш конфігураційний файл <br />Це може статися " +"у тому випадку, коли php натрапить на синтаксичну помилку (parse error) у " "ньому, або не може знайти самого файлу.<br />Завантажте конфігураційний файл " "безпосередньо за допомогою посилання поданого нижче і прочитайте отримані " "повідомлення про помилки (php error messages). Найчастіше десь у файлі " @@ -2019,7 +2019,7 @@ msgstr "Час" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ #: libraries/common.lib.php:1362 msgid "B" -msgstr "Байт" +msgstr "Б" #: libraries/common.lib.php:1362 msgid "KiB" @@ -4490,10 +4490,10 @@ msgid "Output:" msgstr "" #: libraries/display_export.lib.php:188 libraries/display_export.lib.php:214 -#, fuzzy, php-format +#, php-format #| msgid "Save on server in %s directory" msgid "Save on server in the directory <b>%s</b>" -msgstr "Зберегти на сервері в каталогу %s " +msgstr "Зберегти на сервері в каталозі <b>%s</b>" #: libraries/display_export.lib.php:206 #, fuzzy @@ -6397,9 +6397,9 @@ msgid "" "(for example '\\\\xyz' or 'a\\'b')." msgstr "" "Для типів поля \"enum\" або \"set\", введіть значення в такому форматі: " -"'a','b','c'...<br />Якщо вам буде потрібно ввести зворотню косу риску (\"\\" -"\") або поодинокі лапки (\"'\") посеред цих значень, поставте перед ними " -"зворотню косу риску (наприклад, '\\\\xyz' чи 'a\\'b')." +"'a','b','c'...<br />Якщо вам буде потрібно ввести зворотню косу риску (\"\\\") " +"або поодинокі лапки (\"'\") посеред цих значень, поставте перед ними зворотню " +"косу риску (наприклад, '\\\\xyz' чи 'a\\'b')." #: libraries/tbl_properties.inc.php:105 msgid "" @@ -6429,10 +6429,10 @@ msgid "" "quote (\"'\") amongst those values, precede it with a backslash (for example " "'\\\\xyz' or 'a\\'b')." msgstr "" -"Введіть значення опцій перетворення у такому форматі: 'a', 100, b,'c'...<br /" -">Якщо необхідно ввести зворотній слеш (\"\\\") чи поодинокі лапки (\"'\") у " -"цих значеннях, поставте перед ними додатковий зворотній слеш (наприклад '\\" -"\\xyz' чи 'a\\'b')." +"Введіть значення опцій перетворення у такому форматі: 'a', 100, b,'c'...<br " +"/>Якщо необхідно ввести зворотній слеш (\"\\\") чи поодинокі лапки (\"'\") у цих " +"значеннях, поставте перед ними додатковий зворотній слеш (наприклад '\\\\xyz' " +"чи 'a\\'b')." #: libraries/tbl_properties.inc.php:371 msgid "ENUM or SET data too long?" @@ -6459,7 +6459,8 @@ msgid "" "No description is available for this transformation.<br />Please ask the " "author what %s does." msgstr "" -"Немає опису для цього перетворення.<br />Прошу питатися автора, що робить %s." +"Немає опису для цього перетворення.<br />Прошу питатися автора, що робить %" +"s." #: libraries/tbl_properties.inc.php:725 server_engines.php:56 #: tbl_operations.php:352 @@ -6569,7 +6570,6 @@ msgstr "" "htmlspecialchars(). Це значить що поле передбачає містити справжній HTML." #: libraries/transformations/text_plain__imagelink.inc.php:9 -#, fuzzy #| msgid "" #| "Displays an image and a link; the field contains the filename. The first " #| "option is a URL prefix like \"http://www.example.com/\". The second and " @@ -6579,11 +6579,11 @@ msgid "" "option is a URL prefix like \"http://www.example.com/\". The second and " "third options are the width and the height in pixels." msgstr "" -"Показує малюнок і лінк, поле містить назву файлу; перша опція - префікс, " -"подібно до \"http://domain.com/\", друга - ширина в пікселах, третя - висота." +"Показує посилання, поле містить назву файлу. Перша опція - префікс " +"посилання, подібно до \"http://www.example.com/\". Друга опція - заголовок для " +"посилання." #: libraries/transformations/text_plain__link.inc.php:9 -#, fuzzy #| msgid "" #| "Displays a link; the field contains the filename. The first option is a " #| "URL prefix like \"http://www.example.com/\". The second option is a title " @@ -6593,8 +6593,9 @@ msgid "" "prefix like \"http://www.example.com/\". The second option is a title for " "the link." msgstr "" -"Показує лінк, поле містить назву файлу; перша опція - префікс, подібно до " -"\"http://domain.com/\", друга опція - title для лінку." +"Показує посилання, поле містить назву файлу. Перша опція - префікс " +"посилання, подібно до \"http://www.example.com/\". Друга опція - заголовок для " +"посилання." #: libraries/transformations/text_plain__longToIpv4.inc.php:9 msgid "" @@ -9648,81 +9649,3 @@ msgstr "" #~ msgid "Disable Statistics" #~ msgstr "Заборонити статистику" - -#, fuzzy -#~| msgid "in query" -#~ msgid "Hide query chart" -#~ msgstr "по запиту" - -#, fuzzy -#~| msgid "Displaying Column Comments" -#~ msgid "Display table filter" -#~ msgstr "Показувати коментарі стовпців" - -#~ msgid "" -#~ "The additional features for working with linked tables have been " -#~ "deactivated. To find out why click %shere%s." -#~ msgstr "" -#~ "Додаткова можливість роботи із залінкованими таблицями деактивована. Для " -#~ "того, щоб довідатись чому, натисніть %sтут%s." - -#~ msgid "Execute bookmarked query" -#~ msgstr "Виконати збережений запит" - -#~ msgid "No tables" -#~ msgstr "Таблиць немає" - -#, fuzzy -#~| msgid "CSV" -#~ msgid "SVG" -#~ msgstr "CSV дані" - -#, fuzzy -#~| msgid "" -#~| "Please enter the values for transformation options using this format: " -#~| "'a', 100, b,'c'...<br />If you ever need to put a backslash (\"\\\") or " -#~| "a single quote (\"'\") amongst those values, precede it with a backslash " -#~| "(for example '\\\\xyz' or 'a\\'b')." -#~ msgid "" -#~ "Enter each value in a separate field, enclosed in single quotes. If you " -#~ "ever need to put a backslash (\"\\\") or a single quote (\"'\") amongst " -#~ "those values, precede it with a backslash (for example '\\\\xyz' or 'a" -#~ "\\'b')." -#~ msgstr "" -#~ "Введіть значення опцій перетворення у такому форматі: 'a', 100, b,'c'..." -#~ "<br />Якщо необхідно ввести зворотній слеш (\"\\\") чи поодинокі лапки " -#~ "(\"'\") у цих значеннях, поставте перед ними додатковий зворотній слеш " -#~ "(наприклад '\\\\xyz' чи 'a\\'b')." - -#, fuzzy -#~| msgid "" -#~| "Please enter the values for transformation options using this format: " -#~| "'a', 100, b,'c'...<br />If you ever need to put a backslash (\"\\\") or " -#~| "a single quote (\"'\") amongst those values, precede it with a backslash " -#~| "(for example '\\\\xyz' or 'a\\'b')." -#~ msgid "" -#~ "Enter each value in a separate field. If you ever need to put a backslash " -#~ "(\"\\\") or a single quote (\"'\") amongst those values, precede it with " -#~ "a backslash (for example '\\\\xyz' or 'a\\'b')." -#~ msgstr "" -#~ "Введіть значення опцій перетворення у такому форматі: 'a', 100, b,'c'..." -#~ "<br />Якщо необхідно ввести зворотній слеш (\"\\\") чи поодинокі лапки " -#~ "(\"'\") у цих значеннях, поставте перед ними додатковий зворотній слеш " -#~ "(наприклад '\\\\xyz' чи 'a\\'b')." - -#~ msgid "Edit PDF Pages" -#~ msgstr "Редагувати PDF Сторінки" - -#~ msgid "Data Dictionary Format" -#~ msgstr "Формат словника" - -#, fuzzy -#~| msgid "Dump %s row(s) starting at record # %s" -#~ msgid "Dump %s row(s) starting at row # %s" -#~ msgstr "Зґенерувати дамп %s рядків починаючи з %s -го." - -#~ msgid "remember template" -#~ msgstr "запам'ятати шаблон" - -#~ msgid "Add into comments" -#~ msgstr "Додати коментар" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-788-g55c2dcb
by Marc Delisle 14 Dec '10

14 Dec '10

The branch, master has been updated via 55c2dcb6648ffa78f698a4cca453662ba6a14189 (commit) from b3cab1566336557b81e277c27703a98a25c6ca18 (commit) - Log ----------------------------------------------------------------- commit 55c2dcb6648ffa78f698a4cca453662ba6a14189 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Dec 14 12:30:40 2010 -0500 bug #3137351 User preferences and hide_db ----------------------------------------------------------------------- Summary of changes: libraries/config/validate.lib.php | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php index 59df2b8..60aa33b 100644 --- a/libraries/config/validate.lib.php +++ b/libraries/config/validate.lib.php @@ -307,7 +307,9 @@ function validate_regex($path, $values) test_php_errormsg(); $matches = array(); - preg_match($values[$path], '', $matches); + // in libraries/List_Database.class.php _checkHideDatabase(), + // a '/' is used as the delimiter for hide_db + preg_match('/' . $values[$path] . '/', '', $matches); test_php_errormsg(false); @@ -457,4 +459,4 @@ function validate_upper_bound($path, $values, $max_value) $result = $values[$path] <= $max_value; return array($path => ($result ? '' : sprintf(__('Value must be equal or lower than %s'), $max_value))); } -?> \ No newline at end of file +?> hooks/post-receive -- phpMyAdmin

1 0