Skip to content
This repository has been archived by the owner on Apr 28, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/3797' into develop
Browse files Browse the repository at this point in the history 
Forward port zendframework/zendframework#3797
  • Loading branch information
@weierophinney
weierophinney committed Feb 19, 2013
144 parents dc44bfd + 1f178dc + 19afffe + 3b1a256 + a01e488 + 6bd5417 + 7884984 + d7ead03 + ad447f0 + 30abd77 + 886c7dd + 0426e59 + 41bb0b6 + 48830b0 + d6e3cec + 3f64575 + 47056cf + 93da274 + 41ff6ee + 4d95164 + b49f56a + d9ca3c4 + eff94af + baa6f68 + b8d6e5f + cf90e76 + a38e673 + ddc5b11 + 203f4f2 + f755a1b + 7b4bdc5 + de1dabc + cffd7da + e68b46a + 6a4a61e + a495238 + 22ee4fd + 7c48789 + 88fc985 + 33867a8 + 72cc708 + 1253b9d + b527198 + 9f385cb + 9681d38 + 9ff4ea7 + 9dcc02b + a3b5a44 + 49aa6e1 + 785d144 + 6cb9145 + 98ba294 + 1a26005 + 6a37670 + 53069e2 + cdc28f8 + 7ed9b6d + 6aa8b3f + b08f0db + c6ffcad + 2e788ed + 5fa8668 + 331098b + 11a5300 + d15662e + a652577 + 113da58 + ac8c434 + 51dd55f + b8f65f9 + 5ab3ccd + 3c9d616 + 34eee47 + 1fc6a29 + 0f06888 + 781c1e1 + bfb1248 + adb0888 + 20476b6 + f0f3028 + fd934a8 + 039bd26 + 70f3e5a + 3d9849b + 118afdb + 029c839 + 31a4435 + fa239e0 + 18c2969 + 28b9d7b + 34e166a + 9e19c9d + 1645624 + 0f36602 + 32da7d8 + 9cd65f3 + 10a2ceb + f8a3f38 + 7b59c4b + 281109c + e15b4b2 + 00a7ba9 + d3f35c0 + e89516e + cbf495f + 89118d6 + 4f9b8b7 + d51ad32 + bdfd7d8 + 0dc32e4 + ca27a0e + b0b5deb + 8f5f165 + e85eb90 + 8f6f830 + 6a31d61 + 54ae670 + 1cad3f0 + beb876e + d725de0 + bf57c7d + 822964a + 669aa66 + 76422ec + 62cdf38 + cbe43a2 + 6b3919c + 832c96f + 72e3bd6 + 5cfa5d3 + f012f21 + 49e3436 + 465b2ed + 91cc8bb + 86b4350 + e32c680 + d82c755 + b9aa141 + ab2eabe + 09b91a9 + a532720 + da21aec + c5778b9 + 0c2f26d commit 1abecc5
Show file tree
Hide file tree
Showing 37 changed files with 1 addition and 112 deletions.
3 changes: 0 additions & 3 deletions languages/ar/Zend_Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/ar/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/bg/Zend_Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/bg/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/cs/Zend_Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/cs/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/de/Zend_Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/de/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/en/Zend_Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/en/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/es/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/fi/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/fr/Zend_Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/fr/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/hr/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/it/Zend_Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/it/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/ja/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/nl/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/no/Zend_Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
5 changes: 1 addition & 4 deletions languages/no/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down Expand Up @@ -230,7 +227,7 @@
"'%value%' is not less than '%max%'" => "'%value%' er ikke mindre enn '%max%'",

// Zend_Validate_NotEmpty
"Invalid type given. String, integer, float, boolean or array expected" => "Ugyldig type gitt. Forventet streng, heltall, flyt-tall, boolean eller matrise",
"Invalid type given. String, integer, float, boolean or array expected" => "Ugyldig type gitt. Forventet streng, heltall, flyt-tall, boolean eller matrise",
"Value is required and can't be empty" => "Verdi er påkrevd, og kan ikke være tomt",

// Zend_Validate_PostCode
Expand Down
3 changes: 0 additions & 3 deletions languages/pl/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/pt_BR/Zend_Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/pt_BR/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/ru/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/se/Zend_Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/se/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/sk/Zend_Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/sk/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/sl/Zend_Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/sl/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/sr/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/tr/Zend_Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/tr/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/uk/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/zh/Zend_Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/zh/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* 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_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down

0 comments on commit 1abecc5

Please sign in to comment.