From af4b258201982185a419afb7a6c31d1990f6f19b Mon Sep 17 00:00:00 2001
From: djfm <fm.de.jouvencel@gmail.com>
Date: Fri, 22 Nov 2013 14:22:26 +0000
Subject: [PATCH 1/5] // js=1, not '1'

---
 .../template/controllers/dashboard/helpers/view/view.tpl      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
index ffe85bf5c..90ab4b49f 100644
--- a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
@@ -26,9 +26,9 @@
 <script>
 	var dashboard_ajax_url = '{$link->getAdminLink('AdminDashboard')}';
 	var adminstats_ajax_url = '{$link->getAdminLink('AdminStats')}';
-	var no_results_translation = '{l s='No result' js='1'}';
+	var no_results_translation = '{l s='No result' js=1}';
 	var dashboard_use_push = '{$dashboard_use_push|intval}';
-	var read_more = '{l s='Read more' js='1'}';
+	var read_more = '{l s='Read more' js=1}';
 </script>
 
 <div id="dashboard">

From a147806382bd857356b15a9602eea44069e9789f Mon Sep 17 00:00:00 2001
From: djfm <fm.de.jouvencel@gmail.com>
Date: Fri, 22 Nov 2013 15:44:49 +0000
Subject: [PATCH 2/5] // Improved texts and UI in AdminImport

---
 .../controllers/import/helpers/view/view.tpl  | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl
index 9f25e6e44..50059e620 100644
--- a/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl
@@ -25,7 +25,7 @@
 {extends file="helpers/view/view.tpl"}
 {block name="override_tpl"}
 	<script type="text/javascript">
-		var errorEmpty = '{l s='Please name your matching configuration to save.' js=1}';
+		var errorEmpty = '{l s='Please name your mapping configuration in order to save it.' js=1}';
 		var token = '{$token}';
 		var current = 0;
 		function showTable(nb)
@@ -64,18 +64,12 @@
 	</script>
 	<div id="container-customer" class="panel">
 	<h3><i class="icon-list-alt"></i> {l s='View your data'}</h3>
+	<div class="alert alert-info">
+		<p>{l s='Please map each column of your source CSV file to one of the destination columns.'}</p>
+	</div>
 	<div class="form-horizontal">
-		<div class="form-group">
-			<label class="control-label col-lg-3">{l s='Save and load your configuration for importing files'} : </label>
-			<div class="col-lg-7">
-				<input type="text" name="newImportMatchs" id="newImportMatchs" />		
-			</div>
-			<div class="col-lg-2">
-				<a id="saveImportMatchs" class="btn btn-default" href="#"><i class="icon-save"></i> {l s='Save'}</a>
-			</div>
-		</div>
 		<div class="form-group" {if !$import_matchs}style="display:none"{/if}>
-			<label class="control-label col-lg-3">{l s='Matches'} : </label>
+			<label class="control-label col-lg-3">{l s='Load a mapping configuration'}</label>
 			<div id="selectDivImportMatchs" class="col-lg-7">
 				<select id="valueImportMatchs">
 					{foreach $import_matchs as $match}
@@ -88,9 +82,15 @@
 				<a id="deleteImportMatchs" href="#" class="btn btn-default"><i class="icon-remove"></i> {l s='Delete'}</a>
 			</div>
 		</div>
-	</div>
-	<div class="row">
-		<p>{l s='Please set the value type of each column'}</p>
+		<div class="form-group">
+			<label class="control-label col-lg-3">{l s='Save your mapping configuration'}</label>
+			<div class="col-lg-7">
+				<input type="text" name="newImportMatchs" id="newImportMatchs" />		
+			</div>
+			<div class="col-lg-2">
+				<a id="saveImportMatchs" class="btn btn-default" href="#"><i class="icon-save"></i> {l s='Save'}</a>
+			</div>
+		</div>
 	</div>
 	<div id="error_duplicate_type" class="alert alert-warning" style="display:none;">
 		{l s='Columns cannot have the same value type'}
@@ -117,8 +117,9 @@
 		<input type="hidden" name="multiple_value_separator" value="{$fields_value.multiple_value_separator}" />
 		<div class="form-group">
 			<label class="control-label col-lg-3">{l s='Lines to skip'}</label>
-			<div class="col-lg-9">
+			<div class="col-lg-7">
 				<input type="text" size="2" name="skip" value="1" />
+				<p class="help-block">{l s='This number indicates how many of the first lines of your CSV file should be skipped when importing the data. For instance set it to 1 if the first row of your file contains headers.'}</p>
 			</div>
 		</div>
 		<div class="form-group">

