Merge branch 'cleanmaster' into modules

This commit is contained in:
Etienne Roudeix
2013-12-10 15:57:37 +01:00
31 changed files with 1238 additions and 350 deletions

View File

@@ -7,7 +7,7 @@
<form method="POST" action="{url path='/admin/content/folder/add'}" id="related_content_form">
<p class="title title-without-tabs">{intl l='Additional Folders'}</p>
<p>{intl l='A content could be attached to more than one folder. Select here the additional fodlers for this content.'}
<p>{intl l='A content could be attached to more than one folder. Select here the additional folders for this content.'}
{loop name="default_folder" type="folder" id=$DEFAULT_FOLDER}
{intl l='You can change the default folder (%title) in the "General" tab.' title=$TITLE}
{/loop}