Index: typo3/sysext/impexp/locallang_csh.xml
===================================================================
--- typo3/sysext/impexp/locallang_csh.xml	(revision 10044)
+++ typo3/sysext/impexp/locallang_csh.xml	(working copy)
@@ -123,7 +123,7 @@
 			<label index="import.alttitle">Importing TYPO3 records</label>
 			<label index="import.description">To import TYPO3 T3D/XML files into the page tree you click any page in the page tree (including the root page!), select &quot;More options&quot; (requires the extensions &quot;extra_page_cm_options&quot; to be installed) and then &quot;Import from .t3d&quot;. This will bring up the import interface where you can select a file to import or upload a new one.</label>
 			<label index="import.details">&lt;b&gt;Tip: Import into a Sys Folder&lt;/b&gt;
-To make sure that no records are lost during the import, you can make yourself safe by importing into a folder you create first. After the import you can move all records to the final destinations. An example of such a scenario is if you configured the export to include relations; In that case a number of records may follow the export outside the page tree structure you are exporting. To make sure that all of these external records are written to the database, importing into a folder is a good idea.
+To make sure that no records are lost during the import, you can make yourself safe by importing into a SysFolder you create first. After the import you can move all records to the final destinations. An example of such a scenario is if you configured the export to include relations; In that case a number of records may follow the export outside the page tree structure you are exporting. To make sure that all of these external records are written to the database, importing into a SysFolder is a good idea.
 
 &lt;b&gt;Error messages:&lt;/b&gt; Remember to consult the Message-tab before/after importing to see if there are any error messages there!</label>
 			<label index="_import.seeAlso">xMOD_tx_impexp:export</label>
Index: typo3/sysext/context_help/locallang_csh_pages.xml
===================================================================
--- typo3/sysext/context_help/locallang_csh_pages.xml	(revision 10044)
+++ typo3/sysext/context_help/locallang_csh_pages.xml	(working copy)
@@ -17,10 +17,10 @@
 
 &lt;b&gt;Special types:&lt;/b&gt;
 'Spacer' is only meaningfull if your frontend navigation is programmed to use it. In this case it does not represent a page with content but is intended to be a non-clickable placeholder in the navigation.
-'Folder' is a page type which cannot be shown as a webpage but is rather acting as a place to store records of your choice.
+'SysFolder' is a page type which cannot be shown as a webpage but is rather acting as a storage for records of your choice.
 'Recycler' is a garbage can. Pages and records in a recycler are not visible in the frontend.
 
-&lt;b&gt;Notice:&lt;/b&gt; Each type usually has a specific icon attached. Also certain types may not be available for a user (so you may experience that some of the options are not available for you!). And finally each type is configured to allow only certain table records on the page (A folder will allow any record if you have any problems).</label>
+&lt;b&gt;Notice:&lt;/b&gt; Each type usually has a specific icon attached. Also certain types may not be available for a user (so you may experience that some of the options are not available for you!). And finally each type is configured to allow only certain table records in the page (SysFolder will allow any record if you have any problems).</label>
 			<label index="_doktype.seeAlso">pages:shortcut,
 pages:url</label>
 			<label index="hidden.description">If this is checked, the page will be hidden on the website.</label>
Index: typo3/sysext/context_help/locallang_csh_ttcontent.xml
===================================================================
--- typo3/sysext/context_help/locallang_csh_ttcontent.xml	(revision 10044)
+++ typo3/sysext/context_help/locallang_csh_ttcontent.xml	(working copy)
@@ -312,7 +312,7 @@
 
 The &quot;Login&quot; type content element also uses this field to direct the login to a certain page. However that page does not need to contain a Login content element in order to perform the authentication - you can in fact submit a login request to any TYPO3 page and it will be evaluated!
 If you specify a second page in this list, the id will be passed to the login system as being the page inside TYPO3 where the database of users to look up is found. You should use this only if your template is not configured to pass this value on.
-In order for the login procedure to work, you must make sure that 1) you have created at least one Website user and member usergroup and is using the correct username and password, 2) you have configured in your TypoScript template on which page (typically a folder) the users can be found - or alternatively have specified this by the second page in the this page list, 3) cookies must be enabled.
+In order for the login procedure to work, you must make sure that 1) you have created at least one Website user and member usergroup and is using the correct username and password, 2) you have configured in your TypoScript template on which page (typically a SysFolder) the users can be found - or alternatively have specified this by the second page in the this page list, 3) cookies must be enabled.
 
 The &quot;Menu/Sitemap&quot; element also uses this field. In that case the page(s) will determine from which point the menu is drawn or maybe even represent the actual pages to which the menu links. All this depends on the subtype of Menu/Sitemap you have selected.
 
Index: typo3/sysext/lang/locallang_csh_pages.xml
===================================================================
--- typo3/sysext/lang/locallang_csh_pages.xml	(revision 10044)
+++ typo3/sysext/lang/locallang_csh_pages.xml	(working copy)
@@ -17,7 +17,7 @@
 Technically all database elements has a field 'uid' which is a unique identification number. Further they must have a field 'pid' which holds the uid-number of the page (page id) to which they belong. If the 'pid' field is zero the record is found in the so called 'root'. Only administrators are allowed access to the root and furthermore table records must be configured to either belonging to a page or being found in the root.
 
 &lt;b&gt;Storage of database records&lt;/b&gt;
