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
install-dev/langs/de.php
+2 -2
View File
@@ -140,7 +140,7 @@ $_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).'] = 'VORSICHT: Aus Sicherheitsgründen löschen Sie bitte den Ordner \'/install\' und die readme-Dateien (readme_fr.txt, readme_en.txt, readme_es.txt).';
$_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 '.INSTALL_VERSION.' Installer.'] = 'Bienvenue dans l\'installation de PrestaShop '.INSTALL_VERSION;
@@ -279,7 +279,7 @@ $_LANG['Link to the validator'] = 'Link zum Validator';
$_LANG['Online Theme Validator'] = 'Online Themenvalidator';
$_LANG['If your theme is not valid, you may experience some problems in your front-office aspect, but don\'t panic ! To solve this, you can make it compatible by correcting the validators errors or by using a theme compatible with '] = 'Sollte Ihr Thema nicht kompatibel sein, könnten einige Probleme im Front-End auftreten. Sie können die Kompatibilität wieder einstellen, indem Sie im Backend Unter Einstellungen die entsprechende Einstellung treffen';
$_LANG['version'] = 'Version';
$_LANG['In this aim, use our'] = 'Verwenden Sie dazu unseren';
install-dev/langs/es.php
+13 -2
View File
@@ -138,7 +138,7 @@ $_LANG['Update is complete!'] = '¡Actualización completa!';
$_LANG['Upgrade: get the latest stable version!'] = 'Actualización: instale la última versión de PrestShop';
$_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).'] = 'ATENCION : para más seguridad, por favor suprima la carpeta \'/install\' y los archivos readme (readme_fr.txt, readme_en.txt, readme_es.txt)..';
$_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 '.INSTALL_VERSION.' Installer.'] = 'Bienvenido a la instalación de PrestaShop '.INSTALL_VERSION;
@@ -268,4 +268,15 @@ $_LANG['do not close the window and be patient.'] = 'no cierre la ventana y espe
$_LANG['Your update is completed!'] = 'La actualización ha concluido con éxito';
$_LANG['Your shop version is now'] = 'La versión de su tienda ya está';
$_LANG['New features in PrestaShop v'] = 'Nuevas aplicaciones en dans PrestaShop v';
$_LANG['Module compatibility'] = 'Compatibilidad Módulos';
$_LANG['It\'s dangerous to keep non-native modules activated during the update. If you really want to take this risk, uncheck the following box.'] = 'Se desaconseja dejar los módulos no nativos activos durante la actualización. Si realmente desea correr ese riesgo, desactive la siguiente casilla.';
$_LANG['You will be able to manually reactivate them in your back-office, once the update process has succeeded.'] = 'Después podrá reactivarlos manualmente en el back-office, una vez la actualización haya terminado.';
$_LANG['Ok, please desactivate the following modules, I will reactivate them later.'] = 'De acuerdo, desactive automáticamente los siguientes módulos, los activaré yo mismo más tarde.';
$_LANG['Theme compatibility'] = 'Compatibilidad del tema';
$_LANG['Before updating, you need to check that your theme is compatible with version'] = 'Antes de la actualización, debe comprobar que su tema es compatible con la versión';
$_LANG['of PrestaShop.'] = 'de PrestaShop';
$_LANG['Link to the validator'] = 'Link hacia el validador';
$_LANG['Online Theme Validator'] = 'Validador del tema en línea';
$_LANG['If your theme is not valid, you may experience some problems in your front-office aspect, but don\'t panic ! To solve this, you can make it compatible by correcting the validators errors or by using a theme compatible with '] = 'Si su tema no es válido, podría tener problemas en la página de su sitio Web, pero no se preocupe, ¡puede hacerlo compatible corrigiendo los errores señalados por el validador o utilizando un tema compatible con la versión!' ;
$_LANG['version'] = 'versión';
$_LANG['In this aim, use our'] = 'En este objetivo, utilice nuestro';
install-dev/langs/fr.php
+4 -3
View File
@@ -140,7 +140,7 @@ $_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).'] = '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).';
$_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 '.INSTALL_VERSION.' Installer.'] = 'Bienvenue dans l\'installation de PrestaShop '.INSTALL_VERSION;
@@ -241,7 +241,7 @@ $_LANG['Upgrade file'] = 'Fichier de mise à jour';
$_LANG['Modifications to process'] = 'Modifications à prendre en compte';
$_LANG['(major)'] = '(majeure)';
$_LANG['TOTAL'] = 'TOTAL';
$_LANG['Estimated time to complete the'] = 'Temps estimé pour réaliser la';
$_LANG['Estimated time to complete the'] = 'Temps estimé pour réaliser les';
$_LANG['modifications:'] = 'modifications :';
$_LANG['minutes'] = 'minutes';
$_LANG['minute'] = 'minute';
@@ -278,7 +278,8 @@ $_LANG['of PrestaShop.'] = 'de PrestaShop';
$_LANG['Link to the validator'] = 'Lien vers le validateur';
$_LANG['Online Theme Validator'] = 'Validateur de Theme en ligne';
$_LANG['If your theme is not valid, you may experience some problems in your front-office aspect, but don\'t panic ! To solve this, you can make it compatible by correcting the validators errors or by using a theme compatible with '] = 'Si votre thème n\'est pas valide, vous pourrez rencontrer quelques problèmes d\'affichage de votre site, mais inutile de paniquer ! Vous pouvez le rendre compatible en corrigeant les erreurs signalées par le validateur ou en utilisant un thème compatible avec la version' ;
$_LANG['version'] = '';
$_LANG['version'] = 'version';
$_LANG['In this aim, use our'] = 'Dans ce but, utilisez notre';
install-dev/langs/it.php
+2 -2
View File
@@ -140,7 +140,7 @@ $_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).'] = 'ATTENZIONE: per motivi di sicurezza, adesso devi cancellare la cartella \'install\' e i file readme (readme_fr.txt, readme_en.txt, readme_es.txt).';
$_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 '.INSTALL_VERSION.' Installer.'] = 'Benvenuto nell\'installazione di PrestaShop '.INSTALL_VERSION;
@@ -266,4 +266,4 @@ $_LANG['do not close the window and be patient.'] = 'non chiudere la finestra e
$_LANG['Your update is completed!'] = 'L\'aggiornamento è completo!';
$_LANG['Your shop version is now'] = 'La tua versione adesso è';
$_LANG['New features in PrestaShop v'] = 'Nuove caratteristiche in PrestaShop v';
$_LANG['In this aim, use our'] = 'A questo scopo, utilizzare il nostro';