From c142803da538841c18ef9b27bc8a79448f9413ec Mon Sep 17 00:00:00 2001 From: bMancone Date: Thu, 5 Apr 2012 08:13:42 +0000 Subject: [PATCH] // Installer: Fixed #PSFV-727 (Issues #1, #2, #3) --- install-dev/langs/de/install.php | 6 +++--- install-dev/langs/es/install.php | 6 +++--- install-dev/langs/fr/install.php | 6 +++--- install-dev/langs/it/install.php | 6 +++--- install-dev/theme/views/configure.phtml | 2 +- install-dev/theme/views/process.phtml | 2 +- install-dev/theme/views/welcome.phtml | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/install-dev/langs/de/install.php b/install-dev/langs/de/install.php index de2c4e026..7b29a09e1 100644 --- a/install-dev/langs/de/install.php +++ b/install-dev/langs/de/install.php @@ -95,7 +95,7 @@ 'Shop password:' => 'Kennwort des Shops:', 'Re-type to confirm:' => 'Bestätigen Sie das Kennwort:', 'Receive this information by e-mail' => 'Meine Einstellungen per E-Mail erhalten', - 'Warning: You will recieve these informations only if your e-mail configuration is correct.' => 'Hinweis: Sie erhalten diese Information nur, wenn Ihre Mail-Einstellungen korrekt sind', + 'Warning: You will receive this information only if your e-mail configuration is correct.' => 'Hinweis: Sie erhalten diese Information nur, wenn Ihre Mail-Einstellungen korrekt sind', 'Configure your database by filling out the following fields:' => 'Konfigurieren Sie Ihre Datenbank, indem Sie folgende Felder ausfüllen:', 'You have to create a database, help available in our online documentation.' => null, 'Database server address:' => 'Datenbank-Adresse', @@ -130,7 +130,7 @@ 'An error occured during installation...' => 'Während der Installation ist ein Fehler aufgetreten', 'You can use the links on the left column to go back to the previous steps, or restart the installation process by clicking here.' => 'Um zum vorherigen Schritt zu gelangen, können Sie die Links in der Linken Spalte nutzen, oder den Installationsprozess komplett neu starten wenn Sie HIER klicken.', 'Your installation is finished!' => 'Die Installation ist abgeschlossen!', - 'You have just finished to install and configure your shop, thank you for using PrestaShop!' => 'Sie haben soeben Ihren Shop erfolgreich installiert. Danke dass Sie Prestashop nutzen', + 'You have just finished installing and configuring your shop. Thank you for using PrestaShop!' => 'Sie haben soeben Ihren Shop erfolgreich installiert. Danke dass Sie Prestashop nutzen', 'Please remember your login information:' => 'Merken Sie sich Ihre Log-In-Daten', 'WARNING: For security purposes, you must delete the "install" folder.' => 'HINWEIS: Aus Sicherheitsgründen löschen Sie bitte den Ordner \'/install\'.', 'Back Office' => 'Back Office', @@ -148,7 +148,7 @@ 'The installation process should take only few minutes!' => 'Der Installationsprozess dauert nur ein paar Minuten!', 'If you need help, do not hesitate to check our documentation or to contact our support team: %2$s' => 'Falls Sie Hilfe benötigen, haben Sie folgende Möglichkeiten: unsere Dokumentation einsehenoder unser Support-Team zu kontaktieren: %2$s', 'Did you know?' => 'Wussten Sie schon?', - 'PrestaShop and community offers over 40 different languages for free directly accessible from your back-office in tools tab' => 'PrestaShop und Community bietet Ihnen den kostenlosen Zugang zu über 40 verschiedenen Sprachen direkt aus Ihrem Back-office im Tabreiter "Tools"', + 'PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop und Community bietet Ihnen den kostenlosen Zugang zu über 40 verschiedenen Sprachen direkt aus Ihrem Back-office im Tabreiter "Tools"', 'Licenses Agreement' => 'Lizenzvertrag', 'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => 'PrestaShop core is unter der Lizenz OSL 3.0 herausgegeben. PrestaShop modules und Themes werden unter der Lizenz AFL 3.0. herausgegeben', 'I agree to the above terms and conditions.' => 'Ich stimme den oben genannten Vertragsbedingungen zu.', diff --git a/install-dev/langs/es/install.php b/install-dev/langs/es/install.php index 465fba6d9..7f4f76e84 100644 --- a/install-dev/langs/es/install.php +++ b/install-dev/langs/es/install.php @@ -95,7 +95,7 @@ 'Shop password:' => 'Contraseña de la tienda:', 'Re-type to confirm:' => 'Confirmar la contraseña:', 'Receive this information by e-mail' => 'Recibe estos datos por email', - 'Warning: You will recieve these informations only if your e-mail configuration is correct.' => NULL, + 'Warning: You will receive this information only if your e-mail configuration is correct.' => NULL, 'Configure your database by filling out the following fields:' => 'Configure su base de datos llenando los siguientes campos:', 'You have to create a database, help available in our online documentation.' => null, 'Database server address:' => NULL, @@ -130,7 +130,7 @@ 'An error occured during installation...' => NULL, 'You can use the links on the left column to go back to the previous steps, or restart the installation process by clicking here.' => NULL, 'Your installation is finished!' => '¡La instalación está terminada!', - 'You have just finished to install and configure your shop, thank you for using PrestaShop!' => NULL, + 'You have just finished installing and configuring your shop. Thank you for using PrestaShop!' => NULL, 'Please remember your login information:' => NULL, 'WARNING: For security purposes, you must delete the "install" folder.' => 'ATENCION : para más seguridad, por favor borre la carpeta \'/install\'.', 'Back Office' => 'Back Office', @@ -148,7 +148,7 @@ 'The installation process should take only few minutes!' => 'El proceso de instalación tardará solo unos minutos.', 'If you need help, do not hesitate to check our documentation or to contact our support team: %2$s' => NULL, 'Did you know?' => '¿Sabía que?', - 'PrestaShop and community offers over 40 different languages for free directly accessible from your back-office in tools tab' => NULL, + 'PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.' => NULL, 'Licenses Agreement' => 'Contrato de Licencia', 'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => NULL, 'I agree to the above terms and conditions.' => 'Estoy de acuerdo con los términos y condiciones.', diff --git a/install-dev/langs/fr/install.php b/install-dev/langs/fr/install.php index d8236151c..938150440 100644 --- a/install-dev/langs/fr/install.php +++ b/install-dev/langs/fr/install.php @@ -99,7 +99,7 @@ return array( 'Shop password:' => 'Mot de passe :', 'Re-type to confirm:' => 'Confirmation du mot de passe :', 'Receive this information by e-mail' => 'Recevez ces informations par e-mail', - 'Warning: You will recieve these informations only if your e-mail configuration is correct.' => 'Attention : vous ne recevrez ces informations que si votre configuration des e-mails est correcte', + 'Warning: You will receive this information only if your e-mail configuration is correct.' => 'Attention : vous ne recevrez ces informations que si votre configuration des e-mails est correcte', 'Configure your database by filling out the following fields:' => 'Configurez la connection à votre base de données en remplissant les champs suivants :', 'You have to create a database, help available in our online documentation.' => 'Vous devez créer une base de données, de l\'aide est disponible sur notre documentation en ligne.', 'Database server address:' => 'Adresse du serveur de la base :', @@ -134,7 +134,7 @@ return array( 'An error occured during installation...' => 'Une erreur est survenue durant l\'installation', 'You can use the links on the left column to go back to the previous steps, or restart the installation process by clicking here.' => 'Vous pouvez utiliser les liens à gauche pour revenir aux étapes précédentes, ou redémarrer l\'installation en cliquant ici.', 'Your installation is finished!' => 'L\'installation est finie !', - 'You have just finished to install and configure your shop, thank you for using PrestaShop!' => 'Vous venez d’installer et de configurer votre boutique en ligne, nous vous en remercions', + 'You have just finished installing and configuring your shop. Thank you for using PrestaShop!' => 'Vous venez d’installer et de configurer votre boutique en ligne, nous vous en remercions', 'Please remember your login information:' => 'Merci de conserver les informations de connexion suivantes :', 'WARNING: For security purposes, you must delete the "install" folder.' => 'ATTENTION : pour plus de sécurité, merci de supprimer le dossier \'/install\'.', 'Back Office' => 'Administration', @@ -153,7 +153,7 @@ return array( 'If you need help, do not hesitate to check our documentation or to contact our support team: %2$s' => 'Si vous avez besoin d\'aide, n\'hésitez pas à visiter notre documentation ou à contacter notre équipe de support : %2$s', 'Choose the installer language:' => 'Choisissez la langue pour l\'installation :', 'Did you know?' => 'Le saviez vous ?', - 'PrestaShop and community offers over 40 different languages for free directly accessible from your back-office in tools tab' => 'PrestaShop et sa communauté vous proposent plus de 40 langues gratuites directement accessibles depuis votre administration', + 'PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.' => 'PrestaShop et sa communauté vous proposent plus de 40 langues gratuites directement accessibles depuis votre administration', 'Licenses Agreement' => 'Contrat de licences', 'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => 'Le cœur de PrestaShop est publié sous licence OSL 3.0 tandis que les modules et thèmes sont publiés sous licence AFL 3.0.', 'I agree to the above terms and conditions.' => 'J\'approuve les termes et conditions du contrat ci-dessus.', diff --git a/install-dev/langs/it/install.php b/install-dev/langs/it/install.php index b3d39b95a..0190583d0 100644 --- a/install-dev/langs/it/install.php +++ b/install-dev/langs/it/install.php @@ -95,7 +95,7 @@ 'Shop password:' => 'Password del negozio', 'Re-type to confirm:' => 'Conferma la password:', 'Receive this information by e-mail' => 'Riceverò le mie informazioni tramite e-mail', - 'Warning: You will recieve these informations only if your e-mail configuration is correct.' => NULL, + 'Warning: You will receive this information only if your e-mail configuration is correct.' => NULL, 'Configure your database by filling out the following fields:' => 'Configura il tuo database riempiendo i campi qui sotto:', 'You have to create a database, help available in our online documentation.' => null, 'Database server address:' => NULL, @@ -130,7 +130,7 @@ 'An error occured during installation...' => NULL, 'You can use the links on the left column to go back to the previous steps, or restart the installation process by clicking here.' => NULL, 'Your installation is finished!' => 'Installazione terminata!', - 'You have just finished to install and configure your shop, thank you for using PrestaShop!' => NULL, + 'You have just finished installing and configuring your shop. Thank you for using PrestaShop!' => NULL, 'Please remember your login information:' => NULL, 'WARNING: For security purposes, you must delete the "install" folder.' => 'ATTENZIONE: per motivi di sicurezza, adesso devi cancellare la cartella \'install\'.', 'Back Office' => 'Back Office', @@ -148,7 +148,7 @@ 'The installation process should take only few minutes!' => 'Il processo di installazione dovrebbe durare solo pochi minuti!', 'If you need help, do not hesitate to check our documentation or to contact our support team: %2$s' => NULL, 'Did you know?' => 'Lo sapevi?', - 'PrestaShop and community offers over 40 different languages for free directly accessible from your back-office in tools tab' => NULL, + 'PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.' => NULL, 'Licenses Agreement' => 'Contratto di Licenza', 'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => NULL, 'I agree to the above terms and conditions.' => 'Accetto i termini e le condizioni del contratto seguente.', diff --git a/install-dev/theme/views/configure.phtml b/install-dev/theme/views/configure.phtml index f33c18a62..b1ea0f0a7 100644 --- a/install-dev/theme/views/configure.phtml +++ b/install-dev/theme/views/configure.phtml @@ -156,7 +156,7 @@ var default_iso = 'session->shop_country ?>';
-

