Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/Linter.class.php4
-rw-r--r--libraries/config/messages.inc.php2
-rw-r--r--test/libraries/PMA_Linter_Test.php2
3 files changed, 4 insertions, 4 deletions
diff --git a/libraries/Linter.class.php b/libraries/Linter.class.php
index 5315ce479f..cfc534acfd 100644
--- a/libraries/Linter.class.php
+++ b/libraries/Linter.class.php
@@ -81,7 +81,7 @@ class PMA_Linter
echo json_encode(
array(
array(
- 'message' => 'The linting is disabled for this query because it exceededs the maxmimum length.',
+ 'message' => 'Linting is disabled for this query because it exceeds the maximum length.',
'fromLine' => 0,
'fromColumn' => 0,
'toLine' => 0,
@@ -159,4 +159,4 @@ class PMA_Linter
echo json_encode($response);
}
-} \ No newline at end of file
+}
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index ae230d4c78..6cc5dfe1c4 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -57,7 +57,7 @@ $strConfigCodemirrorEnable_desc = __(
. 'line numbers.'
);
$strConfigCodemirrorEnable_name = __('Enable CodeMirror');
-$strConfigLintEnable_desc = __('Find any erorors in the query before executing it.'
+$strConfigLintEnable_desc = __('Find any errors in the query before executing it.'
. 'Requires CodeMirror to be enabled.');
$strConfigLintEnable_name = __('Enable linter');
$strConfigMinSizeForInputField_desc = __(
diff --git a/test/libraries/PMA_Linter_Test.php b/test/libraries/PMA_Linter_Test.php
index 56667170a5..4c3b6cd6c5 100644
--- a/test/libraries/PMA_Linter_Test.php
+++ b/test/libraries/PMA_Linter_Test.php
@@ -132,7 +132,7 @@ class PMA_Linter_Test extends PHPUnit_Framework_TestCase
json_encode(
array(
array(
- 'message' => 'The linting is disabled for this query because it exceededs the maxmimum length.',
+ 'message' => 'Linting is disabled for this query because it exceeds the maximum length.',
'fromLine' => 0,
'fromColumn' => 0,
'toLine' => 0,