dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
Francois Gaillard
2013-09-12 14:32:22 +02:00
parent 53c1e56c51 8590b0e699
commit cc36eb2d27
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/authentication.tpl
+1 -1
View File
@@ -160,7 +160,7 @@ $(document).ready(function() {
<fieldset> <fieldset>
<h3>{l s='Create an account'}</h3> <h3>{l s='Create an account'}</h3>
<div class="form_content clearfix"> <div class="form_content clearfix">
<p class="title_block">{l s='Please enter your email address to create an account.'}.</p> <p class="title_block">{l s='Please enter your email address to create an account.'}</p>
<div class="error" id="create_account_error" style="display:none"></div> <div class="error" id="create_account_error" style="display:none"></div>
<p class="text"> <p class="text">
<label for="email_create">{l s='Email address'}</label> <label for="email_create">{l s='Email address'}</label>
themes/default/order-follow.tpl
+1 -1
View File
@@ -34,7 +34,7 @@
</p> </p>
<p> <p>
<h2>{l s='Please provide an explanation for your RMA:'}</h2> <h2>{l s='Please provide an explanation for your RMA:'}</h2>
<form method="POST" id="returnOrderMessage"/> <form method="POST" id="returnOrderMessage">
<p class="textarea"> <p class="textarea">
<textarea name="returnText"></textarea> <textarea name="returnText"></textarea>
</p> </p>