// Merge -> revision 9221

install-dev/langs/de.php

@@ -140,7 +140,6 @@ $_LANG['Update is complete!'] = 'Aktualisierung beendet!';
 $_LANG['Upgrade: get the latest stable version!'] = 'Aktualisierung: Installieren Sie die neueste Version von PrestaShop';
 $_LANG['Verify now!'] = 'Testen der SQL-Verbindung';
 $_LANG['Verify system compatibility'] = 'Systemkompatibilität';
-$_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'VORSICHT: Aus Sicherheitsgründen löschen Sie bitte den Ordner \'/install\' und die readme-Dateien (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
 $_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Vorsicht: eine manuelle Sicherung ist UNERLÄSSLICH, bevor mit der Aktualisierung der PrestaShop-Anwendung begonnen wird, um jeglichen versehentlichen Datenverlust zu verhindern';
 $_LANG['Welcome'] = 'Willkommen';
 $_LANG['Welcome to the PrestaShop %s Installer'] = 'Willkommen bei der Installation von PrestaShop %s';

install-dev/langs/es.php

@@ -138,7 +138,6 @@ $_LANG['Update is complete!'] = '¬°Actualización completa!';
 $_LANG['Upgrade: get the latest stable version!'] = 'Actualización: instale la última versión de PrestaShop';
 $_LANG['Verify now!'] = '¬°Pruebe ahora!';
 $_LANG['Verify system compatibility'] = 'Compatibilidad sistema';
-$_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'ATENCION : para más seguridad, por favor suprima la carpeta \'/install\' y los archivos readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG)..';
 $_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = '¬°Atención: se recomienda hacer una copia de seguridad manual antes de continuar!';
 $_LANG['Welcome'] = 'Bienvenido';
 $_LANG['Welcome to the PrestaShop %s Installer'] = 'Bienvenido a la instalación de PrestaShop %s';

install-dev/langs/fr.php

@@ -20,7 +20,7 @@ $_LANG['Community Forum'] = 'notre forum communautaire';
 $_LANG['Configure SMTP manually (advanced users only)'] = 'Configurer l\'envoi SMTP (experts uniquement)';
 $_LANG['Configure your database by filling out the following fields:'] = 'Configurez votre base de données en remplissant les champs ci-dessous :';
 $_LANG['Congratulation, your online shop is now ready!'] = 'Félicitations, votre boutique est installée !';
-$_LANG['Contact us!'] = 'Contactez-nous !';
+$_LANG['Contact us!'] = 'Contactez-nous';
 $_LANG['Create new files and folders allowed'] = 'Création de nouveaux dossiers et fichiers autorisée';
 $_LANG['Your database connection settings are not valid. Please check your server, name, login and prefix.'] = 'Vos informations de connexion à la base de données ne sont pas valides. Veuillez vérifier le serveur, nom, login et préfixe que vous avez indiqué.';
 $_LANG['Database Server is available but database is not found'] = 'Le serveur de bases de données est disponible mais la base de données n\'a pas été trouvée';
@@ -141,7 +141,6 @@ $_LANG['Update is complete!'] = 'Mise à jour terminée !';
 $_LANG['Upgrade: get the latest stable version!'] = 'Mise à jour : installez la dernière version de PrestaShop';
 $_LANG['Verify now!'] = 'Tester la connexion';
 $_LANG['Verify system compatibility'] = 'Compatibilité système';
-$_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'ATTENTION : pour plus de sécurité, merci de supprimer le dossier \'/install\' et les fichiers readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
 $_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Attention : une sauvegarde manuelle est INDISPENSABLE avant de procéder à la mise à jour de l\'application PrestaShop, cela afin de prévenir toute perte de données accidentelle';
 $_LANG['Welcome'] = 'Bienvenue';
 $_LANG['Welcome to the PrestaShop %s Installer'] = 'Bienvenue dans l\'installation de PrestaShop %s';

install-dev/langs/it.php

@@ -140,7 +140,6 @@ $_LANG['Update is complete!'] = 'Aggiornamento terminato!';
 $_LANG['Upgrade: get the latest stable version!'] = 'Aggiornamento installa l\'ultima versione di PrestaShop';
 $_LANG['Verify now!'] = 'Prova la connessione SQL';
 $_LANG['Verify system compatibility'] = 'Compatibilità sistema';
-$_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'ATTENZIONE: per motivi di sicurezza, adesso devi cancellare la cartella \'install\'  e i file readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
 $_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Attenzione: E\' FONDAMENTALE un backup manuale prima di continuare l\'aggiornamento dell\'applicazione Prestashop, al fine di evitare la perdita accidentale di dati.';
 $_LANG['Welcome'] = 'Benvenuto';
 $_LANG['Welcome to the PrestaShop %s Installer'] = 'Benvenuto nell\'installazione di PrestaShop %s';

install-dev/langs/us.php

@@ -64,7 +64,6 @@ $_LANG['This is not a valid image file.'] = 'Invalid image file';
 $_LANG['Too long!'] = 'Too long';
 $_LANG['Upgrade: get the latest stable version!'] = 'Update: Get the latest stable version';
 $_LANG['Verify system compatibility'] = 'System Compatibility';
-$_LANG['WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).'] = 'WARNING: For more security, you must delete the \'install\' folder and readme files(readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
 $_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'WARNING! A manual backup is HIGHLY recommended before continuing.';
 $_LANG['Welcome'] = 'Welcome!';
 $_LANG['Welcome to the PrestaShop '.INSTALL_VERSION.' Installer.'] = 'Welcome to the PrestaShop™ v'.INSTALL_VERSION.' Installer wizard.';