Applies patch from bz57189, thanks go to Tom Fredrik Blenning. Adds

Norwegin translations of error pages.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673825 13f79535-47bb-0310-9956-ffa450edef68

19 files changed, 297 insertions, 1 deletions

diff --git a/docs/error/HTTP_BAD_GATEWAY.html.var b/docs/error/HTTP_BAD_GATEWAY.html.var
index f87c106c29..a9061b30e2 100644
--- a/docs/error/HTTP_BAD_GATEWAY.html.var
+++ b/docs/error/HTTP_BAD_GATEWAY.html.var
@@ -176,6 +176,24 @@ Body:----------nl--
 <!--#include virtual="include/bottom.html" -->
 ----------nl--
 
+Content-language: nb
+Content-type: text/html; charset=UTF-8
+Body:----------nb--
+<!--#set var="CONTENT_LANGUAGE" value="nb"
+--><!--#set var="TITLE" value="Ugyldig Gateway!"
+--><!--#include virtual="include/top.html" -->
+
+    Proxyserveren mottok et ugyldig svar fra
+    en oppstrøms server.
+
+  <!--#if expr="-n v('REDIRECT_ERROR_NOTES')" -->
+    <!--#include virtual="include/spacer.html" -->
+    <!--#echo encoding="none" var="REDIRECT_ERROR_NOTES" -->
+  <!--#endif -->
+
+<!--#include virtual="include/bottom.html" -->   
+----------nb--
+
 Content-language: pl
 Content-type: text/html; charset=UTF-8
 Body:----------pl--
diff --git a/docs/error/HTTP_BAD_REQUEST.html.var b/docs/error/HTTP_BAD_REQUEST.html.var
index afa9e439dc..89fc3df118 100644
--- a/docs/error/HTTP_BAD_REQUEST.html.var
+++ b/docs/error/HTTP_BAD_REQUEST.html.var
@@ -126,6 +126,19 @@ Body:----------nl--
 <!--#include virtual="include/bottom.html" -->
 ----------nl--
 
+Content-language: nb
+Content-type: text/html; charset=UTF-8
+Body:----------nb--
+<!--#set var="CONTENT_LANGUAGE" value="nb"
+--><!--#set var="TITLE" value="Ugyldig spørring!"
+--><!--#include virtual="include/top.html" -->
+
+    Din nettleser eller proxy sendte en forespørsel
+    som denne serveren ikke kunne forstå.
+
+<!--#include virtual="include/bottom.html" -->  
+----------nb--
+
 Content-language: pl
 Content-type: text/html; charset=UTF-8
 Body:----------pl--
diff --git a/docs/error/HTTP_FORBIDDEN.html.var b/docs/error/HTTP_FORBIDDEN.html.var
index 2a781fedc0..4524c72bde 100644
--- a/docs/error/HTTP_FORBIDDEN.html.var
+++ b/docs/error/HTTP_FORBIDDEN.html.var
@@ -225,6 +225,30 @@ Body:----------nl--
 <!--#include virtual="include/bottom.html" -->
 ----------nl--
 
+Content-language: nb
+Content-type: text/html; charset=UTF-8
+Body:----------nb--
+<!--#set var="CONTENT_LANGUAGE" value="nb"
+--><!--#set var="TITLE" value="Adgang forbudt!"
+--><!--#include virtual="include/top.html" -->
+
+  <!--#if expr="v('REDIRECT_URL') =~ m:/$:" -->
+
+    Du har ikke tilstrekkelige rettigheter for å få tilgang til den
+    ønskede katalogen. Det eksisterer ikke et indeksdokument, eller
+    katalogen er lesebeskyttet.
+
+  <!--#else -->
+
+    Du har ikke tilstrekkelige rettigheter for å få adgang til det
+    ønskede dokumentet. Objektet er lesebeskyttet, eller ikke lesbart
+    for serveren.
+
+  <!--#endif -->
+
+<!--#include virtual="include/bottom.html" -->
+----------nb--
+
 Content-language: pl
 Content-type: text/html; charset=UTF-8
 Body:----------pl--
diff --git a/docs/error/HTTP_GONE.html.var b/docs/error/HTTP_GONE.html.var
index 2ca5b434b7..cd58bccfa9 100644
--- a/docs/error/HTTP_GONE.html.var
+++ b/docs/error/HTTP_GONE.html.var
@@ -256,6 +256,32 @@ Body:----------nl--
 <!--#include virtual="include/bottom.html" -->
 ----------nl--
 
+Content-language: nb
+Content-type: text/html; charset=UTF-8
+Body:----------nb--
+<!--#set var="CONTENT_LANGUAGE" value="nb"
+--><!--#set var="TITLE" value="Ressursen er ikke lenger tilgjengelig!"
+--><!--#include virtual="include/top.html" -->
+
+    Den ønskede adressen er ikke lenger tilgjengelig hos denne
+    serveren og det finnes ingen adresse for videresending.
+
+  <!--#if expr="-n v('HTTP_REFERER')" -->
+
+    Venligst informer forfatteren bak 
+    <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">den
+    aktuelle siden</a> om at lenken er utdatert.
+ 
+  <!--#else -->
+
+    Om du fulgte en lenke fra en ekstern side, venligst kontakt
+    forfatteren bak den siden.
+
+  <!--#endif -->
+
+<!--#include virtual="include/bottom.html" -->
+----------nb--
+
 Content-language: pl
 Content-type: text/html; charset=UTF-8
 Body:----------pl--
diff --git a/docs/error/HTTP_INTERNAL_SERVER_ERROR.html.var b/docs/error/HTTP_INTERNAL_SERVER_ERROR.html.var
index 6b94a28ebc..240352feb0 100644
--- a/docs/error/HTTP_INTERNAL_SERVER_ERROR.html.var
+++ b/docs/error/HTTP_INTERNAL_SERVER_ERROR.html.var
@@ -276,6 +276,34 @@ Body:----------nl--
 <!--#include virtual="include/bottom.html" -->
 ----------nl--
 
+Content-language: nb
+Content-type: text/html; charset=UTF-8
+Body:----------nb--
+<!--#set var="CONTENT_LANGUAGE" value="nb"
+--><!--#set var="TITLE" value="Serverfeil!"
+--><!--#include virtual="include/top.html" -->
+
+  <!--#if expr="-n v('REDIRECT_ERROR_NOTES')" -->
+ 
+    Det inntraff en intern feil hos serveren, og det var ikke mulig å
+    gjennomføre din forespørsel.
+
+    <!--#include virtual="include/spacer.html" -->
+
+    Feilmelding:
+    <br /><!--#echo encoding="none" var="REDIRECT_ERROR_NOTES" -->
+
+  <!--#else -->
+
+    Det inntraff en intern feil hos serveren, og det var ikke mulig å
+    gjennomføre din forespørsel. Serveren er enten overbelastet, eller
+    CGI-skriptet inneholder feil.
+
+  <!--#endif -->
+
+<!--#include virtual="include/bottom.html" -->
+----------nb--
+
 Content-language: pl
 Content-type: text/html; charset=UTF-8
 Body:----------pl--
diff --git a/docs/error/HTTP_LENGTH_REQUIRED.html.var b/docs/error/HTTP_LENGTH_REQUIRED.html.var
index 97c8f8d1b7..108cdbf46a 100644
--- a/docs/error/HTTP_LENGTH_REQUIRED.html.var
+++ b/docs/error/HTTP_LENGTH_REQUIRED.html.var
@@ -135,6 +135,19 @@ Body:----------nl--
 <!--#include virtual="include/bottom.html" -->
 ----------nl--
 
+Content-language: nb
+Content-type: text/html; charset=UTF-8
+Body:----------nb--
+<!--#set var="CONTENT_LANGUAGE" value="nb"
+--><!--#set var="TITLE" value="Feil Content-Length!"
+--><!--#include virtual="include/top.html" -->
+
+    En forespørsel med <!--#echo var="REDIRECT_REQUEST_METHOD" -->
+    metoden krever en korrekt <code>Content-Length</code> header.
+
+<!--#include virtual="include/bottom.html" -->
+----------nb--
+
 Content-language: pl
 Content-type: text/html; charset=UTF-8
 Body:----------pl--
diff --git a/docs/error/HTTP_METHOD_NOT_ALLOWED.html.var b/docs/error/HTTP_METHOD_NOT_ALLOWED.html.var
index 8ce8a46ddc..5cc36d0607 100644
--- a/docs/error/HTTP_METHOD_NOT_ALLOWED.html.var
+++ b/docs/error/HTTP_METHOD_NOT_ALLOWED.html.var
@@ -125,6 +125,19 @@ Body:----------nl--
 <!--#include virtual="include/bottom.html" -->
 ----------nl--
 
+Content-language: nb
+Content-type: text/html; charset=UTF-8
+Body:----------nb--
+<!--#set var="CONTENT_LANGUAGE" value="nb"
+--><!--#set var="TITLE" value="Metoden er ikke tillatt!"
+--><!--#include virtual="include/top.html" -->
+
+    <!--#echo var="REDIRECT_REQUEST_METHOD" --> metoden er ikke
+    tillatt for den forespurte adressen.
+
+<!--#include virtual="include/bottom.html" -->
+----------nb--
+
 Content-language: pl
 Content-type: text/html; charset=UTF-8
 Body:----------pl--
