summaryrefslogtreecommitdiff
path: root/langpacks/norwegian
diff options
context:
space:
mode:
authorDart Raiden <wowemuh@gmail.com>2013-10-08 22:47:17 +0000
committerDart Raiden <wowemuh@gmail.com>2013-10-08 22:47:17 +0000
commit06f92b73453cb4afb831af361840f6de010697cd (patch)
treee23ca5d5606c17bdc7a740a61c2f0a0e35a668ef /langpacks/norwegian
parent81c409a40ad82e64974a9ddfc9117db51269ce92 (diff)
langpacks: update according to commit [6389]
git-svn-id: http://svn.miranda-ng.org/main/trunk@6410 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/norwegian')
-rw-r--r--langpacks/norwegian/=CORE=.txt4
-rw-r--r--langpacks/norwegian/Plugins/Contacts.txt2
-rw-r--r--langpacks/norwegian/Plugins/Scriver.txt6
-rw-r--r--langpacks/norwegian/Plugins/SendSS.txt2
-rw-r--r--langpacks/norwegian/Plugins/Xfire.txt1
5 files changed, 7 insertions, 8 deletions
diff --git a/langpacks/norwegian/=CORE=.txt b/langpacks/norwegian/=CORE=.txt
index 6b5df00263..848c8c81fa 100644
--- a/langpacks/norwegian/=CORE=.txt
+++ b/langpacks/norwegian/=CORE=.txt
@@ -905,7 +905,7 @@ Aktiver avatarstøtte i samtalevinduet
Begrens avatarhøyde til
[Send Error]
Sendefeil
-[An error has occured. The protocol reported the following error:]
+[An error has occurred. The protocol reported the following error:]
En feil har inntruffet. Protokollen rapporterte følgende feil:
[while sending the following message:]
under sending av følgende melding:
@@ -1654,7 +1654,7 @@ Innkommende (Ufokusert Vindu)
[Incoming (New Session)]
Innkommende (Ny Samtaleøkt)
;file \src\core\stdmsg\src\msgtimedout.cpp
-[An unknown error has occured.]
+[An unknown error has occurred.]
En ukjent feil har inntruffet
;file \src\core\stduihist\history.cpp
[Outgoing Message]
diff --git a/langpacks/norwegian/Plugins/Contacts.txt b/langpacks/norwegian/Plugins/Contacts.txt
index 4a061eaf81..4c9c31a224 100644
--- a/langpacks/norwegian/Plugins/Contacts.txt
+++ b/langpacks/norwegian/Plugins/Contacts.txt
@@ -20,7 +20,7 @@ Avbryt
&Legg til
[Close]
Lukk
-[An error has occured. The protocol reported the following error:]
+[An error has occurred. The protocol reported the following error:]
En feil har inntruffet. Protokollen rapporterte følgende feil:
[Try again]
Forsøk igjen
diff --git a/langpacks/norwegian/Plugins/Scriver.txt b/langpacks/norwegian/Plugins/Scriver.txt
index 46c43e0487..3cd5d4a8c8 100644
--- a/langpacks/norwegian/Plugins/Scriver.txt
+++ b/langpacks/norwegian/Plugins/Scriver.txt
@@ -62,7 +62,7 @@ Blink i oppgavelinjen og i kontaktlisten
Vis ballong popup
[Send Error]
Sendefeil
-[An error has occured. The protocol reported the following error:]
+[An error has occurred. The protocol reported the following error:]
En feil har inntruffet. Protokollen rapporterte følgende feil:
[while sending the following message:]
under sending av følgende melding:
@@ -80,7 +80,7 @@ Meldingsøkt
&H
[Send To All Tabs]
Send Til Alle Faner
-[You are about to send a message to all open tabs.\nAre you sure ?]
+[You are about to send a message to all open tabs.\nAre you sure?]
Du er i ferd med å sende en melding til alle åpne faner.\nEr du sikker?
[Remember my choice for this container]
Husk mitt valg for denne beholderen
@@ -441,7 +441,7 @@ Innkommende (Ny Samtaleøkt)
[Outgoing]
Utgående
;file \plugins\Scriver\src\msgtimedout.cpp
-[An unknown error has occured.]
+[An unknown error has occurred.]
En ukjent feil har inntruffet
;file \plugins\Scriver\src\msgwindow.cpp
[Always On Top]
diff --git a/langpacks/norwegian/Plugins/SendSS.txt b/langpacks/norwegian/Plugins/SendSS.txt
index a7563f61bb..e3600f91b5 100644
--- a/langpacks/norwegian/Plugins/SendSS.txt
+++ b/langpacks/norwegian/Plugins/SendSS.txt
@@ -19,7 +19,7 @@ Takk >
[Edit]
Rediger
;file \plugins\SendScreenshotPlus\src\CSend.cpp
-[An unknown error has occured.]
+[An unknown error has occurred.]
En ukjent feil har inntruffet
[Error]
Feil
diff --git a/langpacks/norwegian/Plugins/Xfire.txt b/langpacks/norwegian/Plugins/Xfire.txt
index 32302f9bc8..263d3cc726 100644
--- a/langpacks/norwegian/Plugins/Xfire.txt
+++ b/langpacks/norwegian/Plugins/Xfire.txt
@@ -1,5 +1,4 @@
#muuid {9b8e1735-970d-4ce0-930c-a561956bdca2}
-;langpack template for Xfire
;file \protocols\Xfire\res\Kopie von resource.rc
[Password:]
Passord: