diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang
index 60ba70c2d1..48b154c460 100644
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@@ -136,15 +136,15 @@
id: LANG_RESTARTING_PLAYBACK
- desc: splash screen displayed when pcm buffer size is changed
+ desc: deprecated
user: core
*: none
- swcodec: "Restarting playback..."
+ swcodec: ""
*: none
- swcodec: "Starter avspilling på nytt..."
+ swcodec: ""
*: none
@@ -887,7 +887,7 @@
id: LANG_VERSION
- desc: in the info menu
+ desc: in the Rockbox Info screen
user: core
*: "Version"
@@ -3747,16 +3747,19 @@
user: core
*: none
+ multivolume: "HD1"
e200*,c200: "mSD:"
ondio*: "MMC:"
*: none
+ multivolume: "HD1"
e200*,c200: "mSD:"
ondio*: "MMC:"
*: none
+ multivolume: "H D 1"
e200*,c200: "mikro S D"
ondio*: "M M C"
@@ -6609,6 +6612,8 @@
ipod*: "PLAY/PAUSE to abort"
x5,m5: "Long PLAY to abort"
h10,h10_5gb,e200*,c200: "PREV to abort"
+ gigabeats: "BACK to abort"
+ gigabeatf: "POWER to abort"
*: "OFF for å avbryte"
@@ -6616,6 +6621,8 @@
ipod*: "PLAY/PAUSE for å avbryte"
x5,m5: "Hold PLAY for å avbryte"
h10,h10_5gb,e200*,c200: "PREV for å avbryte"
+ gigabeats: "BACK for å avbryte"
+ gigabeatf: "POWER for å avbryte"
*: ""
@@ -8451,7 +8458,7 @@
user: core
*: none
- swcodec: "Cutoff Frequency"
+ swcodec: "Cutoff"
*: none
@@ -8468,7 +8475,7 @@
user: core
*: none
- swcodec: "Edit mode: %s"
+ swcodec: "Edit mode: %s %s"
*: none
@@ -11963,3 +11970,376 @@
agc: "AGC klipptid"
+
+ id: LANG_SERIAL_BITRATE_19200
+ desc: in system settings menu
+ user: core
+
+ *: none
+ serial_port: "19200"
+
+
+ *: none
+ serial_port: "19200"
+
+
+ *: none
+ serial_port: "19200"
+
+
+
+ id: LANG_ENABLE_SPEAKER
+ desc: in Settings -> Sound Settings
+ user: core
+
+ *: none
+ speaker: "Enable Speaker"
+
+
+ *: none
+ speaker: "Aktiver høyttaler"
+
+
+ *: none
+ speaker: "Aktiver høyttaler"
+
+
+
+ id: LANG_ALBUMART
+ desc: Display the expected AA size
+ user: core
+
+ *: none
+ albumart: "Album Art:"
+
+
+ *: none
+ albumart: "Albumbilde:"
+
+
+ *: none
+ albumart: "Albumbilde:"
+
+
+
+ id: LANG_CHANNEL_LEFTRIGHT
+ desc: in sound_settings
+ user: core
+
+ *: none
+ recording_swcodec: "Mono Left + Right"
+
+
+ *: none
+ recording_swcodec: "Mono venstre + høyre"
+
+
+ *: none
+ recording_swcodec: "Mono venstre pluss høyre"
+
+
+
+ id: LANG_SORT_INTERPRET_NUMBERS
+ desc: in Settings -> File view
+ user: core
+
+ *: "Interpret numbers when sorting"
+
+
+ *: "Sorteringsmetode for tall"
+
+
+ *: "Sorteringsmetode for tall"
+
+
+
+ id: LANG_SERIAL_BITRATE
+ desc: in system settings menu
+ user: core
+
+ *: none
+ serial_port: "Serial Bitrate"
+
+
+ *: none
+ serial_port: "Seriell bitrate"
+
+
+ *: none
+ serial_port: "Seriell bitrate"
+
+
+
+ id: LANG_SERIAL_BITRATE_9600
+ desc: in system settings menu
+ user: core
+
+ *: none
+ serial_port: "9600"
+
+
+ *: none
+ serial_port: "9600"
+
+
+ *: none
+ serial_port: "9600"
+
+
+
+ id: LANG_LEFT_QS_ITEM
+ desc: used for the submenu name for the quickscreen items
+ user: core
+
+ *: none
+ quickscreen: "Set as Left Quickscreen Item"
+
+
+ *: none
+ quickscreen: "Bruk som venstre hurtiginnstilling"
+
+
+ *: none
+ quickscreen: "Bruk som venstre hurtiginnstilling"
+
+
+
+ id: LANG_RESET_SETTING
+ desc: used in the settings context menu
+ user: core
+
+ *: "Reset Setting"
+
+
+ *: "Nullstill innstilling"
+
+
+ *: "Nullstill innstilling"
+
+
+
+ id: LANG_BOTTOM
+ desc: DEPRECATED
+ user: core
+
+ *: none
+ quickscreen: ""
+
+
+ *: none
+ quickscreen: ""
+
+
+ *: none
+ quickscreen: ""
+
+
+
+ id: LANG_BOTTOM_QS_ITEM
+ desc: used for the submenu name for the quickscreen items
+ user: core
+
+ *: none
+ quickscreen: "Set as Bottom Quickscreen Item"
+
+
+ *: none
+ quickscreen: "Bruk som nedre hurtiginnstilling"
+
+
+ *: none
+ quickscreen: "Bruk som nedre hurtiginnstilling"
+
+
+
+ id: LANG_RIGHT
+ desc: DEPRECATED
+ user: core
+
+ *: none
+ quickscreen: ""
+
+
+ *: none
+ quickscreen: ""
+
+
+ *: none
+ quickscreen: ""
+
+
+
+ id: LANG_QS_ITEMS
+ desc: DEPRECATED
+ user: core
+
+ *: none
+ quickscreen: ""
+
+
+ *: none
+ quickscreen: ""
+
+
+ *: none
+ quickscreen: ""
+
+
+
+ id: LANG_RIGHT_QS_ITEM
+ desc: used for the submenu name for the quickscreen items
+ user: core
+
+ *: none
+ quickscreen: "Set as Right Quickscreen Item"
+
+
+ *: none
+ quickscreen: "Bruk som høyre hurtiginnstilling"
+
+
+ *: none
+ quickscreen: "Bruk som høyre hurtiginnstilling"
+
+
+
+ id: LANG_SERIAL_BITRATE_38400
+ desc: in system settings menu
+ user: core
+
+ *: none
+ serial_port: "38400"
+
+
+ *: none
+ serial_port: "38400"
+
+
+ *: none
+ serial_port: "38400"
+
+
+
+ id: LANG_SERIAL_BITRATE_57600
+ desc: in system settings menu
+ user: core
+
+ *: none
+ serial_port: "57600"
+
+
+ *: none
+ serial_port: "57600"
+
+
+ *: none
+ serial_port: "57600"
+
+
+
+ id: LANG_SORT_INTERPRET_AS_NUMBERS
+ desc: in Settings -> File view
+ user: core
+
+ *: "As whole numbers"
+
+
+ *: "Som hele tall"
+
+
+ *: "Som hele tall"
+
+
+
+ id: LANG_CREDITS
+ desc: in the Main Menu -> System screen
+ user: core
+
+ *: "Credits"
+
+
+ *: "Bidragsytere"
+
+
+ *: "Bidragsytere"
+
+
+
+ id: LANG_SEARCH_RESULTS
+ desc: title for the list of results displayed after searching in a playlist
+ user: core
+
+ *: "Search Results"
+
+
+ *: "Søkeresultater"
+
+
+ *: "Søkeresultater"
+
+
+
+ id: LANG_SORT_INTERPRET_AS_DIGIT
+ desc: in Settings -> File view
+ user: core
+
+ *: "As digits"
+
+
+ *: "Som sifre"
+
+
+ *: "Som sifre"
+
+
+
+ id: LANG_RECORDING_MONO_MODE
+ desc: in the recording settings
+ user: core
+
+ *: none
+ recording_swcodec: "Mono mode"
+
+
+ *: none
+ recording_swcodec: "Mono-modus"
+
+
+ *: none
+ recording_swcodec: "Mono-modus"
+
+
+
+ id: LANG_LEFT
+ desc: DEPRECATED
+ user: core
+
+ *: none
+ quickscreen: ""
+
+
+ *: none
+ quickscreen: ""
+
+
+ *: none
+ quickscreen: ""
+
+
+
+ id: LANG_SERIAL_BITRATE_AUTO
+ desc: in system settings menu
+ user: core
+
+ *: none
+ serial_port: "Auto"
+
+
+ *: none
+ serial_port: "Auto"
+
+
+ *: none
+ serial_port: "Automatisk"
+
+