diff --git a/docs/error/HTTP_NOT_FOUND.html.var b/docs/error/HTTP_NOT_FOUND.html.var
index c22ecefa66..442f4968fd 100644
--- a/docs/error/HTTP_NOT_FOUND.html.var
+++ b/docs/error/HTTP_NOT_FOUND.html.var
@@ -267,6 +267,33 @@ Body:----------nl--
 <!--#include virtual="include/bottom.html" -->
 ----------nl--
 
+Content-language: nb
+Content-type: text/html; charset=UTF-8
+Body:----------nb--
+<!--#set var="CONTENT_LANGUAGE" value="nb"
+--><!--#set var="TITLE" value="Objektet ble ikke funnet!"
+--><!--#include virtual="include/top.html" -->
+
+    Den etterspurte adressen finnes ikke på denne serveren.
+
+  <!--#if expr="-n v('HTTP_REFERER')" -->
+
+    Lenken på den
+    <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">forrige siden</a> 
+ser ut til å være feil eller utdatert. Venligst informer forfatteren av
+    <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">siden</a>
+    om feilen.
+
+  <!--#else -->
+
+    Om du skrev inn adressen manuelt, vennligst kontroller stavingen og
+    forsøk igjen.
+
+  <!--#endif -->
+
+<!--#include virtual="include/bottom.html" -->
+----------nb--
+
 Content-language: pl
 Content-type: text/html; charset=UTF-8
 Body:----------pl--
diff --git a/docs/error/HTTP_NOT_IMPLEMENTED.html.var b/docs/error/HTTP_NOT_IMPLEMENTED.html.var
index f990858086..8dc2f7d9ff 100644
--- a/docs/error/HTTP_NOT_IMPLEMENTED.html.var
+++ b/docs/error/HTTP_NOT_IMPLEMENTED.html.var
@@ -119,6 +119,19 @@ Body:----------nl--
 <!--#include virtual="include/bottom.html" -->
 ----------nl--
 
+Content-language: nb
+Content-type: text/html; charset=UTF-8
+Body:----------nb--
+<!--#set var="CONTENT_LANGUAGE" value="nb"
+--><!--#set var="TITLE" value="Kan ikke behandle forspørsel!"
+--><!--#include virtual="include/top.html" -->
+
+    Serveren støtter ikke den handlingen som ønskes utført av
+    nettleseren.
+
+<!--#include virtual="include/bottom.html" -->
+----------nb--
+
 Content-language: pl
 Content-type: text/html; charset=UTF-8
 Body:----------pl--
@@ -184,7 +197,7 @@ Content-language: sv
 Content-type: text/html; charset=UTF-8
 Body:----------sv--
 <!--#set var="CONTENT_LANGUAGE" value="sv"
---><!--#set var="TITLE" value="Kan ej utf&ouml;ra f&ouml;rfr&aring;gan!"
+--><!--#set var="TITLE" value="Kan ikke utf!"
 --><!--#include virtual="include/top.html" -->
 
     Servern st&ouml;djer inte den handling som &ouml;nskades
diff --git a/docs/error/HTTP_PRECONDITION_FAILED.html.var b/docs/error/HTTP_PRECONDITION_FAILED.html.var
index 01d87f8e98..da69e2b6a5 100644
--- a/docs/error/HTTP_PRECONDITION_FAILED.html.var
+++ b/docs/error/HTTP_PRECONDITION_FAILED.html.var
@@ -121,6 +121,19 @@ Body:----------nl--
 <!--#include virtual="include/bottom.html" -->
 ----------nl--
 
+Content-language: nb
+Content-type: text/html; charset=UTF-8
+Body:----------nb--
+<!--#set var="CONTENT_LANGUAGE" value="nb"
+--><!--#set var="TITLE" value="Nødvendig forutsetning ikke oppfyllt!"
+--><!--#include virtual="include/top.html" -->
+
+    Den nødvendige forutsetningen for forespørselen passerte ikke
+    vurderingen med positivt resultat.
+
+<!--#include virtual="include/bottom.html" -->
+----------nb--
+
 Content-language: pl
 Content-type: text/html; charset=UTF-8
 Body:----------pl--