l('Warning: You will recieve these informations only if your e-mail configuration is correct.') ?>

+

l('Warning: You will receive this information only if your e-mail configuration is correct.') ?>

diff --git a/install-dev/theme/views/process.phtml b/install-dev/theme/views/process.phtml index 3d0033b29..937927202 100644 --- a/install-dev/theme/views/process.phtml +++ b/install-dev/theme/views/process.phtml @@ -35,7 +35,7 @@ var process_steps = process_steps) ?>;

l('Your installation is finished!'); ?>

-

l('You have just finished to install and configure your shop, thank you for using PrestaShop!'); ?>

+

l('You have just finished installing and configuring your shop. Thank you for using PrestaShop!'); ?>

l('Please remember your login information:') ?>

diff --git a/install-dev/theme/views/welcome.phtml b/install-dev/theme/views/welcome.phtml index f1819fbc1..1bb7569b7 100644 --- a/install-dev/theme/views/welcome.phtml +++ b/install-dev/theme/views/welcome.phtml @@ -26,7 +26,7 @@

l('Did you know?'); ?>

-

l('PrestaShop and community offers over 40 different languages for free directly accessible from your back-office in tools tab'); ?>

+

l('PrestaShop and its community offers over 40 different languages for free, directly accessible from your Back Office on the Localization tab.'); ?>

l('Licenses Agreement') ?>