Merge branch 'hotfix/2814'

Close zendframework/zendframework#2814
zendframework · Oct 30, 2012 · bf57c7d · bf57c7d
commit bf57c7d
Show file tree

Hide file tree

Showing 2 changed files with 63 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" => "Mangler captcha felter",
-    "Failed to validate captcha" => "Validering av captcha feilet",
-    "Captcha value is wrong: %value%" => "Feil Captcha verdi for: %value%",
+    "Missing captcha fields" => "Captcha-feltene mangler",
+    "Failed to validate captcha" => "Captcha-validering feilet",
+    "Captcha value is wrong: %value%" => "Captcha-verdien er feil: %value%",
 
     // Zend_Captcha_Word
-    "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",
+    "Empty captcha value" => "Mangler Captcha-verdi",
+    "Captcha ID field is missing" => "Captcha ID-feltet mangler",
+    "Captcha value is wrong" => "Captcha-verdien er feil",
 );