Fixes and sync.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6870 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 32 insertions, 8 deletions

diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang
index f27e39979f..a59162306b 100644
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@@ -58,7 +58,7 @@ id: LANG_BATTERY_CHARGE
 desc: tells that the battery is charging, instead of battery level
 eng: "Battery: Charging"
 voice: ""
-new: "Batteri lader"
+new: "Batteri: lader"
 
 id: LANG_PLAYLIST_LOAD
 desc: displayed on screen while loading a playlist
@@ -376,7 +376,7 @@ id: LANG_SHOWDIR_ERROR_FULL
 desc: in showdir(), displayed on screen when you reach buffer limit
 eng: "Is Full!"
 voice: ""
-new: "Er full!"
+new: "er full!"
 
 id: LANG_RESUME_ASK
 desc: question asked at the begining when resume is on
@@ -1030,13 +1030,13 @@ id: LANG_BATTERY_TOPOFF_CHARGE
 desc: in info display, shows that top off charge is running
 eng: "Battery: Top-Off Chg"
 voice: ""
-new: "Batteri: Top-Off-lading"
+new: "Batteri: top-Off-lading"
 
 id: LANG_BATTERY_TRICKLE_CHARGE
 desc: in info display, shows that trickle charge is running
 eng: "Battery: Trickle Chg"
 voice: ""
-new: "Batteri: Topplading"
+new: "Batteri: topplading"
 
 id: LANG_BIDIR_SCROLL
 desc: Bidirectional scroll limit
@@ -1744,13 +1744,13 @@ id: LANG_RECORD_PRERECORD
 desc: in recording and radio screen
 eng: "Prerecording"
 voice: ""
-new: "Pre-innspilling"
+new: "Forinnspilling"
 
 id: LANG_RECORD_PRERECORD_TIME
 desc: in recording settings_menu
 eng: "Prerecord time"
 voice: "Pre-Record time"
-new: "Pre-innspillingstid"
+new: "Forinnspillingstid"
 
 id: LANG_BOOKMARK_AUTOLOAD_QUERY
 desc: prompt for user to decide to create a bookmark
@@ -1816,7 +1816,7 @@ id: LANG_BOOKMARK_CREATE_FAILURE
 desc: Indicates bookmark was not created
 eng: "Bookmark Failed!"
 voice: ""
-new: "Bokmerke feilet!"
+new: "Bokmerking feilet!"
 
 id: LANG_BOOKMARK_LOAD_EMPTY
 desc: Indicates bookmark was empty
@@ -1846,7 +1846,7 @@ id: LANG_BOOKMARK_SETTINGS_MAINTAIN_RECENT_BOOKMARKS
 desc: Configuration option to maintain a list of recent bookmarks
 eng: "Maintain a List of Recent Bookmarks?"
 voice: "Maintain a List of Recent Bookmarks?"
-new: "Opprettholde en liste over siste bokmerker?"
+new: "Opprettholde liste over siste bokmerker?"
 
 id: LANG_BOOKMARK_SETTINGS_RECENT_ONLY_YES
 desc: Save in recent bookmarks only
@@ -3071,3 +3071,27 @@ desc: in playback settings
 eng: "Crossfade"
 voice: "Crossfade"
 new: "Kryssfade"
+
+id: LANG_BACKLIGHT_FADE_IN
+desc: in settings_menu
+eng: "Backlight fade in"
+voice: "Backlight fade in"
+new: "Skjermlys blende inn"
+
+id: LANG_BACKLIGHT_FADE_OUT
+desc: in settings_menu
+eng: "Backlight fade out"
+voice: "Backlight fade out"
+new: "Skjermlys blende ut"
+
+id: LANG_SHUFFLE_PLAYLIST
+desc: in playlist menu, reshuffles the order in which songs are played
+eng: "Reshuffle"
+voice: "Reshuffle"
+new: "Stokk om" 
+
+id: LANG_INSERT_SHUFFLED
+desc: in onplay menu.  insert a track/playlist randomly into dynamic playlist
+eng: "Insert shuffled"
+voice: 
+new: "Sett inn tilfeldig"