Merge commit 'zf2/master' into livedocx-2.0

zendframework · May 5, 2011 · b8f65f9 · b8f65f9
19 parents 98ba294 + 1a26005 + 6a37670 + 53069e2 + cdc28f8 + 7ed9b6d + 6aa8b3f + b08f0db + c6ffcad + 2e788ed + 5fa8668 + 331098b + 11a5300 + d15662e + 6cb9145 + a652577 + 113da58 + ac8c434 + 51dd55f
commit b8f65f9
Show file tree

Hide file tree

Showing 14 changed files with 661 additions and 384 deletions.
diff --git a/languages/de/Zend_Validate.php b/languages/de/Zend_Validate.php
@@ -15,12 +15,12 @@
  * @category   Zend
  * @package    Zend_Translate
  * @subpackage Ressource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
- * EN-Revision: 22668
+ * EN-Revision: 06.Jan.2011
  */
 return array(
     // Zend_Validate_Alnum
@@ -200,6 +200,7 @@
     "'%value%' does not appear to be a valid local network name" => "'%value%' scheint kein gültiger lokaler Netzerkname zu sein",
     "'%value%' appears to be a local network name but local network names are not allowed" => "'%value%' scheint ein lokaler Netzwerkname zu sein, aber lokale Netzwerknamen sind nicht erlaubt",
     "'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded" => "'%value%' scheint ein DNS Hostname zu sein, aber die angegebene Punycode Schreibweise konnte nicht dekodiert werden",
+    "'%value%' does not appear to be a valid URI hostname" => "'%value%' scheint kein gültiger URI Hostname zu sein",
 
     // Zend_Validate_Iban
     "Unknown country within the IBAN '%value%'" => "Unbekanntes Land in der IBAN '%value%'",

diff --git a/languages/en/Zend_Validate.php b/languages/en/Zend_Validate.php
@@ -15,12 +15,12 @@
  * @category   Zend
  * @package    Zend_Translate
  * @subpackage Ressource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
- * EN-Revision: 22668
+ * EN-Revision: 06.Jan.2011
  */
 return array(
     // Zend_Validate_Alnum
@@ -200,6 +200,7 @@
     "'%value%' does not appear to be a valid local network name" => "'%value%' does not appear to be a valid local network name",
     "'%value%' appears to be a local network name but local network names are not allowed" => "'%value%' appears to be a local network name but local network names are not allowed",
     "'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded" => "'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded",
+    "'%value%' does not appear to be a valid URI hostname" => "'%value%' does not appear to be a valid URI hostname",
 
     // Zend_Validate_Iban
     "Unknown country within the IBAN '%value%'" => "Unknown country within the IBAN '%value%'",

diff --git a/languages/es/Zend_Validate.php b/languages/es/Zend_Validate.php
diff --git a/languages/fr/Zend_Validate.php b/languages/fr/Zend_Validate.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Translate
  * @subpackage Ressource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

diff --git a/languages/hr/Zend_Validate.php b/languages/hr/Zend_Validate.php
diff --git a/languages/it/Zend_Validate.php b/languages/it/Zend_Validate.php
diff --git a/languages/ja/Zend_Validate.php b/languages/ja/Zend_Validate.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Translate
  * @subpackage Ressource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

diff --git a/languages/nl/Zend_Validate.php b/languages/nl/Zend_Validate.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Translate
  * @subpackage Ressource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

diff --git a/languages/pl/Zend_Validate.php b/languages/pl/Zend_Validate.php
diff --git a/languages/pt_BR/Zend_Validate.php b/languages/pt_BR/Zend_Validate.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Translate
  * @subpackage Ressource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

diff --git a/languages/ru/Zend_Validate.php b/languages/ru/Zend_Validate.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Translate
  * @subpackage Ressource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

diff --git a/languages/sr/Zend_Validate.php b/languages/sr/Zend_Validate.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Translate
  * @subpackage Ressource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */