aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/lang_norwegian
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/language/lang_norwegian')
-rw-r--r--phpBB/language/lang_norwegian/email/admin_activate.tpl2
-rw-r--r--phpBB/language/lang_norwegian/email/admin_welcome_activated.tpl2
-rw-r--r--phpBB/language/lang_norwegian/email/admin_welcome_inactive.tpl2
-rw-r--r--phpBB/language/lang_norwegian/email/coppa_welcome_inactive.tpl2
-rw-r--r--phpBB/language/lang_norwegian/email/group_added.tpl2
-rw-r--r--phpBB/language/lang_norwegian/email/group_approved.tpl2
-rw-r--r--phpBB/language/lang_norwegian/email/group_request.tpl2
-rw-r--r--phpBB/language/lang_norwegian/email/privmsg_notify.tpl2
-rw-r--r--phpBB/language/lang_norwegian/email/topic_notify.tpl2
-rw-r--r--phpBB/language/lang_norwegian/email/user_activate.tpl2
-rw-r--r--phpBB/language/lang_norwegian/email/user_activate_passwd.tpl2
-rw-r--r--phpBB/language/lang_norwegian/email/user_welcome.tpl2
-rw-r--r--phpBB/language/lang_norwegian/email/user_welcome_inactive.tpl2
-rw-r--r--phpBB/language/lang_norwegian/lang_main.php17
14 files changed, 29 insertions, 14 deletions
diff --git a/phpBB/language/lang_norwegian/email/admin_activate.tpl b/phpBB/language/lang_norwegian/email/admin_activate.tpl
index 70d02dfebc..01d7839a73 100644
--- a/phpBB/language/lang_norwegian/email/admin_activate.tpl
+++ b/phpBB/language/lang_norwegian/email/admin_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Nytt medlemskap
+
Hei,
Medlemskapet til "{USERNAME}" er deaktivert eller nyopprettet, om ønskelig kan du se profilen her:
diff --git a/phpBB/language/lang_norwegian/email/admin_welcome_activated.tpl b/phpBB/language/lang_norwegian/email/admin_welcome_activated.tpl
index d4d31b0af0..ceca4b3522 100644
--- a/phpBB/language/lang_norwegian/email/admin_welcome_activated.tpl
+++ b/phpBB/language/lang_norwegian/email/admin_welcome_activated.tpl
@@ -1,3 +1,5 @@
+Subject: Medlemskapet er aktivert
+
Hei {USERNAME},
Medlemskapet ditt i forumene på "{SITENAME}" er aktivert, du kan logge på med brukernavnet og passordet du fikk tilsendt i en tidligere e-post.
diff --git a/phpBB/language/lang_norwegian/email/admin_welcome_inactive.tpl b/phpBB/language/lang_norwegian/email/admin_welcome_inactive.tpl
index 7aa107dcf1..5510be5c2d 100644
--- a/phpBB/language/lang_norwegian/email/admin_welcome_inactive.tpl
+++ b/phpBB/language/lang_norwegian/email/admin_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Velkommen til forumene på {SITENAME}
+
{WELCOME_MSG}
Ta vare på denne e-posten, medlemsinformasjonen din er som følger :
diff --git a/phpBB/language/lang_norwegian/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_norwegian/email/coppa_welcome_inactive.tpl
index 432aaa3d21..b8f1fdc7fb 100644
--- a/phpBB/language/lang_norwegian/email/coppa_welcome_inactive.tpl
+++ b/phpBB/language/lang_norwegian/email/coppa_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Velkommen til forumene på {SITENAME}
+
{WELCOME_MSG}
I tråd med COPPA er medlemskapet ditt ikke aktivert.
diff --git a/phpBB/language/lang_norwegian/email/group_added.tpl b/phpBB/language/lang_norwegian/email/group_added.tpl
index 515683c5e9..4bfb108ab3 100644
--- a/phpBB/language/lang_norwegian/email/group_added.tpl
+++ b/phpBB/language/lang_norwegian/email/group_added.tpl
@@ -1,3 +1,5 @@
+Subject: Du er nå lagt til i denne grupppen
+
Gratulerer,
Du er lagt til som medlem i gruppen, "{GROUP_NAME}", i forumet på {SITENAME}.
diff --git a/phpBB/language/lang_norwegian/email/group_approved.tpl b/phpBB/language/lang_norwegian/email/group_approved.tpl
index 4d5f3ba424..2780b3572a 100644
--- a/phpBB/language/lang_norwegian/email/group_approved.tpl
+++ b/phpBB/language/lang_norwegian/email/group_approved.tpl
@@ -1,3 +1,5 @@
+Subject: Din søknad er innvilget
+
Gratulerer,
Din søknad om medlemskap i "{GROUP_NAME}" i forumet på {SITENAME} er innvilget.
diff --git a/phpBB/language/lang_norwegian/email/group_request.tpl b/phpBB/language/lang_norwegian/email/group_request.tpl
index e5db126ccc..452fc195be 100644
--- a/phpBB/language/lang_norwegian/email/group_request.tpl
+++ b/phpBB/language/lang_norwegian/email/group_request.tpl
@@ -1,3 +1,5 @@
+Subject: En søknad om deltagelse i din gruppe er levert
+
Hei {GROUP_MODERATOR},
Et medlem har søkt om medlemskap i en gruppe du modererer på {SITENAME}.
diff --git a/phpBB/language/lang_norwegian/email/privmsg_notify.tpl b/phpBB/language/lang_norwegian/email/privmsg_notify.tpl
index eb36fe360d..69471c70f3 100644
--- a/phpBB/language/lang_norwegian/email/privmsg_notify.tpl
+++ b/phpBB/language/lang_norwegian/email/privmsg_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Du har mottatt en Privat Melding
+
Hei {USERNAME},
Du har mottatt en ny privat melding i forumet på "{SITENAME}", og har bedt om at dette varsles med e-post. Du kan lese meldingen ved å klikke på linken under :
diff --git a/phpBB/language/lang_norwegian/email/topic_notify.tpl b/phpBB/language/lang_norwegian/email/topic_notify.tpl
index e3538a24ac..4644911535 100644
--- a/phpBB/language/lang_norwegian/email/topic_notify.tpl
+++ b/phpBB/language/lang_norwegian/email/topic_notify.tpl
@@ -1,3 +1,5 @@
+Subject: Varsel om svar på Tema - {TOPIC_TITLE}
+
Hei {USERNAME},
Du mottar denne e-posten fordi du abonnerer på emnet, "{TOPIC_TITLE}", i forumet på {SITENAME}.
diff --git a/phpBB/language/lang_norwegian/email/user_activate.tpl b/phpBB/language/lang_norwegian/email/user_activate.tpl
index b00ee21e4c..6df6c2dc85 100644
--- a/phpBB/language/lang_norwegian/email/user_activate.tpl
+++ b/phpBB/language/lang_norwegian/email/user_activate.tpl
@@ -1,3 +1,5 @@
+Subject: Reaktiver medlemsskapet ditt!
+
Hei {USERNAME},
Medlemskapet ditt i forumet på "{SITENAME}" er deaktivert, dette er sannsyneligvis pga. endringer du selv har gjort i profilen din. Klikk på linken under for å reaktivere medlemskapet ditt.
diff --git a/phpBB/language/lang_norwegian/email/user_activate_passwd.tpl b/phpBB/language/lang_norwegian/email/user_activate_passwd.tpl
index 8ddb25c03c..4a0fd8d682 100644
--- a/phpBB/language/lang_norwegian/email/user_activate_passwd.tpl
+++ b/phpBB/language/lang_norwegian/email/user_activate_passwd.tpl
@@ -1,3 +1,5 @@
+Subject: Aktiver nytt passord
+
Hei {USERNAME}
Du har mottatt denne e-posten fordi du (eller noen som utgir seg for deg) har bedt om at et nytt passord på {SITENAME}. Hvis du ikke har bedt om nytt passord kan du overse denne e-posten, vennligst gi beskjed til forumets administrator.
diff --git a/phpBB/language/lang_norwegian/email/user_welcome.tpl b/phpBB/language/lang_norwegian/email/user_welcome.tpl
index e42d7f6b98..7246ac844f 100644
--- a/phpBB/language/lang_norwegian/email/user_welcome.tpl
+++ b/phpBB/language/lang_norwegian/email/user_welcome.tpl
@@ -1,3 +1,5 @@
+Subject: Velkommen til forumene på {SITENAME}
+
{WELCOME_MSG}
Ta godt vare på denne e-posten, medlemsinformasjonen din er som følger :
diff --git a/phpBB/language/lang_norwegian/email/user_welcome_inactive.tpl b/phpBB/language/lang_norwegian/email/user_welcome_inactive.tpl
index f8449212e7..91d27e4516 100644
--- a/phpBB/language/lang_norwegian/email/user_welcome_inactive.tpl
+++ b/phpBB/language/lang_norwegian/email/user_welcome_inactive.tpl
@@ -1,3 +1,5 @@
+Subject: Velkommen til forumene på {SITENAME}
+
{WELCOME_MSG}
Ta vare på denne e-posten, medlemsinformasjonen din er som følger :
diff --git a/phpBB/language/lang_norwegian/lang_main.php b/phpBB/language/lang_norwegian/lang_main.php
index d606e8431d..9b864a5a0a 100644
--- a/phpBB/language/lang_norwegian/lang_main.php
+++ b/phpBB/language/lang_norwegian/lang_main.php
@@ -23,23 +23,12 @@
// Norwegian translation by lanes, shantra & water
//
-//
-// The format of this file is:
-//
-// ---> $lang['message'] = "text";
-//
-// You should also try to set a locale and a character
-// encoding (plus direction). The encoding and direction
-// will be sent to the template. The locale may or may
-// not work, it's dependent on OS support and the syntax
-// varies ... give it your best guess!
-//
//setlocale(LC_ALL, "no");
$lang['ENCODING'] = "iso-8859-1";
-$lang['DIRECTION'] = "LTR";
-$lang['LEFT'] = "VENSTRE";
-$lang['RIGHT'] = "HØYRE";
+$lang['DIRECTION'] = "ltr";
+$lang['LEFT'] = "left";
+$lang['RIGHT'] = "right";
$lang['DATE_FORMAT'] = "d M Y"; // This should be changed to the default date format for your language, php date() format
//