Merge branch 'edge' of git@github.com:ktgit/knowledgetree into edge

Jarrett Jordaan
2 parents eabbb359 4b8cd011
Showing 2 changed files with 3 additions and 2 deletions
.gitignore
plugins/ktcore/admin/fieldsets/basic.inc.php
@@ -8,5 +8,6 @@ bin/luceneserver/lucene.pid
 dummy.php
 var/*
 plugins/commercial
-clienttools/*
+clienttools/Karoo
+clienttools/Office
 .gitmodules
 \ No newline at end of file
@@ -84,7 +84,7 @@ class BasicFieldsetManagementDispatcher extends KTAdminDispatcher {
             'normal' => _kt("Normal (String)"),
             'lookup' => _kt("Lookup"),
             'tree' => _kt("Tree"),
-            'largetextbox' => _kt("Large Textbox"),
+            'largetextbox' => _kt("Large Text"),
             'date' => _kt("Date"),
         );
         return $types;