Merge branch 'master' of git://github.com/zendframework/zf2 into cach…

…e_internals Conflicts: library/Zend/Cache/Storage/Adapter/Memcached.php
zendframework · Mar 2, 2012 · 118afdb · 118afdb
commit 118afdb
Show file tree

Hide file tree

Showing 4 changed files with 363 additions and 63 deletions.
diff --git a/languages/no/Zend_Captcha.php b/languages/no/Zend_Captcha.php
@@ -24,12 +24,12 @@
  */
 return array(
     // Zend_Captcha_ReCaptcha
-    "Missing captcha fields" => "Savnede captcha felter",
+    "Missing captcha fields" => "Mangler captcha felter",
     "Failed to validate captcha" => "Validering av captcha feilet",
     "Captcha value is wrong: %value%" => "Feil Captcha verdi for: %value%",
 
     // Zend_Captcha_Word
-    "Empty captcha value" => "Tom captcha verdi",
-    "Captcha ID field is missing" => "Feltet for Captcha id er ikke tilstede",
-    "Captcha value is wrong" => "Verdien til Captcha er feil",
+    "Empty captcha value" => "Tomt captcha verdi",
+    "Captcha ID field is missing" => "Feltet for captcha id er ikke tilstede",
+    "Captcha value is wrong" => "Verdien til captcha er feil",
 );