langpacks: update according to commit [6334]

git-svn-id: http://svn.miranda-ng.org/main/trunk@6361 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

17 files changed, 46 insertions, 76 deletions

diff --git a/langpacks/norwegian/Plugins/AdvancedAutoAway.txt b/langpacks/norwegian/Plugins/AdvancedAutoAway.txt
index 3db3b0d974..8ac59d0faf 100644
--- a/langpacks/norwegian/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/norwegian/Plugins/AdvancedAutoAway.txt
@@ -24,15 +24,13 @@ Melding
 OK

 [Other]

 Annet

-[Background colour]

+[Background color]

 Bakgrunnsfarge

-[Background colour]

-Bakgrunnsfarge

-[Text colour]

+[Text color]

 Tekstfarge

-[Use Windows colours]

+[Use Windows colors]

 Bruk Windowsfarger

-[Use default colours]

+[Use default colors]

 Bruk standardfarger

 [Events]

 Hendelser

diff --git a/langpacks/norwegian/Plugins/AvatarHistory.txt b/langpacks/norwegian/Plugins/AvatarHistory.txt
index 430b7ad6ec..67b9c593d7 100644
--- a/langpacks/norwegian/Plugins/AvatarHistory.txt
+++ b/langpacks/norwegian/Plugins/AvatarHistory.txt
@@ -8,20 +8,16 @@
 ;file \plugins\AvatarHistory\res\AvatarHistory.rc

 [OK]

 OK

-[Background colour]

+[Background color]

 Bakgrunnsfarge

-[Background colour]

-Bakgrunnsfarge

-[Text colour]

+[Text color]

 Tekstfarge

-[Use Windows colours]

+[Use Windows colors]

 Bruk Windowsfarger

-[Use default colours]

+[Use default colors]

 Bruk standardfarger

 [Custom]

 Selvvalgt

-[Custom]

-Selvvalgt

 [Actions]

 Handlinger

 ;file \plugins\AvatarHistory\src\AvatarDlg.cpp

@@ -33,6 +29,4 @@ Historikk
 ;file \plugins\AvatarHistory\src\options.cpp

 [Popups]

 Popups

-[Popups]

-Popups

 ;file \plugins\AvatarHistory\src\utils.cpp

diff --git a/langpacks/norwegian/Plugins/Clist_modern.txt b/langpacks/norwegian/Plugins/Clist_modern.txt
index 702a094c7a..1f2078231c 100644
--- a/langpacks/norwegian/Plugins/Clist_modern.txt
+++ b/langpacks/norwegian/Plugins/Clist_modern.txt
@@ -72,7 +72,7 @@ Kopier
 Lim inn

 [Object properties]

 Objektegenskaper

-[Colour]

+[Color]

 Farge

 [Image file and fitting mode]

 Bildefil og tilpasningsmodus

diff --git a/langpacks/norwegian/Plugins/Clist_nicer.txt b/langpacks/norwegian/Plugins/Clist_nicer.txt
index d26e0ce677..084f3ccf23 100644
--- a/langpacks/norwegian/Plugins/Clist_nicer.txt
+++ b/langpacks/norwegian/Plugins/Clist_nicer.txt
@@ -236,11 +236,9 @@ Skjul vertikal scroll bar
 Grå ut hele listen når:

 [Contact List Background]

 Kontaktliste bakgrunn

-[Use Windows colours]

+[Use Windows colors]

 Bruk Windowsfarger

-[Background colour]

-Bakgrunnsfarge

-[Background colour]

+[Background color]

 Bakgrunnsfarge

 [Use background image]

 Bruk bakgrunnsbilde

diff --git a/langpacks/norwegian/Plugins/DbEditorPP.txt b/langpacks/norwegian/Plugins/DbEditorPP.txt
index 96c68ec54b..b16d93f079 100644
--- a/langpacks/norwegian/Plugins/DbEditorPP.txt
+++ b/langpacks/norwegian/Plugins/DbEditorPP.txt
@@ -24,9 +24,7 @@ Moduler som ALLTID merkes som gjenkjent (eks. kjernemoduler)
 Sett et mellomrom eller komma mellom hvert modulnavn

 [Changes to this list will take effect next time miranda starts]

 Endringer i denne listen vil synes neste gang Miranda starter

-[Background colour]

-Bakgrunnsfarge

-[Background colour]

+[Background color]

 Bakgrunnsfarge

 [OK]

 OK

diff --git a/langpacks/norwegian/Plugins/ICQ.txt b/langpacks/norwegian/Plugins/ICQ.txt
index 16505e4828..99de07db1e 100644
--- a/langpacks/norwegian/Plugins/ICQ.txt
+++ b/langpacks/norwegian/Plugins/ICQ.txt
@@ -30,7 +30,7 @@ Valg
 TekstFarge

 [Error]

 Feil

