BUG: refs #0282. English fixes.

midasplatform · Dec 20, 2011 · dcfa139 · dcfa139
1 parent e4e41b1
commit dcfa139
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/core/public/js/admin/admin.index.js b/core/public/js/admin/admin.index.js
@@ -24,7 +24,7 @@
       {
       var element = $(this).attr('element');
       var html = '';
-      html += 'Do you really want to remove the assetstore? All the items located in it will be delete. (Can take a wihle)';
+      html += 'Do you really want to remove the assetstore? All the items located in it will be deleted. (Can take a while)';
       html += '<br/>';
       html += '<br/>';
       html += '<input style="margin-left:140px;" class="globalButton deleteAssetstoreYes" element="'+element+'" type="button" value="'+json.global.Yes+'"/>';

diff --git a/core/views/admin/index.phtml b/core/views/admin/index.phtml
@@ -67,7 +67,7 @@ $this->headScript()->appendFile($this->coreWebroot . '/public/js/jquery/jquery.c
                 <label for='smartoptimizer'>CSS and Javascript optimizer</label>
                 {$this->configForm['smartoptimizer']}
               </div>
-              <div qtip='If you enable this feature, MIDAS will show to the users how to use the system.' class='installSmartoptimizer'>
+              <div qtip='If you enable this feature, MIDAS will show the users how to use the system.' class='installSmartoptimizer'>
                 <label for='dynamichelp'>Dynamic Help</label>
                 {$this->configForm['dynamichelp']}
               </div>
@@ -89,11 +89,11 @@ $this->headScript()->appendFile($this->coreWebroot . '/public/js/jquery/jquery.c
               <b><span class='assetstoreName'>{$assetstore->getName()}</span></b> ";
        if($assetstore->default)
          {
-         echo "(<span qtip='If set as default, the uploaded files will be store is this assetstore.' class='defaultAssetstore' element='{$assetstore->getKey()}'>default assetstore</span>)";
+         echo "(<span qtip='If set as default, the uploaded files will be stored in this assetstore.' class='defaultAssetstore' element='{$assetstore->getKey()}'>default assetstore</span>)";
          }
        else
          {
-         echo "(<a qtip='If set as default, the uploaded files will be store is this assetstore.' class='defaultAssetstoreLink' element='{$assetstore->getKey()}'>set as default</a>)";
+         echo "(<a qtip='If set as default, the uploaded files will be stored in this assetstore.' class='defaultAssetstoreLink' element='{$assetstore->getKey()}'>set as default</a>)";
          }
 	      echo "<br/>";
        if($assetstore->totalSpaceText==false)
@@ -205,7 +205,7 @@ $this->headScript()->appendFile($this->coreWebroot . '/public/js/jquery/jquery.c
                       {
                     echo "
                     <td style='width:300px;'>
-                      Not available with you database type
+                      Not available with your database type
                     </td>";
                       }
                     elseif(!$module->dependenciesExist)