From 17618efb8b95bf9da30239ab604059439faa1e92 Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Tue, 27 Aug 2013 15:27:51 +0200
Subject: [PATCH] // Fixed details

---
 admin-dev/themes/default/template/footer.tpl | 10 +++++-----
 install-dev/langs/br/data/tab.xml            |  4 ++--
 install-dev/langs/de/data/tab.xml            |  4 ++--
 install-dev/langs/en/data/tab.xml            |  4 ++--
 install-dev/langs/es/data/tab.xml            |  4 ++--
 install-dev/langs/fr/data/tab.xml            |  4 ++--
 install-dev/langs/it/data/tab.xml            |  4 ++--
 install-dev/langs/nl/data/tab.xml            |  4 ++--
 install-dev/langs/pl/data/tab.xml            |  4 ++--
 install-dev/langs/ru/data/tab.xml            |  4 ++--
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/admin-dev/themes/default/template/footer.tpl b/admin-dev/themes/default/template/footer.tpl
index 66fefae89..5f2212a0d 100644
--- a/admin-dev/themes/default/template/footer.tpl
+++ b/admin-dev/themes/default/template/footer.tpl
@@ -35,12 +35,12 @@
 				</div>
 				<div class="footerRight">
 					{if $iso_is_fr}
-						<span>Questions / Renseignements / Formations :</span> <strong>+33 (0)1.40.18.30.04</strong> de 09h &agrave; 18h
+						<span>Questions / Renseignements / Formations :</span> <strong>+33 (0)1.40.18.30.04</strong>
 					{/if}
-					|&nbsp;<a href="http://www.prestashop.com/en/contact_us/" target="_blank" class="footer_link">{l s='Contact'}</a>
-					|&nbsp;<a href="http://forge.prestashop.com" target="_blank" class="footer_link">{l s='Bug Tracker'}</a>
-					|&nbsp;<a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">{l s='Forum'}</a>
-					|&nbsp;<a href="http://addons.prestashop.com/" target="_blank" class="footer_link">{l s='Addons'}</a>
+					|&nbsp;<a href="http://www.prestashop.com/en/contact-us?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Contact'}</a>
+					|&nbsp;<a href="http://forge.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Bug Tracker'}</a>
+					|&nbsp;<a href="http://www.prestashop.com/forums/?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Forum'}</a>
+					|&nbsp;<a href="http://addons.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Addons'}</a>
 				</div>
 			</div>
 		</div>
diff --git a/install-dev/langs/br/data/tab.xml b/install-dev/langs/br/data/tab.xml
index e7a311c62..d0dd5591e 100644
--- a/install-dev/langs/br/data/tab.xml
+++ b/install-dev/langs/br/data/tab.xml
@@ -74,8 +74,8 @@
   <tab id="Search" name="Pesquisar"/>
   <tab id="Search_Engines" name="Ferramentas de Pesquisa"/>
   <tab id="SEO_URLs" name="SEO e URLs"/>
-  <tab id="Shipping" name="Prefer&#xEA;ncias"/>
-  <tab id="Shipping_1" name="Envio"/>
+  <tab id="Shipping" name="Envio"/>
+  <tab id="Shipping_1" name="Prefer&#xEA;ncias"/>
   <tab id="Shop_URLs" name="URL da loja"/>
   <tab id="Shopping_Carts" name="Carrinhos de Compras"/>
   <tab id="Shops" name="Lojas"/>
diff --git a/install-dev/langs/de/data/tab.xml b/install-dev/langs/de/data/tab.xml
index 77e9e2a2c..237e792eb 100644
--- a/install-dev/langs/de/data/tab.xml
+++ b/install-dev/langs/de/data/tab.xml
@@ -74,8 +74,8 @@
   <tab id="Search" name="Suche"/>
   <tab id="Search_Engines" name="Suchmaschinen"/>
   <tab id="SEO_URLs" name="SEO &amp; URLs"/>