-[Use default colours]

+[Use default colors]

 Bruk standardfarger

 [Idle since:]

 Inaktiv siden:

diff --git a/langpacks/norwegian/Plugins/KeepStatus.txt b/langpacks/norwegian/Plugins/KeepStatus.txt
index 157e80daf0..fd3e34b9c3 100644
--- a/langpacks/norwegian/Plugins/KeepStatus.txt
+++ b/langpacks/norwegian/Plugins/KeepStatus.txt
@@ -24,15 +24,13 @@ Melding
 OK

 [Other]

 Annet

-[Background colour]

+[Background color]

 Bakgrunnsfarge

-[Background colour]

-Bakgrunnsfarge

-[Text colour]

+[Text color]

 Tekstfarge

-[Use Windows colours]

+[Use Windows colors]

 Bruk Windowsfarger

-[Use default colours]

+[Use default colors]

 Bruk standardfarger

 [Events]

 Hendelser

diff --git a/langpacks/norwegian/Plugins/MRA.txt b/langpacks/norwegian/Plugins/MRA.txt
index fe672ce291..ebc921264f 100644
--- a/langpacks/norwegian/Plugins/MRA.txt
+++ b/langpacks/norwegian/Plugins/MRA.txt
@@ -14,9 +14,7 @@ Passord:
 Port:

 [Default]

 Standard

-[Background colour]

-Bakgrunnsfarge

-[Background colour]

+[Background color]

 Bakgrunnsfarge

 [Font]

 Skrift

diff --git a/langpacks/norwegian/Plugins/NewXstatusNotify.txt b/langpacks/norwegian/Plugins/NewXstatusNotify.txt
index 7e44a976cb..f02ed20750 100644
--- a/langpacks/norwegian/Plugins/NewXstatusNotify.txt
+++ b/langpacks/norwegian/Plugins/NewXstatusNotify.txt
@@ -52,11 +52,11 @@ Popups
 Bakgrunn

 [Text]

 Tekst

-[Use custom colours]

+[Use custom colors]

 Bruk selvvalgte farger

-[Use Windows colours]

+[Use Windows colors]

 Bruk Windowsfarger

-[Use Popup colours]

+[Use Popup colors]

 Bruk Popupfarger

 [Read status message]

 Les statusmelding

diff --git a/langpacks/norwegian/Plugins/Popup.txt b/langpacks/norwegian/Plugins/Popup.txt
index 5a24c1886e..2481a3e93e 100644
--- a/langpacks/norwegian/Plugins/Popup.txt
+++ b/langpacks/norwegian/Plugins/Popup.txt
@@ -147,7 +147,7 @@ vertikal
 ;file \plugins\Popup\src\opt_skins.cpp

 [Enable Aero Glass (Vista+)]

 Aktiver Aero Glass (Vista+)

-[Use Windows colours]

+[Use Windows colors]

 Bruk Windowsfarger

 [Use advanced text render]

 Bruk avansert textgjengivelse

diff --git a/langpacks/norwegian/Plugins/Quotes.txt b/langpacks/norwegian/Plugins/Quotes.txt
index f419170392..ad1e23922d 100644
--- a/langpacks/norwegian/Plugins/Quotes.txt
+++ b/langpacks/norwegian/Plugins/Quotes.txt
@@ -14,13 +14,11 @@ Logg
 Avbryt

 [Close]

 Lukk

-[Use default colours]

+[Use default colors]

 Bruk standardfarger

-[Background colour]

+[Background color]

 Bakgrunnsfarge

-[Background colour]

-Bakgrunnsfarge

-[Text colour]

+[Text color]

 Tekstfarge

 [Custom]

 Selvvalgt

diff --git a/langpacks/norwegian/Plugins/Scriver.txt b/langpacks/norwegian/Plugins/Scriver.txt
index 2245bb3576..46c43e0487 100644
--- a/langpacks/norwegian/Plugins/Scriver.txt
+++ b/langpacks/norwegian/Plugins/Scriver.txt
@@ -142,9 +142,9 @@ Ord som skal merkes (jokertegn er tillatt)
 Plassering

 [Use same style as in the message log]

 Bruk samme stil som i samtaleloggen

-[Use default colours]

+[Use default colors]

 Bruk standardfarger

-[Use custom colours]

+[Use custom colors]

 Bruk selvvalgte farger

 [Text]

 Tekst

@@ -227,11 +227,9 @@ Utgående melding (10x10)
 Varsel (10x10)

 [Window Icon]

 Vindu Ikon

-[Text colour]

+[Text color]

 Tekstfarge

-[Background colour]

-Bakgrunnsfarge

-[Background colour]

+[Background color]

 Bakgrunnsfarge

 [Bold]

 Fet

