Merge remote-tracking branch 'upstream/master'

Conflicts:
	library/Zend/Form/Decorator/File.php
	library/Zend/View/Helper/Navigation/Sitemap.php

languages/cs/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-2011 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" => "Chybí captcha pole",
+    "Failed to validate captcha" => "Captchu se nepodařilo ověřit",
+    "Captcha value is wrong: %value%" => "Hodnota captchy není správná: %value%",
+
+    // Zend_Captcha_Word
+    "Empty captcha value" => "Hodnota captcha nebyla zadána",
+    "Captcha ID field is missing" => "Chybí pole captcha ID",
+    "Captcha value is wrong" => "Chybná hodnota catpcha",
+);