Merge remote branch 'origin/master'

2010-06-03 22:34:52 +05:30
parent 3bb4dbd0ac 5dfe98a378
commit 160f4314eb
120 changed files with 40225 additions and 32460 deletions
--- a/db_search.php
+++ b/db_search.php
@@ -352,7 +352,7 @@ $alter_select =
            <?php echo $alter_select; ?></td>
    </tr>
    <tr><td align="right">
-            <?php echo __('Inside field:'); ?></td>
+            <?php echo __('Inside column:'); ?></td>
        <td><input type="text" name="field_str" size="60"
                value="<?php echo ! empty($field_str) ? $field_str : ''; ?>" /></td>
    </tr>