Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

ChangeLog

@@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog
 - bug #4198 Hovering over pie chart gives fatal JS error
 - bug #4200 Missing syntax highlighting
 - bug #4201 Exports are not compressed
+- bug #4131 Import: "number of rows to skip" is ambiguous
 
 4.1.2.0 (2013-12-23)
 - bug #4178 Quick edit for BIT type does not work

libraries/display_import.lib.php

@@ -299,7 +299,10 @@ function PMA_getHtmlForImportOptionsPartialImport($timeout_passed, $offset)
     if (! (isset($timeout_passed) && $timeout_passed)) {
         $html .= '        <div class="formelementrow">';
         $html .= '            <label for="text_skip_queries">'
-            .  __('Number of rows to skip, starting from the first row:')
+            .  __(
+                'Skip this number of queries (for SQL) or lines (for other '
+                . 'formats), starting from the first one:'
+            )
             . '</label>';
         $html .= '            <input type="number" name="skip_queries" value="'
             . PMA_pluginGetDefault('Import', 'skip_queries')