Index: locallang.xml
===================================================================
--- locallang.xml	(revision 27101)
+++ locallang.xml	(working copy)
@@ -10,7 +10,7 @@
 	</meta>
 	<data type="array">
 		<languageKey index="default" type="array">
-			<label index="cm1_title">TemplaVoila</label>
+			<label index="cm1_title">TemplaVoilà</label>
 			<label index="cm1_viewsubelements">View: Sub elements</label>
 			<label index="cm1_viewflexformxml">View: Flexform XML</label>
 			<label index="cm_viewdsto">View: DS/TO</label>
Index: locallang_csh_begr.xml
===================================================================
--- locallang_csh_begr.xml	(revision 27101)
+++ locallang_csh_begr.xml	(working copy)
@@ -11,7 +11,7 @@
     </meta>
     <data type="array">
         <languageKey index="default" type="array">
-            <label index="tx_templavoila_access.description">Select TemplaVoila objects to disallow access to. Notice that disallowing access to DS (data structure) implicitly disallows access to any TO (template object) associated with this DS.</label>
+            <label index="tx_templavoila_access.description">Select TemplaVoilà objects to disallow access to. Notice that disallowing access to DS (data structure) implicitly disallows access to any TO (template object) associated with this DS.</label>
             <label index="datastructure.description">Select data structure of this template object</label>
             <label index="fileref.description">Reference to a file to map with this template object</label>
             <label index="templatemapping.description"></label>
Index: locallang_csh_intro.xml
===================================================================
--- locallang_csh_intro.xml	(revision 27101)
+++ locallang_csh_intro.xml	(working copy)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <T3locallang>
 	<meta type="array">
-		<description>Introduction to TemplaVoila Extension</description>
+		<description>Introduction to TemplaVoilà Extension</description>
 		<type>CSH</type>
 		<csh_table>xEXT_templavoila</csh_table>
 		<fileId>EXT:templavoila/locallang_csh_intro.php</fileId>
@@ -10,11 +10,11 @@
 	</meta>
 	<data type="array">
 		<languageKey index="default" type="array">
-			<label index=".alttitle">TemplaVoila</label>
-			<label index=".description">The TemplaVoila extension contains a unique point'n'click template mapping engine, a new content element type &quot;Flexible Content&quot; (for fixed-template elements) and a new page module for building web-pages with nested content elements.</label>
+			<label index=".alttitle">TemplaVoilà</label>
+			<label index=".description">The TemplaVoilà extension contains a unique point'n'click template mapping engine, a new content element type &quot;Flexible Content&quot; (for fixed-template elements) and a new page module for building web-pages with nested content elements.</label>
 			<label index="_.seeAlso">Tutorial (Futuristic Template Building) | http://typo3.org/documentation/document-library/doc_tut_ftb1/</label>
 			<label index="_.image">EXT:templavoila/cshimages/intro.png</label>
-			<label index=".image_descr">One part of TemplaVoila is the unique template mapping system which visually shows HTML tags from the template file and allows the user to map data to HTML elements by a single mouseclick.</label>
+			<label index=".image_descr">One part of TemplaVoilà is the unique template mapping system which visually shows HTML tags from the template file and allows the user to map data to HTML elements by a single mouseclick.</label>
 			<label index=".syntax"></label>
 		</languageKey>
 	</data>
Index: locallang_csh_module.xml
===================================================================
--- locallang_csh_module.xml	(revision 27101)
+++ locallang_csh_module.xml	(working copy)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <T3locallang>
     <meta type="array">
-        <description>Mapping Documentation for TemplaVoila.</description>
+        <description>Mapping Documentation for TemplaVoilà.</description>
         <type>CSH</type>
         <csh_table>xMOD_tx_templavoila</csh_table>
         <fileId>EXT:templavoila/locallang_csh_module.xml</fileId>
     </meta>
     <data type="array">
         <languageKey index="default" type="array">
