Merge branch 'master' into acceptHandling

Conflicts:
	library/Zend/Mvc/Controller/RestfulController.php

.travis.yml

@@ -1,9 +1,17 @@
 language: php
 
 php:
+  - 5.3.3
   - 5.3
   - 5.4
 
-before_install: cp tests/TravisTestConfiguration.php tests/TestConfiguration.php
+before_install:
+ - cp tests/TestConfiguration.php.travis tests/TestConfiguration.php
+ - curl -s http://getcomposer.org/installer | php
+ - php composer.phar install --dev
 
-script: ./.travis/run-tests.sh
+script:
+ - php ./tests/run-tests.php
+
+notifications:
+  irc: "irc.freenode.org#zftalk.2"

languages/it/Zend_Captcha.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Translate
+ * @subpackage Resource
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * EN-Revision: 30.Jul.2011
+ */
+return array(
+    // Zend_Captcha_ReCaptcha
+    "Missing captcha fields" => "Campi captcha mancanti",
+    "Failed to validate captcha" => "Validazione del captcha fallito",
+    "Captcha value is wrong: %value%" => "Il valore del Captcha è sbagliato: %value%",
+
+    // Zend_Captcha_Word
+    "Empty captcha value" => "Valore del captcha vuoto",
+    "Captcha ID field is missing" => "Manca il campo Captcha ID",
+    "Captcha value is wrong" => "Il valore del Captcha è sbagliato",
+);

languages/it/Zend_Validate.php

@@ -197,12 +197,13 @@
     "'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'" => "'%value%' sembra essere un hostname DNS ma non rispetta lo schema per il TLD '%tld%'",
     "'%value%' appears to be a DNS hostname but cannot extract TLD part" => "'%value%' sembra essere un hostname DNS ma non è possibile estrarne il TLD",
     "'%value%' does not match the expected structure for a DNS hostname" => "'%value%' non sembra rispettare la struttura attesa per un hostname DNS",
-    "'%value%' does not appear to be a valid local network name" => "'%value%' non sembra essere un local network name valido",
-    "'%value%' appears to be a local network name but local network names are not allowed" => "'%value%' sembra essere un local network name, ma i local network names non sono consentiti",
+    "'%value%' does not appear to be a valid local network name" => "'%value%' non sembra essere un nome valido per una rete locale",
+    "'%value%' appears to be a local network name but local network names are not allowed" => "'%value%' sembra essere un nome di una rete locale e queste non sono consentite",
     "'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded" => "'%value%' sembra essere un hostname DNS ma la notazione punycode data non può essere decodificata",
-
+    "'%value%' does not appear to be a valid URI hostname" => "'%value%' non sembra essere un hostname URI valido",
+
     // Zend_Validate_Iban
-    "Unknown country within the IBAN '%value%'" => "Country Code sconosciuto nell'IBAN '%value%'",
+    "Unknown country within the IBAN '%value%'" => "Codice paese sconosciuto con l'IBAN '%value%'",
     "'%value%' has a false IBAN format" => "'%value%' ha un formato IBAN non valido",
     "'%value%' has failed the IBAN check" => "'%value%' ha fallito il controllo IBAN",