From 432f4ac50a76143bb6c60a974cce0a6a71881ed6 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 8 Oct 2008 14:03:34 +0000
Subject: [PATCH] MINOR Updated language master table

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63861 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 lang/en_US.php | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/lang/en_US.php b/lang/en_US.php
index 42e93293..429d00ce 100755
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -241,15 +241,12 @@ $lang['en_US']['MemberTableField']['FILTER'] = 'Filter';
 $lang['en_US']['MemberTableField']['ADDINGFIELD'] = 'Adding failed';
 $lang['en_US']['MemberTableField']['ADDEDTOGROUP'] = 'Added member to group';
 $lang['en_US']['MemberTableField']['ADD'] = 'Add';
-$lang['en_US']['UserDefinedForm']['FORM'] = 'Form';
-$lang['en_US']['UserDefinedForm']['SUBMISSIONS'] = 'Submissions';
-$lang['en_US']['UserDefinedForm']['RECEIVED'] = 'Received Submissions';
-$lang['en_US']['UserDefinedForm']['ONCOMPLETE'] = 'On complete';
-$lang['en_US']['UserDefinedForm']['ONCOMPLETELABEL'] = 'Show on completion';
-$lang['en_US']['UserDefinedForm']['SUBMIT'] = 'Submit';
-$lang['en_US']['UserDefinedForm']['NORESULTS'] = 'No matching results found';
-$lang['en_US']['UserDefinedForm']['TEXTONSUBMIT'] = 'Text on submit button:';
-$lang['en_US']['UserDefinedForm_SubmittedFormEmail']['EMAILSUBJECT'] = 'Submission of form';
+$lang['en_US']['ComplexTableField']['CLOSEPOPUP'] = 'Close Popup';
+$lang['en_US']['ComplexTableField']['SUCCESSADD'] = 'Added %s %s %s';
+$lang['en_US']['ModelAdmin']['IMPORT'] = 'Import from CSV';
+$lang['en_US']['ModelAdmin']['CLEAR_SEARCH'] = 'Clear Search';
+$lang['en_US']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Select result columns...';
+$lang['en_US']['ModelAdmin']['SEARCHRESULTS'] = 'Search Results';
 $lang['en_US']['SecurityAdmin']['ADDMEMBER'] = 'Add Member';
 $lang['en_US']['SecurityAdmin']['SAVE'] = 'Save';
 $lang['en_US']['SecurityAdmin']['SGROUPS'] = 'Security groups';
@@ -284,7 +281,7 @@ $lang['en_US']['PageCommentInterface']['YOURCOMMENT'] = 'Comments';
 $lang['en_US']['PageCommentInterface']['POST'] = 'Post';
 $lang['en_US']['PageCommentInterface_Form']['SPAMDETECTED'] = 'Spam detected!!';
 $lang['en_US']['PageCommentInterface_Form']['MSGYOUPOSTED'] = 'The message you posted was:';
-$lang['en_US']['PageCommentInterface_Form']['AWAITINGMODERATION'] = 'Your comment has been submitted and is now awating moderation.';
+$lang['en_US']['PageCommentInterface_Form']['AWAITINGMODERATION'] = 'Your comment has been submitted and is now awaiting moderation.';
 $lang['en_US']['PageCommentInterface_Controller']['SPAMQUESTION'] = 'Spam protection question: %s';
 $lang['en_US']['AssetAdmin_uploadiframe.ss']['PERMFAILED'] = 'You do not have permission to upload files into this folder.';
 $lang['en_US']['CMSMain_dialog.ss']['BUTTONNOTFOUND'] = 'Couldn\'t find the button name';
@@ -436,6 +433,16 @@ $lang['en_US']['MemberTableField.ss']['ADDNEW'] = array(
 $lang['en_US']['MemberTableField.ss']['SHOWMEMBER'] = 'Show this member';
 $lang['en_US']['MemberTableField.ss']['EDITMEMBER'] = 'Edit this member';
 $lang['en_US']['MemberTableField.ss']['DELETEMEMBER'] = 'Delete this member';
+$lang['en_US']['ModelAdmin_ImportSpec.ss']['IMPORTSPECLINK'] = 'Show Specification for %s';
+$lang['en_US']['ModelAdmin_ImportSpec.ss']['IMPORTSPECTITLE'] = 'Specification for %s';
+$lang['en_US']['ModelAdmin_ImportSpec.ss']['IMPORTSPECFIELDS'] = 'Database columns';
+$lang['en_US']['ModelAdmin_ImportSpec.ss']['IMPORTSPECRELATIONS'] = 'Relations';
+$lang['en_US']['ModelAdmin_left.ss']['SEARCHLISTINGS'] = 'Search Listings';
+$lang['en_US']['ModelAdmin_left.ss']['ADDLISTING'] = 'Add Listing';
+$lang['en_US']['ModelAdmin_left.ss']['ADD_TAB_HEADER'] = 'Add';
+$lang['en_US']['ModelAdmin_left.ss']['IMPORT_TAB_HEADER'] = 'Import';
+$lang['en_US']['ModelAdmin_right.ss']['WELCOME1'] = 'Welcome to';
+$lang['en_US']['ModelAdmin_right.ss']['WELCOME2'] = 'Please choose on one of the entries in the left pane.';
 $lang['en_US']['ReportAdmin_SiteTree.ss']['REPORTS'] = 'Reports';
 $lang['en_US']['ReportAdmin_left.ss']['REPORTS'] = 'Reports';
 $lang['en_US']['ReportAdmin_right.ss']['WELCOME1'] = array(
@@ -513,7 +520,6 @@ $lang['en_US']['WidgetAreaEditor.ss']['NOAVAIL'] = 'There are currently no widge
 $lang['en_US']['WidgetAreaEditor.ss']['INUSE'] = 'Widgets currently used';
 $lang['en_US']['WidgetAreaEditor.ss']['TOADD'] = 'To add widgets, drag them from the left area to here.';
 $lang['en_US']['WidgetEditor.ss']['DELETE'] = 'Delete';
-$lang['en_US']['SubmittedFormEmail.ss']['SUBMITTED'] = 'The following data was submitted to your website:';
 $lang['en_US']['ViewArchivedEmail.ss']['HAVEASKED'] = array(
 	'You have asked to view the content of our site on',
 	30,