Merge branch 'master' into rfc/escaper

.travis.yml

@@ -0,0 +1,15 @@
+language: php
+
+php:
+  - 5.3.3
+  - 5.3
+  - 5.4
+
+before_install:
+ - cp tests/TestConfiguration.php.travis tests/TestConfiguration.php
+
+script:
+ - php ./tests/run-tests.php
+
+notifications:
+  irc: "irc.freenode.org#zftalk.2"

languages/se/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-2012 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" => "Saknade captchafält",
+    "Failed to validate captcha" => "Misslyckades att validera captcha",
+    "Captcha value is wrong: %value%" => "Captchavärdet är felaktigt: %value%",
+
+    // Zend_Captcha_Word
+    "Empty captcha value" => "Tomt captchavärde",
+    "Captcha ID field is missing" => "Fältet för captcha ID saknas",
+    "Captcha value is wrong" => "Captchavärdet är felaktigt",
+);