From a385e1af42a120cbd1a019e998e838534b38396b Mon Sep 17 00:00:00 2001
From: djfm <fm.de.jouvencel@gmail.com>
Date: Fri, 22 Nov 2013 16:11:37 +0000
Subject: [PATCH 3/5] // remove mod= parameters for translations in the
 Front-Office

---
 themes/default-bootstrap/header.tpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/default-bootstrap/header.tpl b/themes/default-bootstrap/header.tpl
index 6a24da8fb..03c56e2c9 100644
--- a/themes/default-bootstrap/header.tpl
+++ b/themes/default-bootstrap/header.tpl
@@ -109,9 +109,9 @@
                         	 <!-- User info -->
                         	<div id="header_user_info">
                                 {if $logged}
-                                    <a href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html'}" title="{l s='Log me out' mod='blockuserinfo'}" class="logout" rel="nofollow">{l s='Sign out' mod='blockuserinfo'}</a>
+                                    <a href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html'}" title="{l s='Log me out'}" class="logout" rel="nofollow">{l s='Sign out'}</a>
                                 {else}
-                                    <a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='Login to your customer account' mod='blockuserinfo'}" class="login" rel="nofollow">{l s='Sign in' mod='blockuserinfo'}</a>
+                                    <a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='Login to your customer account'}" class="login" rel="nofollow">{l s='Sign in'}</a>
                                 {/if}
                             </div>
                             <!-- /User info -->
@@ -168,7 +168,7 @@
                                         <div class="current">
                                             <input type="hidden" name="id_currency" id="id_currency" value=""/>
                                             <input type="hidden" name="SubmitCurrency" value="" />
-                                            <span class="cur-label">{l s='Currency' mod='blockcurrencies'} :</span>
+                                            <span class="cur-label">{l s='Currency'} :</span>
                                             {foreach from=$currencies key=k item=f_currency}
                                                 {if $cookie->id_currency == $f_currency.id_currency}<strong>{$f_currency.iso_code}</strong>{/if}
                                             {/foreach}
@@ -186,7 +186,7 @@
 							<!-- /Currencies -->
                             <!--Contact link-->
                             <div id="contact-link">
-                                <a href="{$link->getPageLink('contact', true)|escape:'html'}" title="{l s='contact' mod='blockpermanentlinks'}">{l s='Contact Us' mod='blockpermanentlinks'}</a>
+                                <a href="{$link->getPageLink('contact', true)|escape:'html'}" title="{l s='contact'}">{l s='Contact Us'}</a>
                             </div>
                             <span class="shop-phone"><i class="icon-phone"></i>{l s='Call us now toll free:'} <strong>{$shop_phone}(800) 2345-6789</strong></span>
                         </div>

From 1c6a58c902a2da42de37d7a8e3bb7382d68a6001 Mon Sep 17 00:00:00 2001
From: djfm <fm.de.jouvencel@gmail.com>
Date: Fri, 22 Nov 2013 16:16:59 +0000
Subject: [PATCH 4/5] // English

---
 modules/dashactivity/dashactivity.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/dashactivity/dashactivity.php b/modules/dashactivity/dashactivity.php
index a2eb1beb4..053c26033 100644
--- a/modules/dashactivity/dashactivity.php
+++ b/modules/dashactivity/dashactivity.php
@@ -354,7 +354,7 @@ class Dashactivity extends Module
 		);
 			
 		$fields_form['form']['input'][] = array(
-			'label' => $this->l('Cart as active'),
+			'label' => $this->l('Cart active'),
 			'desc' => $this->l('Default time range to consider a Shopping cart as active (default 30, max 120)'),
 			'name' => 'DASHACTIVITY_CART_ACTIVE',
 			'type' => 'select',

From 01d6d7c279c45d8dda2d07a314f2d71ad7f0a534 Mon Sep 17 00:00:00 2001
From: djfm <fm.de.jouvencel@gmail.com>
Date: Fri, 22 Nov 2013 16:32:54 +0000
Subject: [PATCH 5/5] // clearer message

---
 modules/addsharethis/addsharethis.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/addsharethis/addsharethis.php b/modules/addsharethis/addsharethis.php
index 2c7ea9f08..67faf1d6e 100644
--- a/modules/addsharethis/addsharethis.php
+++ b/modules/addsharethis/addsharethis.php
@@ -96,7 +96,7 @@ class AddShareThis extends Module
 				</div>
 				<div class="form-group">
 					<div class="col-lg-9 col-lg-push-3">
-						<p class="help-block">'.$this->l('Key in your account statistic http://sharethis.com').'</p>
+						<p class="help-block">'.$this->l('You will find this key in your account settings on http://sharethis.com.').'</p>
 					</div>
 				</div>
 				<div class="form-group">