-            <label index=".alttitle">TemplaVoila Mapping</label>
+            <label index=".alttitle">TemplaVoilà Mapping</label>
             <label index="mapping_file.description">Modify the structure of this Template and map it with a certain HTML.</label>
             <label index="mapping_file_showXMLDS.description">This view shows the "source code" of what is built together for the Data Structure. You can later modify this data manually.</label>
             <label index="mapping_file_loadDSXML.description">On this page, you can select to load an existing XML (either through an existing Data Structure or through a simple copy / paste of XML in the area below, to replace the existing data structure.</label>
-            <label index="mapping_file_createDSTO.description">Add the Data Structure and Template Object (TemplaVoila will create both of them for you) to a certain Storage Folder. Please be aware that you have to have an existing Storage Folder in your page tree to select it from the dropdown. If you choose "Page Template" as the "Template Type", the new DS/TO Combo will appear when you edit the page properties. If you select "Content Element", the new TO will appear as a new content element type option when you add a new Content Element within any page.</label>
+            <label index="mapping_file_createDSTO.description">Add the Data Structure and Template Object (TemplaVoilà will create both of them for you) to a certain Storage Folder. Please be aware that you have to have an existing Storage Folder in your page tree to select it from the dropdown. If you choose "Page Template" as the "Template Type", the new DS/TO Combo will appear when you edit the page properties. If you select "Content Element", the new TO will appear as a new content element type option when you add a new Content Element within any page.</label>
             <label index="mapping_to.description">This tab shows a list of the Template Object (TO), the file and the correspondig Data Structure (DS)</label>
             <label index="mapping_to_htmlheaderparts.description">[FILL IN] mapping_to_htmlheaderparts</label>
             <label index="mapping_to_openInOwnWindow.description">[FILL IN] mapping_to_openInOwnWindow</label>
@@ -29,7 +29,7 @@
             <label index="mapping_window_help.description">In the screen below you'll see the composite work of the plain HTML template, where the mapped HTML tags are replaced with the sample data (if available).</label>
             <label index="mapping_basics.description">This screen basically allows you to create certain structure through adding fields (when creating the Data Structure) and then map these fields to HTML tags within a HTML template.</label>
             <label index="mapping_to_headerParts.description">When adding a new page template, the Mapping (see other tab) only works on the &lt;body&gt; tag, if you need to add other HTML tags from the HTML &lt;head&gt; tag, you can do this on this screen. Please make sure to hit the "Set" button on the bottom of this list to save your changes. Additional tags in the head part of your HTML can of course be added via regular TypoScript.</label>
-            <label index="mapping_to_headerParts_buttons.description">Press "Clear All" to unset all checkboxes above; "Set" saves the changes of this page (the additional tags), "Save" writes the changes of the Mapping (see other tab) to the database. "Save and return" also writes the mapping to the database, but will also return to the TemplaVoila Control Center.</label>
+            <label index="mapping_to_headerParts_buttons.description">Press "Clear All" to unset all checkboxes above; "Set" saves the changes of this page (the additional tags), "Save" writes the changes of the Mapping (see other tab) to the database. "Save and return" also writes the mapping to the database, but will also return to the TemplaVoilà Control Center.</label>
             <label index="mapping_editform.description">Select the Mapping Type, a distinguishable name, instructions for the one who will map the data to a HTML template later on (optional). The Editing Type determines how the data on the field should be entered. Mapping rules allow to only map to certain HTML tags or HTML attributes. "a:attr:href" to only allows mapping to href attributes of HTML anchor tags.</label>
             <label index="mapping_addfield.description">Enter a for this data structure unique string and click "Add field" to get to the detailed form for this new field.</label>
             <label index="mapping_modeset.description">"OUTER" means that the mapping will also replace the element that the field is mapped to, "INNER" means that the content of the element will be replaced, the element itself will be kept.</label>
Index: locallang_csh_to.xml
===================================================================
--- locallang_csh_to.xml	(revision 27101)
+++ locallang_csh_to.xml	(working copy)
@@ -12,7 +12,7 @@
             <label index="title.description">Enter a title that describes this Template Object.</label>
             <label index="datastructure.description">Select a data structure that this Template Object makes use of.</label>
             <label index="fileref.description">Choose a HTML template as a basis for the mapping.</label>
-            <label index="templatemapping.description">This data holds all information needed for TemplaVoila to map the data structure to the actual HTML template file.</label>
+            <label index="templatemapping.description">This data holds all information needed for TemplaVoilà to map the data structure to the actual HTML template file.</label>
             <label index="previewicon.description">Select a preview image to this Template Structure to </label>
             <label index="description.description">Add a small description that is used in the wizards to help users distinguish your templates.</label>
             <label index="rendertype.description">Select whether this is a special Template Object, used for print or other uses, or for the default page.</label>
Index: locallang_db.xml
===================================================================
--- locallang_db.xml	(revision 27101)
+++ locallang_db.xml	(working copy)
@@ -23,7 +23,7 @@
 			<label index="tx_templavoila_tmplobj.parent">Make this a sub-template of:</label>
 			<label index="tx_templavoila_tmplobj.rendertype_ref">Inherit default subtemplates from:</label>
 			<label index="tx_templavoila_tmplobj.localProc">Local Processing (XML):</label>
-			<label index="be_groups.tx_templavoila_access">Disallow access to TemplaVoila objects:</label>
+			<label index="be_groups.tx_templavoila_access">Disallow access to TemplaVoilà objects:</label>
 			<label index="tx_templavoila_datastructure">TemplaVoilà Data Structure</label>
 			<label index="tx_templavoila_datastructure.title">Title:</label>
 			<label index="tx_templavoila_datastructure.dataprot">Data Structure XML:</label>
Index: mod1/locallang.xml
===================================================================
--- mod1/locallang.xml	(revision 27101)
+++ mod1/locallang.xml	(working copy)
@@ -12,15 +12,15 @@
 		<languageKey index="default" type="array">
 			<label index="title">WEB &gt; PAGE MODULE</label>
 			<label index="default_introduction">If you wish to edit the content of a page, please click the page title in the page tree to the left.</label>
-			<label index="csh_whatisthetemplavoilapagemodule">What is the TemplaVoilá page module?</label>
+			<label index="csh_whatisthetemplavoilapagemodule">What is the TemplaVoilà page module?</label>
 			<label index="createnewpage_selecttemplate">Select a template for your new page:</label>
 			<label index="createnewpage_defaultlayoutsubmitlabel">Create page with default layout</label>
 			<label index="createnewpage_templateobject_createemptypage">Create an empty page based on this template:</label>
 			<label index="createnewpage_templateobject_createpagewithdefaultcontent">Create a page with default content based on this template:</label>
 			<label index="createnewcontent_newContentElement">New content element</label>
 			<label index="warning_elementusedmorethanonce">This element has been used %s times on this page! ID:%s</label>
-			<label index="warning_containerSeparate">WARNING: This container element has localization without inheritance enabled (langChildren = 0). This is most likely a misconfiguration since the localization features of TemplaVoila does not support localized container fields in the native interface! Please inform the system administrator!</label>
-			<label index="warning_containerInheritance">This container element has localization enabled but with inheritance (langChildren = 1). This situation might produce confusing displays in TemplaVoila and you are encouraged to disable localization of this container element completely by setting langDisable = 1. Please inform the system administrator!</label>
+			<label index="warning_containerSeparate">WARNING: This container element has localization without inheritance enabled (langChildren = 0). This is most likely a misconfiguration since the localization features of TemplaVoilà does not support localized container fields in the native interface! Please inform the system administrator!</label>
+			<label index="warning_containerInheritance">This container element has localization enabled but with inheritance (langChildren = 1). This situation might produce confusing displays in TemplaVoilà and you are encouraged to disable localization of this container element completely by setting langDisable = 1. Please inform the system administrator!</label>
 			<label index="warning_containerSeparate_short">L10N mode: Separate!</label>
 			<label index="warning_containerInheritance_short">L10N mode: Inheritance</label>
 			<label index="cannotedit_doktypemountpoint">This page acts as a mount point and its content is being replaced by another page (&quot;%s&quot;). Therefore you cannot edit the content of this page directly.</label>
Index: mod1/locallang_db_new_content_el.xml
===================================================================
--- mod1/locallang_db_new_content_el.xml	(revision 27101)
+++ mod1/locallang_db_new_content_el.xml	(working copy)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <T3locallang>
 	<meta type="array">
-		<description>Labels for the TemplaVoila New Content Element wizard</description>
+		<description>Labels for the TemplaVoilà New Content Element wizard</description>
 		<type>module</type>
 		<fileId>EXT:templavoila/mod1/locallang_db_new_content_el.xml</fileId>
 		<labelContext type="array">
Index: mod1/locallang_mod.xml
===================================================================
--- mod1/locallang_mod.xml	(revision 27101)
+++ mod1/locallang_mod.xml	(working copy)
@@ -14,7 +14,7 @@
 	<data type="array">
 		<languageKey index="default" type="array">
 			<label index="mlang_tabs_tab">Page</label>
-			<label index="mlang_labels_tabdescr">This module allows you to create and edit webpages. It provides a template selector and management for different languages. This page module is part of the extension &quot;TemplaVoila&quot;.</label>
+			<label index="mlang_labels_tabdescr">This module allows you to create and edit webpages. It provides a template selector and management for different languages. This page module is part of the extension &quot;TemplaVoilà&quot;.</label>
 			<label index="mlang_labels_tablabel">Create and edit pages</label>
 		</languageKey>
 	</data>