diff --git a/docs/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var b/docs/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
index 9e3e4c14bf..777b3de9cd 100644
--- a/docs/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
+++ b/docs/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
@@ -135,6 +135,20 @@ Body:----------nl--
 <!--#include virtual="include/bottom.html" -->
 ----------nl--
 
+Content-language: nb
+Content-type: text/html; charset=UTF-8
+Body:----------nb--
+<!--#set var="CONTENT_LANGUAGE" value="nb"
+--><!--#set var="TITLE" value="For stor enhet i forspørsel!"
+--><!--#include virtual="include/top.html" -->
+
+    <!--#echo var="REDIRECT_REQUEST_METHOD" --> metoden tillater ikke
+    de sendte data eller så overskrider datamengenden
+    kapasitetsbegrensningen.
+
+<!--#include virtual="include/bottom.html" -->
+----------nb--
+
 Content-language: pl
 Content-type: text/html; charset=UTF-8
 Body:----------pl--
diff --git a/docs/error/HTTP_REQUEST_TIME_OUT.html.var b/docs/error/HTTP_REQUEST_TIME_OUT.html.var
index 335748a05b..bf4d5f2753 100644
--- a/docs/error/HTTP_REQUEST_TIME_OUT.html.var
+++ b/docs/error/HTTP_REQUEST_TIME_OUT.html.var
@@ -129,6 +129,19 @@ Body:----------nl--
 <!--#include virtual="include/bottom.html" -->
 ----------nl--
 
+Content-language: nb
+Content-type: text/html; charset=UTF-8
+Body:----------nb--
+<!--#set var="CONTENT_LANGUAGE" value="nb"
+--><!--#set var="TITLE" value="Tidsgrense overskredet!"
+--><!--#include virtual="include/top.html" -->
+
+    Serveren stengte forbindelsen fordi nettleseren ikke avsluttet
+    forespørselen innen tidsgrensen.
+
+<!--#include virtual="include/bottom.html" -->
+----------nb--
+
 Content-language: pl
 Content-type: text/html; charset=UTF-8
 Body:----------pl--
diff --git a/docs/error/HTTP_REQUEST_URI_TOO_LARGE.html.var b/docs/error/HTTP_REQUEST_URI_TOO_LARGE.html.var
index 13c6e34c39..4831c472a8 100644
--- a/docs/error/HTTP_REQUEST_URI_TOO_LARGE.html.var
+++ b/docs/error/HTTP_REQUEST_URI_TOO_LARGE.html.var
@@ -128,6 +128,20 @@ Body:----------nl--
 <!--#include virtual="include/bottom.html" -->
 ----------nl--
 
+Content-language: nb
+Content-type: text/html; charset=UTF-8
+Body:----------nb--
+<!--#set var="CONTENT_LANGUAGE" value="nb"
+--><!--#set var="TITLE" value="Forespurt URI for stor!"
+--><!--#include virtual="include/top.html" -->
+
+    Lengden på adressen som etterspurtes overskrider
+    kapasitetsgrensen for denne serveren. Forespørselen kan
+    ikke prosesseres.
+
+<!--#include virtual="include/bottom.html" -->
+----------nb--
+
 Content-language: pl
 Content-type: text/html; charset=UTF-8
 Body:----------pl--
diff --git a/docs/error/HTTP_SERVICE_UNAVAILABLE.html.var b/docs/error/HTTP_SERVICE_UNAVAILABLE.html.var
index 0af10a6eac..8155564158 100644
--- a/docs/error/HTTP_SERVICE_UNAVAILABLE.html.var
+++ b/docs/error/HTTP_SERVICE_UNAVAILABLE.html.var
@@ -138,6 +138,19 @@ Body:----------nl--
 <!--#include virtual="include/bottom.html" -->
 ----------nl--
 
+Content-language: nb
+Content-type: text/html; charset=UTF-8
+Body:----------nb--
+<!--#set var="CONTENT_LANGUAGE" value="nb"
+--><!--#set var="TITLE" value="Tjenesten er ikke tilgjengelig!"
+--><!--#include virtual="include/top.html" -->
+
+    Serveren er midlertidig ikke i stand til å utføre din
+    forespørsel. Vennligst prøv igjen senere.
+
+<!--#include virtual="include/bottom.html" -->
+----------nb--
+
 Content-language: pl
 Content-type: text/html; charset=UTF-8
 Body:----------pl--
diff --git a/docs/error/HTTP_UNAUTHORIZED.html.var b/docs/error/HTTP_UNAUTHORIZED.html.var
index 73128af909..2a8994f06d 100644
--- a/docs/error/HTTP_UNAUTHORIZED.html.var
+++ b/docs/error/HTTP_UNAUTHORIZED.html.var
@@ -209,6 +209,27 @@ Body:----------nl--
 <!--#include virtual="include/bottom.html" -->
 ----------nl--
 
