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

// merge 1.4 (5397)

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6048 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
fBrignoli
2011-04-22 16:00:58 +00:00
parent 7b4eda5137
commit 43b6a41bbc
126 changed files with 3390 additions and 1430 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mails/de/lang.php
+32 -32
View File
@@ -2,38 +2,38 @@
global $_LANGMAIL;
$_LANGMAIL = array();
$_LANGMAIL['Welcome!'] = '';
$_LANGMAIL['Message from contact form'] = '';
$_LANGMAIL['Your message has been correctly sent'] = '';
$_LANGMAIL['New credit slip regarding your order'] = '';
$_LANGMAIL['Virtual product to download'] = '';
$_LANGMAIL['Fwd: Customer message'] = '';
$_LANGMAIL['Your guest account has been transformed to customer account'] = '';
$_LANGMAIL['Package in transit'] = '';
$_LANGMAIL['Welcome!'] = 'Willkommen!';
$_LANGMAIL['Message from contact form'] = 'Nachricht aus dem Kontaktformular';
$_LANGMAIL['Your message has been correctly sent'] = 'Ihre Nachricht ist korrekt gesendet worden';
$_LANGMAIL['New credit slip regarding your order'] = 'Neuer Gutschein zu Ihrer Bestellung';
$_LANGMAIL['Virtual product to download'] = 'Virtuelles Produkt zum Downloaden';
$_LANGMAIL['Fwd: Customer message'] = 'Fwd: Kundennachricht';
$_LANGMAIL['Your guest account has been transformed to customer account'] = 'Ihr Gast-Konto wurde in ein Kunden-Konto umgewandelt';
$_LANGMAIL['Package in transit'] = 'Paket auf dem Weg';
$_LANGMAIL['[Log'] = '';
$_LANGMAIL['Order confirmation'] = '';
$_LANGMAIL['Message from a customer'] = '';
$_LANGMAIL['New message regarding your order'] = '';
$_LANGMAIL['Your order return state has changed'] = '';
$_LANGMAIL['Your password'] = '';
$_LANGMAIL['Password query confirmation'] = '';
$_LANGMAIL['An answer to your message is available'] = '';
$_LANGMAIL['New voucher regarding your order'] = '';
$_LANGMAIL['Happy birthday!'] = '';
$_LANGMAIL['Newsletter confirmation'] = '';
$_LANGMAIL['Newsletter voucher'] = '';
$_LANGMAIL['Your wishlist\\\'s link'] = '';
$_LANGMAIL['Message from '] = '';
$_LANGMAIL[' $subject'] = '';
$_LANGMAIL['Your cart and your discount'] = '';
$_LANGMAIL['Thanks for your order'] = '';
$_LANGMAIL['You are one of our best customers'] = '';
$_LANGMAIL['We miss you'] = '';
$_LANGMAIL['Product available'] = '';
$_LANGMAIL['Product out of stock'] = '';
$_LANGMAIL['Error reporting from your PayPal module'] = '';
$_LANGMAIL['Congratulations!'] = '';
$_LANGMAIL['Referral Program'] = '';
$_LANGMAIL['A friend sent you a link to'] = '';
$_LANGMAIL['Order confirmation'] = 'Bestellungsbestätigung';
$_LANGMAIL['Message from a customer'] = 'Nachricht eines Kunden';
$_LANGMAIL['New message regarding your order'] = 'Neue Nachricht zu Ihrer Bestellung';
$_LANGMAIL['Your order return state has changed'] = 'Ihr Bestellrücksendungsstatus hat sich geändert';
$_LANGMAIL['Your password'] = 'Ihr Kennwort';
$_LANGMAIL['Password query confirmation'] = 'Bestätigung der Kennwortanfrage';
$_LANGMAIL['An answer to your message is available'] = 'Es steht eine Antwort auf Ihre Nachricht zur Verfügung';
$_LANGMAIL['New voucher regarding your order'] = 'Neuer Gutschein zu Ihrer Bestellung';
$_LANGMAIL['Happy birthday!'] = 'Alles Gute zum Geburtstag!';
$_LANGMAIL['Newsletter confirmation'] = 'Newsletter-Bestätigung';
$_LANGMAIL['Newsletter voucher'] = 'Newsletter-Gutschein';
$_LANGMAIL['Your wishlist\\\'s link'] = 'Ihr Wunschlisten-Link';
$_LANGMAIL['Message from '] = 'Nachricht von';
$_LANGMAIL[' $subject'] = '$subject';
$_LANGMAIL['Your cart and your discount'] = 'Ihr Warenkorb und Ihr Rabatt';
$_LANGMAIL['Thank you for your order.'] = 'Danke für Ihre Bestellung.';
$_LANGMAIL['You are one of our best customers!'] = 'Sind sind einer unserer besten Kunden!';
$_LANGMAIL['We miss you!'] = 'Wir vermissen Sie!';
$_LANGMAIL['Product available'] = 'Produkt verfügbar';
$_LANGMAIL['Product out of stock'] = 'Produkt ausverkauft';
$_LANGMAIL['Error reporting from your PayPal module'] = 'Fehlerbericht aus Ihrem PayPal Modul';
$_LANGMAIL['Congratulations!'] = 'Herzlichen Glückwunsch!';
$_LANGMAIL['Referral Program'] = 'Empfehlungsprogramm';
$_LANGMAIL['A friend sent you a link to'] = 'Ein Freund hat Ihnen einen Link gesandt zu';
?>
mails/fr/order_conf.html
+2 -17
View File
@@ -90,25 +90,10 @@
</tr>
<tr>
<td style="padding:0.5em 0 0.5em 0.5em; background-color:#EBECEE;">
{delivery_company}
<br><span style="color:#DB3484; font-weight:bold;">{delivery_firstname} {delivery_lastname}</span>
<br>{delivery_address1}
<br>{delivery_address2}
<br>{delivery_city} {delivery_postal_code}
<br>{delivery_country} {delivery_state}
<br>{delivery_phone}
<br>{delivery_other}
{delivery_block_html}
</td>
<td style="padding:0.5em 0 0.5em 0.5em; background-color:#EBECEE;">
{invoice_company}
<br />{invoice_vat_number}
<br><span style="color:#DB3484; font-weight:bold;">{invoice_firstname} {invoice_lastname}</span>
<br>{invoice_address1}
<br>{invoice_address2}
<br>{invoice_city} {invoice_postal_code}
<br>{invoice_country} {invoice_state}
<br>{invoice_phone}
<br>{invoice_other}
{invoice_block_html}
</td>
</tr>
</table>
mails/fr/order_conf.txt
+2 -17
View File
@@ -17,25 +17,10 @@ Livraison
Transporteur : {carrier}
Adresse de livraison :
{delivery_company}
{delivery_firstname} {delivery_lastname}
{delivery_address1}
{delivery_address2}
{delivery_postal_code} {delivery_city}
{delivery_country} {delivery_state}
{delivery_other}
{delivery_block_txt}
Adresse de facturation :
{invoice_company}
{invoice_vat_number}
{invoice_firstname} {invoice_lastname}
{invoice_address1}
{invoice_address2}
{invoice_postal_code} {invoice_city}
{invoice_country} {invoice_state}
{invoice_other}
{invoice_block_txt}
Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse: {shop_url}guest-tracking.php