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/ZF-10911' of https://github.com/thomasweidner/zf2 …
Browse files Browse the repository at this point in the history 
…into hotfix/zf-10911

Conflicts:
	documentation/manual/de/module_specs/Zend_Translator-SourceCreation.xml
	documentation/manual/en/manual.xml.in
	documentation/manual/en/module_specs/Zend_Translator-SourceCreation.xml
	documentation/manual/fr/module_specs/Zend_Translator-Using.xml
	documentation/manual/ja/module_specs/Zend_Translator-SourceCreation.xml
	library/Zend/Controller/Router/Route/Route.php
	library/Zend/Filter/InputFilter.php
	library/Zend/Form/Element.php
	library/Zend/Translator/Adapter.php
	resources/languages/cs/Zend_Validate.php
	resources/languages/de/Zend_Validate.php
	resources/languages/en/Zend_Validate.php
	resources/languages/es/Zend_Validate.php
	resources/languages/fi/Zend_Validate.php
	resources/languages/fr/Zend_Validate.php
	resources/languages/hr/Zend_Validate.php
	resources/languages/it/Zend_Validate.php
	resources/languages/ja/Zend_Validate.php
	resources/languages/nl/Zend_Validate.php
	resources/languages/pl/Zend_Validate.php
	resources/languages/pt_BR/Zend_Validate.php
	resources/languages/ru/Zend_Validate.php
	resources/languages/sr/Zend_Validate.php
	resources/languages/uk/Zend_Validate.php
	tests/Zend/Controller/Router/RouteTest.php
	tests/Zend/Filter/InputTest.php
	tests/Zend/Translator/TranslatorTest.php
  • Loading branch information
@weierophinney
weierophinney committed Aug 25, 2011
28 parents 5168c95 + 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 + a89c4f6 commit a3b5a44
Show file tree
Hide file tree
Showing 15 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions languages/cs/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* to license@zend.com so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @subpackage Resource
* @package Zend_Translator
* @subpackage Ressource
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
2 changes: 1 addition & 1 deletion languages/de/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* to license@zend.com so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
Expand Down
2 changes: 1 addition & 1 deletion languages/en/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* to license@zend.com so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
Expand Down
2 changes: 1 addition & 1 deletion languages/es/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* to license@zend.com so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
Expand Down
2 changes: 1 addition & 1 deletion languages/fi/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* to license@zend.com so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
Expand Down
2 changes: 1 addition & 1 deletion languages/fr/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* to license@zend.com so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
Expand Down
2 changes: 1 addition & 1 deletion languages/hr/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* to license@zend.com so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
Expand Down
4 changes: 2 additions & 2 deletions languages/it/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* to license@zend.com so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
Expand Down Expand Up @@ -261,4 +261,4 @@
"Invalid type given. String expected" => "Tipo di dato non valido. Era attesto un dato di tipo string",
"'%value%' is less than %min% characters long" => "'%value%' è meno lungo di %min% caratteri",
"'%value%' is more than %max% characters long" => "'%value%' è più lungo di %max% caratteri",
);
);
2 changes: 1 addition & 1 deletion languages/ja/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* to license@zend.com so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
Expand Down
2 changes: 1 addition & 1 deletion languages/nl/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* to license@zend.com so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
Expand Down
4 changes: 2 additions & 2 deletions languages/pl/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* to license@zend.com so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
Expand Down Expand Up @@ -261,4 +261,4 @@
"Invalid type given. String expected" => "Podana wartość nie jest ciągiem znaków",
"'%value%' is less than %min% characters long" => "'%value%' zawiera mniej niż %min% znaków",
"'%value%' is more than %max% characters long" => "'%value%' zawiera więcej niż %max% znaków",
);
);
2 changes: 1 addition & 1 deletion languages/pt_BR/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* to license@zend.com so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
Expand Down
2 changes: 1 addition & 1 deletion languages/ru/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* to license@zend.com so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
Expand Down
4 changes: 2 additions & 2 deletions languages/sr/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* to license@zend.com so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
Expand Down Expand Up @@ -262,4 +262,4 @@
"Invalid type given, value should be a string" => "Nevalidan tip, vrednost treba da bude tekst",
"'%value%' is less than %min% characters long" => "'%value%' ima manje od %min% karaktera",
"'%value%' is more than %max% characters long" => "'%value%' ima više od %max% karaktera",
);
);
2 changes: 1 addition & 1 deletion languages/uk/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* to license@zend.com so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2011 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 a3b5a44

Please sign in to comment.