+Content-language: nb
+Content-type: text/html; charset=UTF-8
+Body:----------nb--
+<!--#set var="CONTENT_LANGUAGE" value="nb"
+--><!--#set var="TITLE" value="Autentisering kreves!"
+--><!--#include virtual="include/top.html" -->
+
+    Serveren kunne ikke verifisere at du har tillatelse til å besøke
+    adressen "<!--#echo encoding="url" var="REDIRECT_URL" -->".  Enten
+    oppga du feil opplysninger (f.eks. feil passord) eller så støtter
+    ikke din nettleser dette autentiseringsystemet.
+
+  <!--#include virtual="include/spacer.html" -->
+
+    Om du har tillatelse til å besøke siden, vennligst kontroler ditt
+    brukernavn og passord og forsøk igjen.
+
+<!--#include virtual="include/bottom.html" -->
+----------nb--
+
+
 Content-language: pl
 Content-type: text/html; charset=UTF-8
 Body:----------pl--
diff --git a/docs/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var b/docs/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
index 20a5e0b347..44094cdee7 100644
--- a/docs/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
+++ b/docs/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
@@ -120,6 +120,18 @@ Body:----------nl--
 <!--#include virtual="include/bottom.html" -->
 ----------nl--
 
+Content-language: nb
+Content-type: text/html; charset=UTF-8
+Body:----------nb--
+<!--#set var="CONTENT_LANGUAGE" value="nb"
+--><!--#set var="TITLE" value="Mediatypen støttes ikke!"
+--><!--#include virtual="include/top.html" -->
+
+    Serveren støtter ikke den mediatypen som ble forespurt.
+
+<!--#include virtual="include/bottom.html" -->
+----------nb--
+
 Content-language: pl
 Content-type: text/html; charset=UTF-8
 Body:----------pl--
diff --git a/docs/error/HTTP_VARIANT_ALSO_VARIES.html.var b/docs/error/HTTP_VARIANT_ALSO_VARIES.html.var
index c38afd4761..ba9609c674 100644
--- a/docs/error/HTTP_VARIANT_ALSO_VARIES.html.var
+++ b/docs/error/HTTP_VARIANT_ALSO_VARIES.html.var
@@ -133,6 +133,19 @@ Body:----------nl--
 <!--#include virtual="include/bottom.html" -->
 ----------nl--
 
+Content-language: nb
+Content-type: text/html; charset=UTF-8
+Body:----------nb--
+<!--#set var="CONTENT_LANGUAGE" value="nb"
+--><!--#set var="TITLE" value="Variant varierer også!"
+--><!--#include virtual="include/top.html" -->
+
+    En variant av den forespurte enheten er i seg selv en forhandelbar
+    ressurs. Tilgang ikke mulig.
+
+<!--#include virtual="include/bottom.html" -->
+----------nb--
+
 Content-language: pl
 Content-type: text/html; charset=UTF-8
 Body:----------pl--
diff --git a/docs/error/README b/docs/error/README
index b369187f7c..b660d07e30 100644
--- a/docs/error/README
+++ b/docs/error/README
@@ -24,6 +24,7 @@
   | Italian (it)          | Luigi Rosa                               |
   | Japanese (ja)         | TAKAHASHI Makoto                         |
   | Korean (ko)           | Jaeho Shin                               |
+  | Norwegian Bokmål (nb) | Tom Fredrik Klaussen                     |
   | Polish (pl)           | Tomasz Kepczynski                        |
   | Romanian (ro)         | Andrei Besleaga                          |
   | Serbian (sr)          | Nikola Smolenski                         |
diff --git a/docs/error/contact.html.var b/docs/error/contact.html.var
index 4dea0126ae..62044cf048 100644
--- a/docs/error/contact.html.var
+++ b/docs/error/contact.html.var
@@ -74,6 +74,13 @@ Indien u van oordeel bent dat deze server in fout is, gelieve
 de <a href="mailto:<!--#echo encoding="url" var="SERVER_ADMIN" -->">webmaster</a> te contacteren.
 ----------nl--
 
+Content-language: nb
+Content-type: text/html; charset=UTF-8
+Body:----------nb--
+Om du tror dette skyldes en serverfeil, venligst kontakt
+<a href="mailto:<!--#echo encoding="url" var="SERVER_ADMIN" -->">webansvarlig</a>.
+----------nb--
+
 Content-language: pl
 Content-type: text/html; charset=UTF-8
 Body:----------pl--