merging changes from origin

This commit is contained in:
ninadsp
2010-05-24 18:32:42 +05:30
parent bed1948d04
commit 38ac78e3ba
98 changed files with 203311 additions and 221985 deletions

View File

@@ -582,7 +582,7 @@ echo PMA_generate_common_hidden_inputs($url_params);
<tr>
<td nowrap="nowrap">
<?php echo __('Add/Delete Criteria Row'); ?>:
<select size="1" name="add_row" style="vertical-align: middle">
<select size="1" name="add_row">
<option value="-3">-3</option>
<option value="-2">-2</option>
<option value="-1">-1</option>
@@ -594,7 +594,7 @@ echo PMA_generate_common_hidden_inputs($url_params);
</td>
<td width="10">&nbsp;</td>
<td nowrap="nowrap"><?php echo __('Add/Delete Field Columns'); ?>:
<select size="1" name="add_col" style="vertical-align: middle">
<select size="1" name="add_col">
<option value="-3">-3</option>
<option value="-2">-2</option>
<option value="-1">-1</option>