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

Commit

Permalink
Merge branch 'master' of github.com:zendframework/zf2
Browse files Browse the repository at this point in the history
  • Loading branch information
@Maks3w
Maks3w committed Jan 11, 2013
106 parents ad447f0 + 4f9b8b7 + d51ad32 + bdfd7d8 + 0dc32e4 + 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 + ca27a0e + 6bd5417 + 7884984 + d7ead03 commit a01e488
Show file tree
Hide file tree
Showing 38 changed files with 78 additions and 36 deletions.
7 changes: 7 additions & 0 deletions .php_cs
View file
@@ -0,0 +1,7 @@
<?php
echo "Loading " . __FILE__ . "\n";
$finder = Symfony\CS\Finder\DefaultFinder::create()
->notName('TestSampleClass10.php')
->in(__DIR__);
return Symfony\CS\Config\Config::create()
->finder($finder);
2 changes: 1 addition & 1 deletion .travis.yml
View file
Expand Up @@ -7,7 +7,7 @@ php:

before_install:
- cp tests/TestConfiguration.php.travis tests/TestConfiguration.php
- composer install --dev
- composer install --dev --prefer-source
- wget http://cs.sensiolabs.org/get/php-cs-fixer.phar

script:
Expand Down
2 changes: 1 addition & 1 deletion languages/ar/Zend_Captcha.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translate
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/ar/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/bg/Zend_Captcha.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translate
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/bg/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/cs/Zend_Captcha.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translate
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/cs/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/de/Zend_Captcha.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translate
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/de/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/en/Zend_Captcha.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translate
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/en/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/es/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/fi/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
35 changes: 35 additions & 0 deletions languages/fr/Zend_Captcha.php
View file
@@ -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-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

/**
* FR-Revision: 17.Dec.2012
*/
return array(
// Zend_Captcha_ReCaptcha
"Missing captcha fields" => "Les champs du captcha sont absents",
"Failed to validate captcha" => "Échec lors de la validation du captcha",
"Captcha value is wrong: %value%" => "La valeur du captcha est incorrecte : %value%",

// Zend_Captcha_Word
"Empty captcha value" => "La valeur du captcha est vide",
"Captcha ID field is missing" => "L'ID du captcha est absent",
"Captcha value is wrong" => "La valeur du captcha est incorrecte",
);
2 changes: 1 addition & 1 deletion languages/fr/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/hr/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/it/Zend_Captcha.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translate
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/it/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/ja/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/nl/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/no/Zend_Captcha.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translate
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/no/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/pl/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/pt_BR/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/ru/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/se/Zend_Captcha.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translate
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/se/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/sk/Zend_Captcha.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translate
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/sk/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/sl/Zend_Captcha.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translate
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/sl/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/sr/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/tr/Zend_Captcha.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translate
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/tr/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/uk/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/zh/Zend_Captcha.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translate
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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
2 changes: 1 addition & 1 deletion languages/zh/Zend_Validate.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @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 a01e488

Please sign in to comment.