-  <tab id="Shipping" name="Voreinstellungen"/>
-  <tab id="Shipping_1" name="Versand"/>
+  <tab id="Shipping" name="Versand"/>
+  <tab id="Shipping_1" name="Voreinstellungen"/>
   <tab id="Shop_URLs" name="Shop-URLs"/>
   <tab id="Shopping_Carts" name="Warenk&#xF6;rbe"/>
   <tab id="Shops" name="Shops"/>
diff --git a/install-dev/langs/en/data/tab.xml b/install-dev/langs/en/data/tab.xml
index 8a8a26d53..4eaf19c75 100644
--- a/install-dev/langs/en/data/tab.xml
+++ b/install-dev/langs/en/data/tab.xml
@@ -12,7 +12,7 @@
   <tab id="Orders" name="Orders"/>
   <tab id="Customers" name="Customers"/>
   <tab id="Price_Rules" name="Price Rules"/>
-  <tab id="Shipping" name="Preferences"/>
+  <tab id="Shipping" name="Shipping"/>
   <tab id="Localization" name="Localization"/>
   <tab id="Modules" name="Modules"/>
   <tab id="Preferences" name="Preferences"/>
@@ -48,7 +48,7 @@
   <tab id="Cart_Rules" name="Cart Rules"/>
   <tab id="Catalog_Price_Rules" name="Catalog Price Rules"/>
   <tab id="Marketing" name="Marketing"/>
-  <tab id="Shipping_1" name="Shipping"/>
+  <tab id="Shipping_1" name="Preferences"/>
   <tab id="Carriers" name="Carriers"/>
   <tab id="Localization_1" name="Localization"/>
   <tab id="Languages" name="Languages"/>
diff --git a/install-dev/langs/es/data/tab.xml b/install-dev/langs/es/data/tab.xml
index a6b338ef1..6d0c59194 100644
--- a/install-dev/langs/es/data/tab.xml
+++ b/install-dev/langs/es/data/tab.xml
@@ -74,8 +74,8 @@
   <tab id="Search" name="Buscar"/>
   <tab id="Search_Engines" name="Buscador"/>
   <tab id="SEO_URLs" name="SEO y URLs"/>
-  <tab id="Shipping" name="Preferencias"/>
-  <tab id="Shipping_1" name="transporte"/>
+  <tab id="Shipping" name="Transporte"/>
+  <tab id="Shipping_1" name="Preferencias"/>
   <tab id="Shop_URLs" name="URL cortos"/>
   <tab id="Shopping_Carts" name="Cestas"/>
   <tab id="Shops" name="Tiendas"/>
diff --git a/install-dev/langs/fr/data/tab.xml b/install-dev/langs/fr/data/tab.xml
index af30db6ef..db545d6b9 100644
--- a/install-dev/langs/fr/data/tab.xml
+++ b/install-dev/langs/fr/data/tab.xml
@@ -74,8 +74,8 @@
   <tab id="Search" name="Recherche"/>
   <tab id="Search_Engines" name="Moteurs de recherche"/>
   <tab id="SEO_URLs" name="SEO &amp; URLs"/>
-  <tab id="Shipping" name="Préférences"/>
-  <tab id="Shipping_1" name="Transport"/>
+  <tab id="Shipping" name="Transport"/>
+  <tab id="Shipping_1" name="Préférences"/>
   <tab id="Shop_URLs" name="URLs de boutique"/>
   <tab id="Shopping_Carts" name="Paniers"/>
   <tab id="Shops" name="Boutiques"/>
diff --git a/install-dev/langs/it/data/tab.xml b/install-dev/langs/it/data/tab.xml
index 7680fd02a..d92e19771 100644
--- a/install-dev/langs/it/data/tab.xml
+++ b/install-dev/langs/it/data/tab.xml
@@ -74,8 +74,8 @@
   <tab id="Search" name="Cerca"/>
   <tab id="Search_Engines" name="Motori di ricerca"/>
   <tab id="SEO_URLs" name="URL e SEO"/>
-  <tab id="Shipping" name="Preferenze"/>
-  <tab id="Shipping_1" name="Spedizione"/>
+  <tab id="Shipping" name="Spedizione"/>
+  <tab id="Shipping_1" name="Preferenze"/>
   <tab id="Shop_URLs" name="URLs negozi"/>
   <tab id="Shopping_Carts" name="Carrello"/>
   <tab id="Shops" name="Negozi associati"/>
