Merge branch 'master' into gettext

ChangeLog

@@ -51,6 +51,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + [lang] Uzbek update, thanks to Orzu Samarqandiy
 + rfe #2958013 [import] After import, also list uploaded filename, thanks
   to Pavel Konnikov and Herman van Rink
++ patch #2974341 [structure] Clicking on table name in db Structure should 
+  Browse the table if possible, thanks to bhdouglass - dougboybhd
 
 3.3.2.0 (not yet released)
 - patch #2969449 [core] Name for MERGE engine varies depending on the

Documentation.html

@@ -4342,20 +4342,23 @@ chmod o+rwx tmp
 
 <p> The following method is preferred for new developers:</p>
 
-<ol><li>fetch the current SVN tree over anonymous SVN:<br />
+<ol><li>fetch the current git repository over anonymous git:<br />
-    <tt>svn co https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin</tt><br />
+    <tt>git clone
+        git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin</tt><br />
     </li>
     <li>add your stuff</li>
     <li>generate patch with your changes:
-    <tt>svn diff</tt><br />
+    <tt>git diff &gt; xxx.diff</tt><br />
     </li>
-    <li>put the patch inside the <a
+    <li>submit your patch via the <a
         href="https://sourceforge.net/tracker/?group_id=23067&amp;atid=377410">patch
         tracker of the phpMyAdmin project</a>.
     </li>
 </ol>
 
-<p> Write access to the SVN tree is granted only to experienced developers who
+<p>More details on git are available on <a href="http://wiki.phpmyadmin.net/pma/Devel:git">our wiki</a>.</p>
+
+<p> Write access to the repository is granted only to experienced developers who
     have already contributed something useful to phpMyAdmin.<br />
     Also, have a look at the <a href="#developers">Developers section</a>.</p>
 

db_structure.php

@@ -300,9 +300,11 @@ foreach ($tables as $keyname => $each_table) {
     if ($each_table['TABLE_ROWS'] > 0) {
         $browse_table = '<a href="sql.php?' . $tbl_url_query . '&amp;pos=0">' . $titles['Browse'] . '</a>';
         $search_table = '<a href="tbl_select.php?' . $tbl_url_query . '">' . $titles['Search'] . '</a>';
+        $browse_table_label = '<a href="sql.php?' . $tbl_url_query . '&amp;pos=0">' . $truename . '</a>';
     } else {
         $browse_table = $titles['NoBrowse'];
         $search_table = $titles['NoSearch'];
+        $browse_table_label = '<a href="tbl_structure.php?' . $tbl_url_query . '">' . $truename . '</a>';
     }
 
     if (! $db_is_information_schema) {
@@ -382,8 +384,7 @@ foreach ($tables as $keyname => $each_table) {
         <input type="checkbox" name="selected_tbl[]"
             value="<?php echo htmlspecialchars($each_table['TABLE_NAME']); ?>"
             id="checkbox_tbl_<?php echo $i; ?>"<?php echo $checked; ?> /></td>
-    <th><label for="checkbox_tbl_<?php echo $i; ?>"
+    <th><?php echo $browse_table_label; ?>
-            title="<?php echo $alias; ?>" style="<?php echo $ignored ? ' ignored' : ''; ?>"><?php echo $truename; ?></label>
         <?php echo (! empty($tracking_icon) ? $tracking_icon : ''); ?>
     </th>
    <?php if ($server_slave_status) { ?><td align="center"><?php echo $ignored ? ' <img class="icon" src="' . $pmaThemeImage . 's_cancel.png" width="16" height="16"  alt="NOT REPLICATED" />' : ''. $do ? ' <img class="icon" src="' . $pmaThemeImage . 's_success.png" width="16" height="16"  alt="REPLICATED" />' : ''; ?></td><?php } ?>

tbl_row_action.php

@@ -43,7 +43,7 @@ if (isset($_REQUEST['submit_mult'])) {
     $submit_mult = 'row_export';
 }
 
-// garvin: If the 'Ask for confirmation' button was pressed, this can only come
+// If the 'Ask for confirmation' button was pressed, this can only come
 // from 'delete' mode, so we set it straight away.
 if (isset($_REQUEST['mult_btn'])) {
     $submit_mult = 'row_delete';