diff --git a/langpacks/norwegian/Plugins/StartupStatus.txt b/langpacks/norwegian/Plugins/StartupStatus.txt
index dbaada22d4..e1f5608efa 100644
--- a/langpacks/norwegian/Plugins/StartupStatus.txt
+++ b/langpacks/norwegian/Plugins/StartupStatus.txt
@@ -24,15 +24,13 @@ Melding
 OK

 [Other]

 Annet

-[Background colour]

+[Background color]

 Bakgrunnsfarge

-[Background colour]

-Bakgrunnsfarge

-[Text colour]

+[Text color]

 Tekstfarge

-[Use Windows colours]

+[Use Windows colors]

 Bruk Windowsfarger

-[Use default colours]

+[Use default colors]

 Bruk standardfarger

 [Events]

 Hendelser

diff --git a/langpacks/norwegian/Plugins/TabSRMM.txt b/langpacks/norwegian/Plugins/TabSRMM.txt
index 1ede169553..d389e5ec77 100644
--- a/langpacks/norwegian/Plugins/TabSRMM.txt
+++ b/langpacks/norwegian/Plugins/TabSRMM.txt
@@ -259,7 +259,7 @@ millisekunder
 Popups

 [Popups]

 Popups

-[&Use Windows colours]

+[&Use Windows colors]

 &Bruk Windowsfarger

 [...is typing]

 ...skriver

@@ -645,9 +645,7 @@ Understreket type
 Skriftutseende

 [Font color]

 Skriftfarge

-[Background colour]

-Bakgrunnsfarge

-[Background colour]

+[Background color]

 Bakgrunnsfarge

 [Room settings]

 Rominnstillinger

diff --git a/langpacks/norwegian/Plugins/UInfoEx.txt b/langpacks/norwegian/Plugins/UInfoEx.txt
index ed93793737..0410371ff2 100644
--- a/langpacks/norwegian/Plugins/UInfoEx.txt
+++ b/langpacks/norwegian/Plugins/UInfoEx.txt
@@ -66,15 +66,13 @@ Bursdags kompatibilitetsmodus:
 Utført automatisk backup og hold protokollbaserte bursdager oppdatert

 [Use ignore list]

 Bruk ignoreringsliste

-[Background colour]

+[Background color]

 Bakgrunnsfarge

-[Background colour]

-Bakgrunnsfarge

-[Text colour]

+[Text color]

 Tekstfarge

-[Use Windows colours]

+[Use Windows colors]

 Bruk Windowsfarger

-[Use default colours]

+[Use default colors]

 Bruk standardfarger

 [Custom]

 Selvvalgt

@@ -82,7 +80,7 @@ Selvvalgt
 Selvvalgt

 [Show reminder messages as popups (if reminder is enabled)]

 Vis påminnelser som popups (om påminnelser er aktivert)

-[Anniversary popup colours]

+[Anniversary popup colors]

 Årsdags popup farger

 [Homepage:]

 Webside:

@@ -112,7 +110,7 @@ Selvvalgt informasjon
 Overskrevet informasjon

 [Changed information]

 Endret informasjon

-[Enable colours to give information about information's status.]

+[Enable colors to give information about information's status.]

 Aktiver farger for å gi informasjon om informasjonsstatuser

 [Make protocol based contact information readonly.]

 Gjør protokollbasert kontaktinformasjon kun mulig for lesing.

diff --git a/langpacks/norwegian/Plugins/Weather.txt b/langpacks/norwegian/Plugins/Weather.txt
index d819897c48..74853ad1ec 100644
--- a/langpacks/norwegian/Plugins/Weather.txt
+++ b/langpacks/norwegian/Plugins/Weather.txt
@@ -14,13 +14,11 @@ Valg
 Synlighet

 [Cancel]

 Avbryt

-[Background colour]

+[Background color]

 Bakgrunnsfarge

-[Background colour]

-Bakgrunnsfarge

-[Text colour]

+[Text color]

 Tekstfarge

-[Use Windows colours]

+[Use Windows colors]

 Bruk Windowsfarger

 [seconds]

 sekunder

diff --git a/langpacks/norwegian/Plugins/YAMN.txt b/langpacks/norwegian/Plugins/YAMN.txt
index 59f989daaf..f6087e1616 100644
--- a/langpacks/norwegian/Plugins/YAMN.txt
+++ b/langpacks/norwegian/Plugins/YAMN.txt
@@ -48,11 +48,9 @@ Usynlig
 I Telefonen

 [Out to lunch]

 Ute til lunsj

-[Background colour]

+[Background color]

 Bakgrunnsfarge

-[Background colour]

-Bakgrunnsfarge

-[Text colour]

+[Text color]

 Tekstfarge

 ;file \plugins\YAMN\src\main.cpp

 ;file \plugins\YAMN\src\main.h