diff --git a/install-dev/langs/nl/data/tab.xml b/install-dev/langs/nl/data/tab.xml
index a574d957d..ddb0ba5fa 100644
--- a/install-dev/langs/nl/data/tab.xml
+++ b/install-dev/langs/nl/data/tab.xml
@@ -12,7 +12,7 @@
   <tab id="Orders" name="Orders"/>
   <tab id="Customers" name="Customers"/>
   <tab id="Price_Rules" name="Price Rules"/>
-  <tab id="Shipping" name="Preferences"/>
+  <tab id="Shipping" name="Shipping"/>
   <tab id="Localization" name="Localization"/>
   <tab id="Modules" name="Modules"/>
   <tab id="Preferences" name="Preferences"/>
@@ -48,7 +48,7 @@
   <tab id="Cart_Rules" name="Cart Rules"/>
   <tab id="Catalog_Price_Rules" name="Catalog Price Rules"/>
   <tab id="Marketing" name="Marketing"/>
-  <tab id="Shipping_1" name="Shipping"/>
+  <tab id="Shipping_1" name="Preferences"/>
   <tab id="Carriers" name="Carriers"/>
   <tab id="Price_Ranges" name="Price Ranges"/>
   <tab id="Weight_Ranges" name="Weight Ranges"/>
diff --git a/install-dev/langs/pl/data/tab.xml b/install-dev/langs/pl/data/tab.xml
index 6e8b4ea69..5594c813a 100644
--- a/install-dev/langs/pl/data/tab.xml
+++ b/install-dev/langs/pl/data/tab.xml
@@ -74,8 +74,8 @@
   <tab id="Search" name="Wyszukaj"/>
   <tab id="Search_Engines" name="Wyszukiwarki"/>
   <tab id="SEO_URLs" name="Dane URL i SEO"/>
-  <tab id="Shipping" name="Preferencje"/>
-  <tab id="Shipping_1" name="Wysy&#x142;ka"/>
+  <tab id="Shipping" name="Wysy&#x142;ka"/>
+  <tab id="Shipping_1" name="Preferencje"/>
   <tab id="Shop_URLs" name="Adres URL sklepu"/>
   <tab id="Shopping_Carts" name="Koszyk zakup&#xF3;w"/>
   <tab id="Shops" name="Sklepy"/>
diff --git a/install-dev/langs/ru/data/tab.xml b/install-dev/langs/ru/data/tab.xml
index 61a47ddd3..61e2c4856 100644
--- a/install-dev/langs/ru/data/tab.xml
+++ b/install-dev/langs/ru/data/tab.xml
@@ -74,8 +74,8 @@
   <tab id="Search" name="&#x41F;&#x43E;&#x438;&#x441;&#x43A;"/>
   <tab id="Search_Engines" name="&#x41F;&#x43E;&#x438;&#x441;&#x43A;&#x43E;&#x432;&#x44B;&#x435; &#x441;-&#x43C;&#x44B;"/>
   <tab id="SEO_URLs" name="SEO &#x438; URLs"/>
-  <tab id="Shipping" name="&#x41D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438;"/>
-  <tab id="Shipping_1" name="&#x414;&#x43E;&#x441;&#x442;&#x430;&#x432;&#x43A;&#x430;"/>
+  <tab id="Shipping" name="&#x414;&#x43E;&#x441;&#x442;&#x430;&#x432;&#x43A;&#x430;"/>
+  <tab id="Shipping_1" name="&#x41D;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x439;&#x43A;&#x438;"/>
   <tab id="Shop_URLs" name="URL &#x43C;&#x430;&#x433;&#x430;&#x437;&#x438;&#x43D;&#x430;"/>
   <tab id="Shopping_Carts" name="&#x41A;&#x43E;&#x440;&#x437;&#x438;&#x43D;&#x44B;"/>
   <tab id="Shops" name="&#x41C;&#x430;&#x433;&#x430;&#x437;&#x438;&#x43D;&#x44B;"/>