-Depending on the 'Type' of the page, it may also represent a general storage for database elements in TYPO3. In that case it is not necessarily available as a webpage but only internally in the page tree as a place to store items such as users, subscriptions etc. Such pages are typically of the type &quot;Folder&quot;.</label>
+Depending on the 'Type' of the page, it may also represent a general storage for database elements in TYPO3. In that case it is not necessarily available as a webpage but only internally in the page tree as a place to store items such as users, subscriptions etc. Such pages are typically of the type &quot;SysFolder&quot;.</label>
 			<label index="_.seeAlso">xMOD_csh_corebe:pagetree,
 tt_content,
 About pages | http://typo3.org/documentation/document-library/doc_tut_quickstart/Pagetree/</label>
@@ -33,17 +33,17 @@
 			<label index="title.image_descr">The field for the page title has a little &quot;required&quot; icon next to it; You must supply a page title and you cannot save the new page unless you enter a title for it.</label>
 			<label index="doktype.description">Select the page type. This affects whether the page represents a visible webpage or is used for other purposes.</label>
 			<label index="doktype.details">The 'Standard' type represents a webpage.
-'Folder' represents a non-webpage - a folder acting as a storage for records of your choice.
+'SysFolder' represents a non-webpage - a folder acting as a storage for records of your choice.
 'Recycler' is a garbage bin.
 
-&lt;b&gt;Notice:&lt;/b&gt; Each type usually has a specific icon attached. Also certain types may not be available for a user (so you may experience that some of the options are not available for you!). And finally each type is configured to allow only certain table records in the page (a folder will allow any record if you have any problems).
+&lt;b&gt;Notice:&lt;/b&gt; Each type usually has a specific icon attached. Also certain types may not be available for a user (so you may experience that some of the options are not available for you!). And finally each type is configured to allow only certain table records in the page (SysFolder will allow any record if you have any problems).
 
 &lt;b&gt;$PAGES_TYPES [Technical]&lt;/b&gt;
 The restrictions that apply to each page type is defined in the global array $PAGES_TYPES. Here it is defined which tables are allowed on a page. When extensions adds tables to TYPO3 they may need to register their tables in $PAGES_TYPES so they can be created on standard pages.</label>
 			<label index="_doktype.seeAlso">be_groups:pagetypes_select,
 About $PAGES_TYPES | http://typo3.org/documentation/document-library/doc_core_api/PAGES_TYPES/</label>
 			<label index="_doktype.image">EXT:lang/cshimages/pages_4.png</label>
-			<label index="doktype.image_descr">This snippet of the page tree shows regular pages which usually have the yellow icons in top of this screenshot. You also see a Garbage bin page. Any records stored in a garbage bin should be regarded as waste and therefore not shown on the website etc. Finally the gray folders are, well, &quot;Folders&quot;. They cannot be viewed as regular webpages but serve as storage pages for database records of some kind.</label>
+			<label index="doktype.image_descr">This snippet of the page tree shows regular pages which usually have the yellow icons in top of this screenshot. You also see a Garbage bin page. Any records stored in a garbage bin should be regarded as waste and therefore not shown on the website etc. Finally the gray folders are &quot;SysFolders&quot;. They cannot be viewed as regular webpages but serve as storage pages for database records of some kind.</label>
 			<label index="TSconfig.description">Page TypoScript configuration.</label>
 			<label index="TSconfig.details">Basically 'TypoScript' is a concept for entering values in a tree-structure. This is known especially in relation to creating templates for TYPO3 websites.
 However the same principle for entering the hierarchy of values is used here to configure various features in relation to the backend, functions in modules, the Rich Text Editor etc.
@@ -71,7 +71,7 @@
 			<label index="storage_pid.description">A General Storage Folder is meant to be a global page for storage of general database elements of a website. That could be for templates, frontend users etc. which does not really relate to a single page but more to the whole site.</label>
 			<label index="storage_pid.details">It is recommended that applications support &quot;General Storage pages&quot; so that they look for records in the sites general storage folder by default and that they should be specifically configured to look elsewhere.
 
-A General Record Storage Page is typically a page of the &quot;Folder&quot; type.</label>
+A General Record Storage Page is typically a page of the &quot;SysFolder&quot; type.</label>
 			<label index="_storage_pid.seeAlso">The Storage Folder | http://typo3.org/documentation/document-library/doc_tut_ftb1/The_Storage_Folder/</label>
 			<label index="editlock.description">If set, non-Admin users cannot edit the page properties or any records on the page (except subpages). They cannot create new records or pages on the page either.</label>
 			<label index="fe_login_mode.description">The Login Mode disables the ability to &quot;be logged in&quot; at this page.</label>
Index: typo3/sysext/lang/locallang_csh_corebe.xml
===================================================================
--- typo3/sysext/lang/locallang_csh_corebe.xml	(revision 10044)
+++ typo3/sysext/lang/locallang_csh_corebe.xml	(working copy)
@@ -154,7 +154,7 @@
 			<label index="_new_regular.seeAlso">xMOD_csh_corebe:new_ce,
 xMOD_csh_corebe:new_pages</label>
 			<label index="_new_regular.image">EXT:lang/cshimages/core_70.png</label>
-			<label index="new_regular.image_descr">The selection of records a user can create on this particular page. The selection depends on the users permissions and the page type. For example a folder page type can contain any kind of record while regular pages can contain only some types (like content elements).</label>
+			<label index="new_regular.image_descr">The selection of records a user can create on this particular page. The selection depends on the users permissions and the page type. For example a SysFolder page type can contain any kind of record while regular pages can contain only some types (like content elements).</label>
 			<label index="new_pages.alttitle">Create new page wizard</label>
 			<label index="new_pages.description">Creating a new page means you have to find a position for it in the page tree. This wizard helps you find this position easily by clicking the flashing arrow pointing to the position you want.</label>
 			<label index="_new_pages.seeAlso">xMOD_csh_corebe:new_regular,