* ./toolbox: toolbox --update.po now updates po/POTFILES.in as well.

[vlc] / po / no.po

diff --git a/po/no.po b/po/no.po
index 113c0ae117cd4adf4b7f3a4b3c80946daf12816f..95ceecc39e91ecd8acb553764ca7d2e7beec95e1 100644 (file)
--- a/po/no.po
+++ b/po/no.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-05-08 19:06+0200\n"
+"POT-Creation-Date: 2003-05-15 17:38+0200\n"
 "PO-Revision-Date: 2003-04-06 12:32+0200\n"
 "Last-Translator: Haakon Meland Eriksen <haakon.eriksen@far.no>\n"
 "Language-Team: vlc <>\n"
@@ -19,7 +19,9 @@ msgid ""
 "the directory where you installed VLC and run \"vlc -I win32\"\n"
 msgstr ""
 "\n"
-"Advarsel: om du ikke lenger får tilgang til brukergrensesnittet kan du åpne et dos vindu, gå til katalogen du har installer VLC i og kjøre \"vlc -I win32\"\n"
+"Advarsel: om du ikke lenger får tilgang til brukergrensesnittet kan du åpne "
+"et dos vindu, gå til katalogen du har installer VLC i og kjøre \"vlc -I win32"
+"\"\n"
 
 #: src/audio_output/output.c:104 src/audio_output/output.c:131
 #, fuzzy
@@ -49,59 +51,132 @@ msgstr ""
 msgid "Reverse stereo"
 msgstr "Omvendt stereo"
 
-#: src/input/input_programs.c:90 modules/gui/gtk/gnome_interface.c:1078
+#: src/extras/getopt.c:638
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr ""
+
+#: src/extras/getopt.c:663
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr ""
+
+#: src/extras/getopt.c:668
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr ""
+
+#: src/extras/getopt.c:686 src/extras/getopt.c:859
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr ""
+
+#: src/extras/getopt.c:715
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr ""
+
+#: src/extras/getopt.c:719
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr ""
+
+#: src/extras/getopt.c:745
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr ""
+
+#: src/extras/getopt.c:748
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr ""
+
+#: src/extras/getopt.c:778 src/extras/getopt.c:908
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr ""
+
+#: src/extras/getopt.c:825
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr ""
+
+#: src/extras/getopt.c:843
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr ""
+
+#: src/input/input.c:151
+msgid "General"
+msgstr ""
+
+#: src/input/input.c:152
+#, fuzzy
+msgid "Playlist Item"
+msgstr "Spilleliste"
+
+#: src/input/input_programs.c:94 modules/gui/gtk/gnome_interface.c:1078
 #: modules/gui/gtk/gtk_interface.c:1199 modules/gui/kde/interface.cpp:142
-#: modules/gui/macosx/intf.m:331 modules/gui/macosx/intf.m:332
+#: modules/gui/macosx/intf.m:347 modules/gui/macosx/intf.m:348
 #: modules/gui/win32/strings.cpp:85
 #, fuzzy
 msgid "Program"
 msgstr "Avslutt programmet"
 
-#: src/input/input_programs.c:93 modules/gui/gtk/gnome_interface.c:1650
-#: modules/gui/gtk/gtk_interface.c:1956 modules/gui/gtk/menu.c:1402
-#: modules/gui/gtk/menu.c:1423 modules/gui/kde/interface.cpp:144
-#: modules/gui/macosx/intf.m:333 modules/gui/macosx/intf.m:334
-#: modules/gui/macosx/open.m:149 modules/gui/wxwindows/open.cpp:338
+#: src/input/input_programs.c:97 modules/demux/asf/libasf.c:696
+#: modules/gui/beos/MediaControlView.cpp:1258
+#: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
+#: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
+#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:349
+#: modules/gui/macosx/intf.m:350 modules/gui/macosx/open.m:149
+#: modules/gui/wxwindows/open.cpp:370
 msgid "Title"
 msgstr "Tittel"
 
-#: src/input/input_programs.c:96 modules/gui/gtk/gnome_interface.c:1640
-#: modules/gui/gtk/gtk_interface.c:1946 modules/gui/gtk/menu.c:1019
-#: modules/gui/gtk/menu.c:1432 modules/gui/kde/interface.cpp:146
-#: modules/gui/macosx/intf.m:335 modules/gui/macosx/intf.m:336
-#: modules/gui/macosx/open.m:150 modules/gui/wxwindows/open.cpp:344
+#: src/input/input_programs.c:100 modules/gui/beos/MediaControlView.cpp:1259
+#: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
+#: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
+#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:351
+#: modules/gui/macosx/intf.m:352 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:376
 msgid "Chapter"
 msgstr "Kapittel"
 
-#: src/input/input_programs.c:99 modules/gui/win32/strings.cpp:84
+#: src/input/input_programs.c:103 modules/gui/beos/InterfaceWindow.cpp:271
+#: modules/gui/win32/strings.cpp:84
 #, fuzzy
 msgid "Navigation"
 msgstr "_Navigasjon"
 
-#: src/input/input_programs.c:102
+#: src/input/input_programs.c:106
 #, fuzzy
 msgid "Video track"
 msgstr "Video"
 
-#: src/input/input_programs.c:105
+#: src/input/input_programs.c:109
 #, fuzzy
 msgid "Audio track"
 msgstr "Lyd"
 
-#: src/input/input_programs.c:108
+#: src/input/input_programs.c:112
 #, fuzzy
 msgid "Subtitle track"
 msgstr "_Teksting"
 
-#: src/input/input_programs.c:111
+#: src/input/input_programs.c:617
 msgid "Disable"
 msgstr ""
 
-#: src/libvlc.c:255 src/libvlc.c:341
+#: src/input/input_programs.c:629 src/input/input_programs.c:631
+#, c-format
+msgid "Track %i"
+msgstr ""
+
+#: src/libvlc.c:255 src/libvlc.c:342
 msgid "C"
 msgstr "no"
 
-#: src/libvlc.c:298 src/libvlc.c:1349
+#: src/libvlc.c:298 src/libvlc.c:1351
 #, c-format
 msgid ""
 "Usage: %s [options] [items]...\n"
@@ -110,27 +185,27 @@ msgstr ""
 "Bruk: %s [alternativer] [punkter]...\n"
 "\n"
 
-#: src/libvlc.c:1181 src/misc/configuration.c:919
+#: src/libvlc.c:1183 src/misc/configuration.c:961
 msgid "string"
 msgstr "tegn"
 
-#: src/libvlc.c:1198 src/misc/configuration.c:904
+#: src/libvlc.c:1200 src/misc/configuration.c:946
 msgid "integer"
 msgstr "heltall"
 
-#: src/libvlc.c:1201 src/misc/configuration.c:911
+#: src/libvlc.c:1203 src/misc/configuration.c:953
 msgid "float"
 msgstr "desimaltall"
 
-#: src/libvlc.c:1207
+#: src/libvlc.c:1209
 msgid " (default enabled)"
 msgstr " (grunninnstilling påskrudd)"
 
-#: src/libvlc.c:1208
+#: src/libvlc.c:1210
 msgid " (default disabled)"
 msgstr " (grunninnstilling avskrudd)"
 
-#: src/libvlc.c:1324 src/libvlc.c:1379 src/libvlc.c:1403
+#: src/libvlc.c:1326 src/libvlc.c:1381 src/libvlc.c:1405
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
@@ -138,11 +213,11 @@ msgstr ""
 "\n"
 "Trykk Retur-knappen for å fortsette...\n"
 
-#: src/libvlc.c:1352
+#: src/libvlc.c:1354
 msgid "[module]              [description]\n"
 msgstr "[modul]              [beskrivelse]\n"
 
-#: src/libvlc.c:1397
+#: src/libvlc.c:1399
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute it under the terms of the GNU General Public License;\n"
@@ -155,12 +230,12 @@ msgstr ""
 "- se filen KOPIERING for detaljer om dette.\n"
 "Programmet er skrevet av VideoLAN-teamet ved Ecole Centrale, Paris.\n"
 
-#: src/libvlc.h:37
+#: src/libvlc.h:40
 #, fuzzy
 msgid "Interface module"
 msgstr "grensesnittmodul"
 
-#: src/libvlc.h:39
+#: src/libvlc.h:42
 msgid ""
 "This option allows you to select the interface used by VLC. The default "
 "behavior is to automatically select the best module available."
@@ -168,12 +243,12 @@ msgstr ""
 "Du kan velge hvilket grensesnitt VLC skal bruke med dette alternativet. "
 "Standard innstillingen velger automatisk den beste tilgjengelige modulen."
 
-#: src/libvlc.h:43
+#: src/libvlc.h:46
 #, fuzzy
 msgid "Extra interface modules"
 msgstr "ekstra grensesnittmoduler"
 
-#: src/libvlc.h:45
+#: src/libvlc.h:48
 msgid ""
 "This option allows you to select additional interfaces used by VLC. They "
 "will be launched in the background in addition to the default interface. Use "
@@ -183,78 +258,89 @@ msgstr ""
 "alternativet. Disse startes i bakgrunnen i tillegg til standard "
 "grensesnittet. Bruk en kommaseparert liste med grensesnittmoduler."
 
-#: src/libvlc.h:49
+#: src/libvlc.h:52
 #, fuzzy
 msgid "Verbosity (0,1,2)"
 msgstr "detaljnivå (0,1,2)"
 
-#: src/libvlc.h:51
+#: src/libvlc.h:54
 msgid ""
 "This options sets the verbosity level (0=only errors and standard messages, "
 "1=warnings, 2=debug)."
-msgstr "Sett detaljnivået på beskjeder med dette alternativet (0=bare feil og standard meldinger, 1=advarsler, 2=feilretting)."
+msgstr ""
+"Sett detaljnivået på beskjeder med dette alternativet (0=bare feil og "
+"standard meldinger, 1=advarsler, 2=feilretting)."
 
-#: src/libvlc.h:54
+#: src/libvlc.h:57
 #, fuzzy
 msgid "Be quiet"
 msgstr "vær stille"
 
-#: src/libvlc.h:56
+#: src/libvlc.h:59
 msgid "This options turns off all warning and information messages."
 msgstr ""
 "Skru av alle advarsler og informasjonsmeldinger med dette alternativet."
 
-#: src/libvlc.h:58
-#, fuzzy
-msgid "Translation"
-msgstr "oversettelse"
+#: src/libvlc.h:61 modules/gui/beos/InterfaceWindow.cpp:255
+#: modules/gui/win32/strings.cpp:86
+msgid "Language"
+msgstr ""
 
-#: src/libvlc.h:60
+#: src/libvlc.h:62
+#, fuzzy
 msgid ""
-"This option allows you to set the language of the interface or disable the "
-"translation alltogether (e.g. 'C' (for disable), 'fr', 'de', 'en_GB', ...). "
-"The system language is auto-detected if nothing is specified here."
+"This option allows you to set the language of the interface. The system "
+"language is auto-detected if \"auto\" is specified here."
 msgstr ""
+"Standard sti som grensesnittet benytter for å finne filer velger du med "
+"dette alternativet."
 
-#: src/libvlc.h:65
+#: src/libvlc.h:66
 #, fuzzy
 msgid "Color messages"
 msgstr "fargede beskjeder"
 
-#: src/libvlc.h:67
+#: src/libvlc.h:68
 msgid ""
 "When this option is turned on, the messages sent to the console will be "
 "colorized. Your terminal needs Linux color support for this to work."
-msgstr "Når dette alternativet er påskrudd fargelegges meldinger til konsolen. Terminalklienten trenger Linux-fargestøtte for at dette skal virke."
+msgstr ""
+"Når dette alternativet er påskrudd fargelegges meldinger til konsolen. "
+"Terminalklienten trenger Linux-fargestøtte for at dette skal virke."
 
-#: src/libvlc.h:70
+#: src/libvlc.h:71
 #, fuzzy
 msgid "Show advanced options"
 msgstr "vis avanserte alternativer"
 
-#: src/libvlc.h:72
+#: src/libvlc.h:73
 msgid ""
 "When this option is turned on, the interfaces will show all the available "
 "options, including those that most users should never touch"
-msgstr "Alle tilgjengelige alternativer vises for grensesnittene når dette alternativet er påskrudd, inkludert de som de fleste brukere aldri burde røre."
+msgstr ""
+"Alle tilgjengelige alternativer vises for grensesnittene når dette "
+"alternativet er påskrudd, inkludert de som de fleste brukere aldri burde "
+"røre."
 
-#: src/libvlc.h:75
+#: src/libvlc.h:76
 #, fuzzy
 msgid "Interface default search path"
 msgstr "standard søkesti for grensesnittet"
 
-#: src/libvlc.h:77
+#: src/libvlc.h:78
 msgid ""
 "This option allows you to set the default path that the interface will open "
 "when looking for a file."
-msgstr "Standard sti som grensesnittet benytter for å finne filer velger du med dette alternativet."
+msgstr ""
+"Standard sti som grensesnittet benytter for å finne filer velger du med "
+"dette alternativet."
 
-#: src/libvlc.h:80
+#: src/libvlc.h:81
 #, fuzzy
 msgid "Plugin search path"
 msgstr "søkesti for tilleggskomponenter"
 
-#: src/libvlc.h:82
+#: src/libvlc.h:83
 msgid ""
 "This option allows you to specify an additional path for VLC to look for its "
 "plugins."
@@ -262,12 +348,12 @@ msgstr ""
 "Du kan spesifisere en ekstra sti der VLC kan se etter tilleggskomponenter "
 "med dette alternativet."
 
-#: src/libvlc.h:85
+#: src/libvlc.h:86
 #, fuzzy
 msgid "Audio output module"
 msgstr "Lyd-eksportmodul"
 
-#: src/libvlc.h:87
+#: src/libvlc.h:88
 msgid ""
 "This option allows you to select the audio output method used by VLC. The "
 "default behavior is to automatically select the best method available."
@@ -276,12 +362,12 @@ msgstr ""
 "alternativet. Standard innstillingen velger automatisk den beste "
 "tilgjengelige metoden. "
 
-#: src/libvlc.h:91
+#: src/libvlc.h:92
 #, fuzzy
 msgid "Enable audio"
 msgstr "skru på lyd"
 
-#: src/libvlc.h:93
+#: src/libvlc.h:94
 msgid ""
 "You can completely disable the audio output. In this case the audio decoding "
 "stage won't be done, and it will save some processing power."
@@ -289,40 +375,42 @@ msgstr ""
 "Du kan skru av lydeksport fullstendig. Dekoding av lyd vil ikke bli gjort "
 "hvis du velger dette, og dette sparer litt prosessorkraft."
 
-#: src/libvlc.h:96
+#: src/libvlc.h:97
 #, fuzzy
 msgid "Force mono audio"
 msgstr "framtvinger monolyd"
 
-#: src/libvlc.h:97
+#: src/libvlc.h:98
 msgid "This will force a mono audio output"
 msgstr "Dette framtvinger eksport av monolyd"
 
-#: src/libvlc.h:99
+#: src/libvlc.h:100
 #, fuzzy
 msgid "Audio output volume"
 msgstr "Lydeksport volum"
 
-#: src/libvlc.h:101
+#: src/libvlc.h:102
 msgid ""
 "You can set the default audio output volume here, in a range from 0 to 1024."
-msgstr "Du velger standardvolum for lydekport i et område fra 0 til 1024 med dette alternativet."
+msgstr ""
+"Du velger standardvolum for lydekport i et område fra 0 til 1024 med dette "
+"alternativet."
 
-#: src/libvlc.h:104
+#: src/libvlc.h:105
 #, fuzzy
 msgid "Audio output saved volume"
 msgstr "Standard grensesnitt: "
 
-#: src/libvlc.h:106
+#: src/libvlc.h:107
 msgid "This saves the audio output volume when you select mute."
 msgstr "Dette lagrer lydeksportvolumet når du skrur av lyden."
 
-#: src/libvlc.h:108
+#: src/libvlc.h:109
 #, fuzzy
 msgid "Audio output frequency (Hz)"
 msgstr "lydeksportens frekvens (Hz)"
 
-#: src/libvlc.h:110
+#: src/libvlc.h:111
 #, fuzzy
 msgid ""
 "You can force the audio output frequency here. Common values are -1 "
@@ -331,48 +419,57 @@ msgstr ""
 "Her kan du framtvinge lydeksportens frekvens. Vanlige verdier er 48000, "
 "44100, 32000, 22050, 16000, 11025, 8000."
 
-#: src/libvlc.h:113
+#: src/libvlc.h:114
 #, fuzzy
 msgid "Compensate desynchronization of audio (in ms)"
 msgstr "kompenserer for desynkronisering av lyd/bilde (i millisekunder)"
 
-#: src/libvlc.h:115
+#: src/libvlc.h:116
 msgid ""
 "This option allows you to delay the audio output. This can be handy if you "
 "notice a lag between the video and the audio."
-msgstr "Du kan forsinke lydeksporten med dette alternativet. Hvis du oppdager tidsforsinkelse mellom lyd og bilde kan dette være svært kjekt."
+msgstr ""
+"Du kan forsinke lydeksporten med dette alternativet. Hvis du oppdager "
+"tidsforsinkelse mellom lyd og bilde kan dette være svært kjekt."
 
-#: src/libvlc.h:118
+#: src/libvlc.h:119
 #, fuzzy
 msgid "Use the S/PDIF audio output when available"
 msgstr "bruk S/PDIF lydeksport når dette er tilgjengelig"
 
-#: src/libvlc.h:120
+#: src/libvlc.h:121
 msgid ""
 "This option allows you to use the S/PDIF audio output by default when your "
 "hardware supports it as well as the audio stream being played."
-msgstr "Du kan bruke S/PDIF lydeksport som standard når maskinvaren din støtter dette i tillegg til lydstrømmen som avspilles."
+msgstr ""
+"Du kan bruke S/PDIF lydeksport som standard når maskinvaren din støtter "
+"dette i tillegg til lydstrømmen som avspilles."
 
-#: src/libvlc.h:123
+#: src/libvlc.h:124
 #, fuzzy
 msgid "Headphone virtual spatialization effect"
 msgstr "romklangeffekt i høretelefoner"
 
-#: src/libvlc.h:125
+#: src/libvlc.h:126
 msgid ""
 "This effect gives you the feeling that you stands in a real room with a "
 "complete 5.1 speaker set when using only a headphone, providing a more "
 "realistic sound experience. It should also be more comfortable and less "
 "tiring when listening to music for long periods of time.\n"
 "It works with any source format from mono to 5.1."
-msgstr "Du får følelsen av å stå i et rom med et komplett 5.1 høytaleranlegg selv om du bare benytter en høretelefon når denne effekten er valgt, noe som gir en mer realistisk lydopplevelse. Når du hører på musikk over lengre tidsrom bør denne effekten gi en mer komfortabel og mindre trøttende opplevelse. Effekten virker uansett kildeformat, fra mono to 5.1."
+msgstr ""
+"Du får følelsen av å stå i et rom med et komplett 5.1 høytaleranlegg selv om "
+"du bare benytter en høretelefon når denne effekten er valgt, noe som gir en "
+"mer realistisk lydopplevelse. Når du hører på musikk over lengre tidsrom bør "
+"denne effekten gi en mer komfortabel og mindre trøttende opplevelse. "
+"Effekten virker uansett kildeformat, fra mono to 5.1."
 
-#: src/libvlc.h:132
+#: src/libvlc.h:133
 #, fuzzy
 msgid "Video output module"
 msgstr "Videofremvisningsmodul"
 
-#: src/libvlc.h:134
+#: src/libvlc.h:135
 msgid ""
 "This option allows you to select the video output method used by VLC. The "
 "default behavior is to automatically select the best method available."
@@ -381,12 +478,12 @@ msgstr ""
 "alternativet. Standard innstillingen velger automatisk den beste "
 "tilgjengelige metoden."
 
-#: src/libvlc.h:138
+#: src/libvlc.h:139
 #, fuzzy
 msgid "Enable video"
 msgstr "skru på video"
 
-#: src/libvlc.h:140
+#: src/libvlc.h:141
 msgid ""
 "You can completely disable the video output. In this case the video decoding "
 "stage won't be done, which will save some processing power."
@@ -394,24 +491,24 @@ msgstr ""
 "Du kan skru av videoeksport fullstendig. Videodekoding vil da ikke bli "
 "gjort, noe som sparer litt prosessorkraft."
 
-#: src/libvlc.h:143
+#: src/libvlc.h:144
 #, fuzzy
 msgid "Display identifier"
 msgstr "Identifikator for visningsområde"
 
-#: src/libvlc.h:145
+#: src/libvlc.h:146
 msgid ""
 "This is the local display port that will be used for X11 drawing. For "
 "instance :0.1."
 msgstr ""
 "Dette er den lokale visningsporten som X11 tegner til, for eksempel :0.1"
 
-#: src/libvlc.h:148
+#: src/libvlc.h:149
 #, fuzzy
 msgid "Video width"
 msgstr "videobredde"
 
-#: src/libvlc.h:150
+#: src/libvlc.h:151
 msgid ""
 "You can enforce the video width here. By default VLC will adapt to the video "
 "characteristics."
@@ -419,196 +516,229 @@ msgstr ""
 "Her kan du sette videobredden. Standardinnstillingen er at VLC tilpasser seg "
 "til videoviseren."
 
-#: src/libvlc.h:153
+#: src/libvlc.h:154
 #, fuzzy
 msgid "Video height"
 msgstr "videohøyde"
 
-#: src/libvlc.h:155
+#: src/libvlc.h:156
 msgid ""
 "You can enforce the video height here. By default VLC will adapt to the "
 "video characteristics."
-msgstr "Her kan du sette videohøyden. Standardinnstillingen er at VLC tilpasser seg til videoviseren."
+msgstr ""
+"Her kan du sette videohøyden. Standardinnstillingen er at VLC tilpasser seg "
+"til videoviseren."
 
-#: src/libvlc.h:158
+#: src/libvlc.h:159
 #, fuzzy
 msgid "Zoom video"
 msgstr "xvideo"
 
-#: src/libvlc.h:160
+#: src/libvlc.h:161
 msgid "You can zoom the video by the specified factor."
 msgstr "Zoom videoen med den spesifiserte faktoren."
 
-#: src/libvlc.h:162
+#: src/libvlc.h:163
 #, fuzzy
 msgid "Grayscale video output"
 msgstr "videoeksport i gråtoner"
 
-#: src/libvlc.h:164
+#: src/libvlc.h:165
 msgid ""
 "When enabled, the color information from the video won't be decoded (this "
 "can also allow you to save some processing power)."
-msgstr "Fargeinformasjon fra videoen blir ikke dekodet når dette alternativet er valgt. (Du sparer litt prosessorkraft)."
+msgstr ""
+"Fargeinformasjon fra videoen blir ikke dekodet når dette alternativet er "
+"valgt. (Du sparer litt prosessorkraft)."
 
-#: src/libvlc.h:167
+#: src/libvlc.h:168
 #, fuzzy
 msgid "Fullscreen video output"
 msgstr "Fullskjermdybde:"
 
-#: src/libvlc.h:169
+#: src/libvlc.h:170
 msgid ""
 "If this option is enabled, VLC will always start a video in fullscreen mode."
-msgstr "VLC starter alltid video på hele skjermen når dette alternativet er påskrudd."
+msgstr ""
+"VLC starter alltid video på hele skjermen når dette alternativet er påskrudd."
 
-#: src/libvlc.h:172
+#: src/libvlc.h:173
 #, fuzzy
 msgid "Overlay video output"
 msgstr "Fullskjermdybde:"
 
-#: src/libvlc.h:174
+#: src/libvlc.h:175
 msgid ""
 "If enabled, VLC will try to take advantage of the overlay capabilities of "
 "your graphic card."
-msgstr "VLC vil prøve å bruke \"overlay\" egenskapene i grafikkortet ditt hvis dette alternativet er påskrudd."
+msgstr ""
+"VLC vil prøve å bruke \"overlay\" egenskapene i grafikkortet ditt hvis dette "
+"alternativet er påskrudd."
 
-#: src/libvlc.h:177
+#: src/libvlc.h:178
 #, fuzzy
 msgid "Force SPU position"
 msgstr "Fastsett SPU posisjon"
 
-#: src/libvlc.h:179
+#: src/libvlc.h:180
 msgid ""
 "You can use this option to place the subtitles under the movie, instead of "
 "over the movie. Try several positions."
-msgstr "Du kan plassere undertekstene under filmen med dette alternativet, i stedet for over filmen. Du kan også prøve andre posisjoner."
+msgstr ""
+"Du kan plassere undertekstene under filmen med dette alternativet, i stedet "
+"for over filmen. Du kan også prøve andre posisjoner."
 
-#: src/libvlc.h:182
+#: src/libvlc.h:183
 #, fuzzy
 msgid "Video filter module"
 msgstr "Standard grensesnitt: "
 
-#: src/libvlc.h:184
+#: src/libvlc.h:185
 msgid ""
 "This will allow you to add a post-processing filter to enhance the picture "
 "quality, for instance deinterlacing, or to clone or distort the video window."
-msgstr "Du kan legge til filtre for etterbehandling for å forbedre bildekvaliteten, for eksempel for å fjerne striper, eller for å klone eller forvrenge videovinduet. "
+msgstr ""
+"Du kan legge til filtre for etterbehandling for å forbedre bildekvaliteten, "
+"for eksempel for å fjerne striper, eller for å klone eller forvrenge "
+"videovinduet. "
 
-#: src/libvlc.h:188
+#: src/libvlc.h:189
 #, fuzzy
 msgid "Source aspect ratio"
 msgstr "kildens bildeformat"
 
-#: src/libvlc.h:190
+#: src/libvlc.h:191
 msgid ""
 "This will force the source aspect ratio. For instance, some DVDs claim to be "
 "16:9 while they are actually 4:3. This can also be used as a hint for VLC "
 "when a movie does not have aspect ratio information. Accepted formats are x:"
 "y (4:3, 16:9, etc.) expressing the global image aspect, or a float value "
 "(1.25, 1.3333, etc.) expressing pixel squareness."
-msgstr "Her fastsettes kildens bildeformat. Noen DVDer vil for eksempel påstå at de har 16:9 som format mens de egentlig har 4:3. VLC kan også bruke innstillingen som et hint for filmer som mangler informasjon om bildeformat. Formater aksepteres på formen x:y (4:3, 16:9, etc.) som uttrykk for det globale bildeformatet, eller som et desimaltall (1.25, 1.3333, etc.) som uttrykk for firkantetheten til pixlene."
+msgstr ""
+"Her fastsettes kildens bildeformat. Noen DVDer vil for eksempel påstå at de "
+"har 16:9 som format mens de egentlig har 4:3. VLC kan også bruke "
+"innstillingen som et hint for filmer som mangler informasjon om bildeformat. "
+"Formater aksepteres på formen x:y (4:3, 16:9, etc.) som uttrykk for det "
+"globale bildeformatet, eller som et desimaltall (1.25, 1.3333, etc.) som "
+"uttrykk for firkantetheten til pixlene."
 
-#: src/libvlc.h:198
+#: src/libvlc.h:199
 #, fuzzy
 msgid "Destination aspect ratio"
 msgstr "målets bildeformat"
 
-#: src/libvlc.h:200
+#: src/libvlc.h:201
 msgid ""
 "This will force the destination pixel size. By default VLC assumes your "
 "pixels are square, unless your hardware has a way to tell it otherwise. This "
 "may be used when you output VLC's signal to another device such as a TV set. "
 "Accepted format is a float value (1, 1.25, 1.3333, etc.) expressing pixel "
 "squareness."
-msgstr "Her fastsettes målets pixelstørrelse. Standarden i VLC er å anta at pixlene danner et kvadrat, med mindre maskinvaren din kan fortelle VLC noe annet. Du kan bruke dette hvis du sender VLCs signal til et annet apparat, slik som en TV. Formatet må uttrykkes som et desimaltall (1, 1.25, 1.3333, etc.) som uttrykk for firkantetheten til pixlene."
+msgstr ""
+"Her fastsettes målets pixelstørrelse. Standarden i VLC er å anta at pixlene "
+"danner et kvadrat, med mindre maskinvaren din kan fortelle VLC noe annet. Du "
+"kan bruke dette hvis du sender VLCs signal til et annet apparat, slik som en "
+"TV. Formatet må uttrykkes som et desimaltall (1, 1.25, 1.3333, etc.) som "
+"uttrykk for firkantetheten til pixlene."
 
-#: src/libvlc.h:207
+#: src/libvlc.h:208
 #, fuzzy
 msgid "Server port"
 msgstr "Ingen tjener !"
 
-#: src/libvlc.h:209
+#: src/libvlc.h:210
 msgid "This is the port used for UDP streams. By default, we chose 1234."
 msgstr "Her er porten som brukes til UDP-strømmer. Som standard brukes 1234."
 
-#: src/libvlc.h:211
+#: src/libvlc.h:212
 #, fuzzy
 msgid "MTU of the network interface"
 msgstr "Grensesnitt"
 
-#: src/libvlc.h:213
+#: src/libvlc.h:214
 msgid ""
 "This is the typical size of UDP packets that we expect. On Ethernet it is "
 "usually 1500."
-msgstr "Her er pakkestørrelsen for UDP slik vi antar den vil være. I Ethernet er dette vanligvis 1500."
+msgstr ""
+"Her er pakkestørrelsen for UDP slik vi antar den vil være. I Ethernet er "
+"dette vanligvis 1500."
 
-#: src/libvlc.h:216
+#: src/libvlc.h:217
 #, fuzzy
 msgid "Network interface address"
 msgstr "_Gjem grensesnitt"
 
-#: src/libvlc.h:218
+#: src/libvlc.h:219
 msgid ""
 "If you have several interfaces on your machine and use the multicast "
 "solution, you will probably have to indicate the IP address of your "
 "multicasting interface here."
-msgstr "Hvis du har flere nettverksgrensesnitt i maskinen din og bruker multicast-løsningen, må du antakelig skrive IP-adressen til multicast-grensesnittet her."
+msgstr ""
+"Hvis du har flere nettverksgrensesnitt i maskinen din og bruker multicast-"
+"løsningen, må du antakelig skrive IP-adressen til multicast-grensesnittet "
+"her."
 
-#: src/libvlc.h:222
+#: src/libvlc.h:223
 #, fuzzy
 msgid "Time to live"
 msgstr "levetid"
 
-#: src/libvlc.h:224
+#: src/libvlc.h:225
 msgid ""
 "Indicate here the Time To Live of the multicast packets sent by the stream "
 "output."
 msgstr "Her angir du levetiden til multicast-pakkene fra videokilden. "
 
-#: src/libvlc.h:227
+#: src/libvlc.h:228
 #, fuzzy
 msgid "Choose program (SID)"
 msgstr "Avslutt programmet"
 
-#: src/libvlc.h:229
+#: src/libvlc.h:230
 msgid "Choose the program to select by giving its Service ID."
-msgstr "Angi hvilket program som skal velges ved å angi programmets Service ID."
+msgstr ""
+"Angi hvilket program som skal velges ved å angi programmets Service ID."
 
-#: src/libvlc.h:231
+#: src/libvlc.h:232
 #, fuzzy
 msgid "Choose audio"
 msgstr "velg lyd"
 
-#: src/libvlc.h:233
+#: src/libvlc.h:234
 msgid "Give the default type of audio you want to use in a DVD."
 msgstr "Her angir du hva slags lyd du ønsker å bruke med en DVD."
 
-#: src/libvlc.h:235
+#: src/libvlc.h:236
 #, fuzzy
 msgid "Choose channel"
 msgstr "Velg Kapittel"
 
-#: src/libvlc.h:237
+#: src/libvlc.h:238
 msgid ""
 "Give the stream number of the audio channel you want to use in a DVD (from 1 "
 "to n)."
-msgstr "Skriv inn nummeret på lydkanalen du ønsker å bruke for lydstrømmen fra en DVD (fra 1 til n)."
+msgstr ""
+"Skriv inn nummeret på lydkanalen du ønsker å bruke for lydstrømmen fra en "
+"DVD (fra 1 til n)."
 
-#: src/libvlc.h:240
+#: src/libvlc.h:241
 #, fuzzy
 msgid "Choose subtitles"
 msgstr "Velg tittel"
 
-#: src/libvlc.h:242
+#: src/libvlc.h:243
 msgid ""
 "Give the stream number of the subtitle channel you want to use in a DVD "
 "(from 1 to n)."
-msgstr "Skriv inn nummeret på undertekstkanalen du ønsker å bruke for tekststrømmen fra en DVD (fra 1 to n)."
+msgstr ""
+"Skriv inn nummeret på undertekstkanalen du ønsker å bruke for tekststrømmen "
+"fra en DVD (fra 1 to n)."
 
-#: src/libvlc.h:245
+#: src/libvlc.h:246
 msgid "DVD device"
 msgstr "DVD-enhet"
 
-#: src/libvlc.h:248
+#: src/libvlc.h:249
 msgid ""
 "This is the default DVD drive (or file) to use. Don't forget the colon after "
 "the drive letter (eg D:)"
@@ -616,323 +746,368 @@ msgstr ""
 "Her fastsetter du standard enheten for DVD (stasjon eller fil) som skal "
 "brukes. Ikke glem kolon etter stasjonsbokstaven (for eksempel D:)"
 
-#: src/libvlc.h:252
+#: src/libvlc.h:253
 msgid "This is the default DVD device to use."
 msgstr "Dette er standard DVD-enhet som brukes."
 
-#: src/libvlc.h:255
+#: src/libvlc.h:256
 msgid "VCD device"
 msgstr "VCD-enhet"
 
-#: src/libvlc.h:257
+#: src/libvlc.h:258
 msgid "This is the default VCD device to use."
 msgstr "Dette er standard VCD-enhet som brukes."
 
-#: src/libvlc.h:259
+#: src/libvlc.h:260
 #, fuzzy
 msgid "Force IPv6"
 msgstr "fastsett IPv6"
 
-#: src/libvlc.h:261
+#: src/libvlc.h:262
 msgid ""
 "If you check this box, IPv6 will be used by default for all UDP and HTTP "
 "connections."
-msgstr "Ved å sette hake i denne ruten brukes IPv6 som standard for alle forbindelser over UDP og HTTP."
+msgstr ""
+"Ved å sette hake i denne ruten brukes IPv6 som standard for alle "
+"forbindelser over UDP og HTTP."
 
-#: src/libvlc.h:264
+#: src/libvlc.h:265
 #, fuzzy
 msgid "Force IPv4"
 msgstr "fastsett IPv4"
 
-#: src/libvlc.h:266
+#: src/libvlc.h:267
 msgid ""
 "If you check this box, IPv4 will be used by default for all UDP and HTTP "
 "connections."
-msgstr "Ved å sette hake i denne ruten brukes IPv4 som standard for alle forbindelser over UDP og HTTP."
+msgstr ""
+"Ved å sette hake i denne ruten brukes IPv4 som standard for alle "
+"forbindelser over UDP og HTTP."
 
-#: src/libvlc.h:269
+#: src/libvlc.h:270
 #, fuzzy
 msgid "Choose preferred codec list"
 msgstr "velg foretrukket rekkefølge på kodek"
 
-#: src/libvlc.h:271
+#: src/libvlc.h:272
 msgid ""
 "This allows you to select the order in which VLC will choose its codecs. For "
 "instance, 'a52old,a52,any' will try the old a52 codec before the new one. "
 "Please be aware that VLC does not make any difference between audio or video "
 "codecs, so you should always specify 'any' at the end of the list to make "
 "sure there is a fallback for the types you didn't specify."
-msgstr "Du kan velge rekkefølgen VLC skal bruke når kodek skal velges med dette alternativet. 'a52old,a52,any' vil for eksempel prøve den gamle a52-kodeken før den nye. Legg merke til at VLC ikke skiller lyd eller video kodeker, så du bør alltid legge til 'any' på slutten av listen for å være sikker på at å ha en nødløsning for typer som du ikke har spesifisert."
+msgstr ""
+"Du kan velge rekkefølgen VLC skal bruke når kodek skal velges med dette "
+"alternativet. 'a52old,a52,any' vil for eksempel prøve den gamle a52-kodeken "
+"før den nye. Legg merke til at VLC ikke skiller lyd eller video kodeker, så "
+"du bør alltid legge til 'any' på slutten av listen for å være sikker på at å "
+"ha en nødløsning for typer som du ikke har spesifisert."
 
-#: src/libvlc.h:278
+#: src/libvlc.h:279
 #, fuzzy
 msgid "Choose preferred video encoder list"
 msgstr "velg foretrukket video innkoding "
 
-#: src/libvlc.h:280 src/libvlc.h:284
+#: src/libvlc.h:281 src/libvlc.h:285
 msgid ""
 "This allows you to select the order in which VLC will choose its codecs. "
 msgstr "Her velger du rekkefølgen VLC skal velge kodek etter."
 
-#: src/libvlc.h:282
+#: src/libvlc.h:283
 #, fuzzy
 msgid "Choose preferred audio encoder list"
 msgstr "velg foretrukket rekkefølge for lydinnkoding"
 
-#: src/libvlc.h:287
+#: src/libvlc.h:288
 #, fuzzy
 msgid "Choose a stream output"
 msgstr "velg en utstrøm"
 
-#: src/libvlc.h:289
+#: src/libvlc.h:290
 msgid "Empty if no stream output."
 msgstr "Tøm hvis det ikke kommer noen strøm."
 
-#: src/libvlc.h:291
+#: src/libvlc.h:292
 msgid "Display while streaming"
 msgstr ""
 
-#: src/libvlc.h:293
+#: src/libvlc.h:294
 #, fuzzy
 msgid "This allows you to play the stream while streaming it."
 msgstr "Du kan fastsette videoinnkoding her"
 
-#: src/libvlc.h:295
+#: src/libvlc.h:296
 #, fuzzy
 msgid "Enable video stream output"
 msgstr "Fullskjermdybde:"
 
-#: src/libvlc.h:297 src/libvlc.h:310
+#: src/libvlc.h:298 src/libvlc.h:311
 msgid ""
 "This allows you to choose if the video stream should be redirected to the "
 "stream output facility when this last one is enabled."
-msgstr "Du kan velge om videostrømmen skal omdirigeres til strømmens ut-enhet når denne er påskrudd."
+msgstr ""
+"Du kan velge om videostrømmen skal omdirigeres til strømmens ut-enhet når "
+"denne er påskrudd."
 
-#: src/libvlc.h:300
+#: src/libvlc.h:301
 #, fuzzy
 msgid "Video encoding codec"
 msgstr "video innkoding kodek"
 
-#: src/libvlc.h:302
+#: src/libvlc.h:303
 msgid "This allows you to force video encoding"
 msgstr "Du kan fastsette videoinnkoding her"
 
-#: src/libvlc.h:304
+#: src/libvlc.h:305
 msgid "Video bitrate encoding (kB/s)"
 msgstr ""
 
-#: src/libvlc.h:306
+#: src/libvlc.h:307
 #, fuzzy
 msgid "This allows you to specify video bitrate in kB/s."
 msgstr "Du kan fastsette videoinnkoding her"
 
-#: src/libvlc.h:308
+#: src/libvlc.h:309
 #, fuzzy
 msgid "Enable audio stream output"
 msgstr "Standard grensesnitt: "
 
-#: src/libvlc.h:313
+#: src/libvlc.h:314
 #, fuzzy
 msgid "Audio encoding codec"
 msgstr "Standard grensesnitt: "
 
-#: src/libvlc.h:315
+#: src/libvlc.h:316
 msgid "This allows you to force audio encoding"
 msgstr "Du kan fastsette lydinnkoding her"
 
-#: src/libvlc.h:317
+#: src/libvlc.h:318
 msgid "Audio bitrate encoding (kB/s)"
 msgstr ""
 
-#: src/libvlc.h:319
+#: src/libvlc.h:320
 #, fuzzy
 msgid "This allows you to specify audio bitrate in kB/s."
 msgstr "Du kan fastsette lydinnkoding her"
 
-#: src/libvlc.h:321
+#: src/libvlc.h:322
 #, fuzzy
 msgid "Choose preferred packetizer list"
 msgstr "velg foretrukket rekkefølge for pakking"
 
-#: src/libvlc.h:323
+#: src/libvlc.h:324
 msgid ""
 "This allows you to select the order in which VLC will choose its packetizers."
-msgstr "Her kan du velge rekkefølgen som VLC bruker når den skal velge pakkemetode."
+msgstr ""
+"Her kan du velge rekkefølgen som VLC bruker når den skal velge pakkemetode."
 
-#: src/libvlc.h:326
+#: src/libvlc.h:327
 #, fuzzy
 msgid "Mux module"
 msgstr "Standard grensesnitt: "
 
-#: src/libvlc.h:328
+#: src/libvlc.h:329
 msgid "This is a legacy entry to let you configure mux modules"
-msgstr "Dette er en gammel innføring som lar deg sette innstillinger for mux moduler."
+msgstr ""
+"Dette er en gammel innføring som lar deg sette innstillinger for mux moduler."
 
-#: src/libvlc.h:330
+#: src/libvlc.h:331
 #, fuzzy
 msgid "Access output module"
 msgstr "Standard grensesnitt: "
 
-#: src/libvlc.h:332
+#: src/libvlc.h:333
 msgid "This is a legacy entry to let you configure access output modules"
-msgstr "Dette er en gammel innføring som lar deg sette innstillinger i moduler for tilgangseksport"
+msgstr ""
+"Dette er en gammel innføring som lar deg sette innstillinger i moduler for "
+"tilgangseksport"
 
-#: src/libvlc.h:335
+#: src/libvlc.h:336
 #, fuzzy
 msgid "Enable CPU MMX support"
 msgstr "skru på støtte for MMX i prosessoren"
 
-#: src/libvlc.h:337
+#: src/libvlc.h:338
 msgid ""
 "If your processor supports the MMX instructions set, VLC can take advantage "
 "of them."
-msgstr "VLC kan dra nytte av MMX instruksjonssettet hvis prosessoren din støtter dette."
+msgstr ""
+"VLC kan dra nytte av MMX instruksjonssettet hvis prosessoren din støtter "
+"dette."
 
-#: src/libvlc.h:340
+#: src/libvlc.h:341
 #, fuzzy
 msgid "Enable CPU 3D Now! support"
 msgstr "skru på støtte for 3D Now! i prosessoren"
 
-#: src/libvlc.h:342
+#: src/libvlc.h:343
 msgid ""
 "If your processor supports the 3D Now! instructions set, VLC can take "
 "advantage of them."
-msgstr "VLC kan dra nytte av 3D Now! instruksjonssettet hvis prosessoren din støtter dette."
+msgstr ""
+"VLC kan dra nytte av 3D Now! instruksjonssettet hvis prosessoren din støtter "
+"dette."
 
-#: src/libvlc.h:345
+#: src/libvlc.h:346
 #, fuzzy
 msgid "Enable CPU MMX EXT support"
 msgstr "skru på støtte for MMX EXT i prosessoren "
 
-#: src/libvlc.h:347
+#: src/libvlc.h:348
 msgid ""
 "If your processor supports the MMX EXT instructions set, VLC can take "
 "advantage of them."
-msgstr "VLC kan dra nytte av MMX EXT instruksjonssettet hvis prosessoren din støtter dette dette."
+msgstr ""
+"VLC kan dra nytte av MMX EXT instruksjonssettet hvis prosessoren din støtter "
+"dette dette."
 
-#: src/libvlc.h:350
+#: src/libvlc.h:351
 #, fuzzy
 msgid "Enable CPU SSE support"
 msgstr "skru på støtte for SSE i prosessoren"
 
-#: src/libvlc.h:352
+#: src/libvlc.h:353
 msgid ""
 "If your processor supports the SSE instructions set, VLC can take advantage "
 "of them."
-msgstr "VLC kan dra nytte av SSE instruksjonssettet hvis prosessoren din støtter dette dette."
+msgstr ""
+"VLC kan dra nytte av SSE instruksjonssettet hvis prosessoren din støtter "
+"dette dette."
 
-#: src/libvlc.h:355
+#: src/libvlc.h:356
 #, fuzzy
 msgid "Enable CPU AltiVec support"
 msgstr "skru på støtte for AltiVec i prosessoren"
 
-#: src/libvlc.h:357
+#: src/libvlc.h:358
 msgid ""
 "If your processor supports the AltiVec instructions set, VLC can take "
 "advantage of them."
-msgstr "VLC kan dra nytte av AltiVec instruksjonssettet hvis prosessoren din støtter dette dette."
+msgstr ""
+"VLC kan dra nytte av AltiVec instruksjonssettet hvis prosessoren din støtter "
+"dette dette."
 
-#: src/libvlc.h:360
+#: src/libvlc.h:361
 #, fuzzy
 msgid "Play files randomly forever"
 msgstr "uendelig avspilling av filer i tilfeldig rekkefølge"
 
-#: src/libvlc.h:362
+#: src/libvlc.h:363
 msgid ""
 "When selected, VLC will randomly play files in the playlist until "
 "interrupted."
-msgstr "Når dette alternativet er valgt, vil VLC spille filene i spillelisten i tilfeldig rekkefølge inntil den blir avbrutt."
+msgstr ""
+"Når dette alternativet er valgt, vil VLC spille filene i spillelisten i "
+"tilfeldig rekkefølge inntil den blir avbrutt."
 
-#: src/libvlc.h:365
+#: src/libvlc.h:366
 #, fuzzy
 msgid "Launch playlist on startup"
 msgstr "Kjør ved oppstart"
 
-#: src/libvlc.h:367
+#: src/libvlc.h:368
 msgid "If you want VLC to start playing on startup, then enable this option."
-msgstr "VLC kan begynne å spille ved oppstart hvis du skrur på dette alternativet."
+msgstr ""
+"VLC kan begynne å spille ved oppstart hvis du skrur på dette alternativet."
 
-#: src/libvlc.h:369
+#: src/libvlc.h:370
 #, fuzzy
 msgid "Enqueue items in playlist"
 msgstr "Legg til i kø som standard"
 
-#: src/libvlc.h:371
+#: src/libvlc.h:372
 msgid ""
 "If you want VLC to add items to the playlist as you open them, then enable "
 "this option."
-msgstr "VLC kan legge til ønsker på spillelisten ettervært som du åpner dem hvis du skrur på dette alternativet."
+msgstr ""
+"VLC kan legge til ønsker på spillelisten ettervært som du åpner dem hvis du "
+"skrur på dette alternativet."
 
-#: src/libvlc.h:374
+#: src/libvlc.h:375
 #, fuzzy
 msgid "Loop playlist on end"
 msgstr "Gå tilbake til start ved slutten av Spillelisten"
 
-#: src/libvlc.h:376
+#: src/libvlc.h:377
 msgid ""
 "If you want VLC to keep playing the playlist indefinitely then enable this "
 "option."
-msgstr "VLC kan avspille spillelisten i det uendelige ved å skru på dette alternativet."
+msgstr ""
+"VLC kan avspille spillelisten i det uendelige ved å skru på dette "
+"alternativet."
 
-#: src/libvlc.h:379
+#: src/libvlc.h:380
 #, fuzzy
 msgid "Memory copy module"
 msgstr "modul for minnekopiering"
 
-#: src/libvlc.h:381
+#: src/libvlc.h:382
 msgid ""
 "You can select which memory copy module you want to use. By default VLC will "
 "select the fastest one supported by your hardware."
-msgstr "Du kan velge hvilken modul for minnekopiering du ønsker å bruke. Standardvalget til VLC er å velge den raskeste som støttes av din maskinvare."
+msgstr ""
+"Du kan velge hvilken modul for minnekopiering du ønsker å bruke. "
+"Standardvalget til VLC er å velge den raskeste som støttes av din maskinvare."
 
-#: src/libvlc.h:384
+#: src/libvlc.h:385
 #, fuzzy
 msgid "Access module"
 msgstr "Standard grensesnitt: "
 
-#: src/libvlc.h:386
+#: src/libvlc.h:387
 msgid "This is a legacy entry to let you configure access modules"
-msgstr "Dette er en gammel innføring så du kan sette innstillinger for tilgangsmoduler"
+msgstr ""
+"Dette er en gammel innføring så du kan sette innstillinger for "
+"tilgangsmoduler"
 
-#: src/libvlc.h:388
+#: src/libvlc.h:389
 #, fuzzy
 msgid "Demux module"
 msgstr "Standard grensesnitt: "
 
-#: src/libvlc.h:390
+#: src/libvlc.h:391
 msgid "This is a legacy entry to let you configure demux modules"
-msgstr "Dette er en gammel innføring så du kan sette innstillinger for demux-moduler"
+msgstr ""
+"Dette er en gammel innføring så du kan sette innstillinger for demux-moduler"
 
-#: src/libvlc.h:392
+#: src/libvlc.h:393
 #, fuzzy
 msgid "Dast mutex on NT/2K/XP (developers only)"
 msgstr "rask mutex på NT/2K/XP (kun for utviklere)"
 
-#: src/libvlc.h:394
+#: src/libvlc.h:395
 msgid ""
 "On Windows NT/2K/XP we use a slow mutex implementation but which allows us "
 "to correctely implement condition variables. You can also use the faster "
 "Win9x implementation but you might experience problems with it."
-msgstr "Vi bruker en treg framgangsmåte for mutex på Windows NT/2K/XP, men den gir oss muligheten for en korrekt framgangsmåte for tilstandsvariabler. Win9x-framgangsmåten er raskere, men du kan oppleve problemer hvis du bruker den."
+msgstr ""
+"Vi bruker en treg framgangsmåte for mutex på Windows NT/2K/XP, men den gir "
+"oss muligheten for en korrekt framgangsmåte for tilstandsvariabler. Win9x-"
+"framgangsmåten er raskere, men du kan oppleve problemer hvis du bruker den."
 
-#: src/libvlc.h:399
+#: src/libvlc.h:400
 msgid "Condition variables implementation for Win9x (developers only)"
 msgstr "Framgangsmåte for tilstandvariabler under Win9x (kun for utviklere)"
 
-#: src/libvlc.h:402
+#: src/libvlc.h:403
 msgid ""
 "On Windows 9x/Me we use a fast but not correct condition variables "
 "implementation (more precisely there is a possibility for a race condition "
 "to happen). However it is possible to use slower alternatives which should "
 "be more robust. Currently you can choose between implementation 0 (which is "
 "the default and the fastest), 1 and 2."
-msgstr "Under Windows 9x/Me bruker vi en rask, men ikke korrekt framgangsmåte for tilstandsvariabler (som åpner for usikkerhet om hvilken kodebit som får oppdatere en fellesvariabel først). Det er mulig å velge tregere alternativer som skal være mer robuste. I øyeblikket kan du velge mellom framgangsmåte 0 (som er standard og raskest), 1 og 2"
+msgstr ""
+"Under Windows 9x/Me bruker vi en rask, men ikke korrekt framgangsmåte for "
+"tilstandsvariabler (som åpner for usikkerhet om hvilken kodebit som får "
+"oppdatere en fellesvariabel først). Det er mulig å velge tregere "
+"alternativer som skal være mer robuste. I øyeblikket kan du velge mellom "
+"framgangsmåte 0 (som er standard og raskest), 1 og 2"
 
-#: src/libvlc.h:410
+#: src/libvlc.h:411
 msgid "Real-time priority"
 msgstr "Sanntidsprioritet"
 
-#: src/libvlc.h:412
+#: src/libvlc.h:413
 msgid ""
 "\n"
 "Playlist items:\n"
@@ -947,62 +1122,65 @@ msgid ""
 "  vlc:quit                       quit VLC\n"
 msgstr ""
 
-#: src/libvlc.h:442 modules/misc/dummy/dummy.c:60
+#: src/libvlc.h:443 modules/misc/dummy/dummy.c:60
 msgid "Interface"
 msgstr "Grensesnitt"
 
-#: src/libvlc.h:457 modules/audio_output/coreaudio.c:224
+#: src/libvlc.h:458 modules/audio_output/coreaudio.c:224
 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228
 #: modules/demux/ogg.c:554 modules/demux/ogg.c:813 modules/demux/ogg.c:986
+#: modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
-#: modules/gui/macosx/intf.m:338
+#: modules/gui/macosx/intf.m:354 modules/gui/macosx/output.m:150
 msgid "Audio"
 msgstr "Lyd"
 
-#: src/libvlc.h:473 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203
+#: src/libvlc.h:474 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:893 modules/gui/gtk/gnome_interface.c:1099
-#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:349
+#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:365
+#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:140
 #: modules/misc/dummy/dummy.c:83 modules/video_output/directx/directx.c:108
 msgid "Video"
 msgstr "Video"
 
-#: src/libvlc.h:493 modules/access/satellite/satellite.c:66
+#: src/libvlc.h:494 modules/access/satellite/satellite.c:66
 msgid "Input"
 msgstr ""
 
-#: src/libvlc.h:516
+#: src/libvlc.h:517
 msgid "Decoders"
 msgstr "Dekodere"
 
-#: src/libvlc.h:519
+#: src/libvlc.h:520
 msgid "Encoders"
 msgstr ""
 
 # , fuzzy
-#: src/libvlc.h:524 modules/gui/gtk/gnome_interface.c:2042
+#: src/libvlc.h:525 modules/gui/gtk/gnome_interface.c:2042
 #: modules/gui/gtk/gtk_interface.c:2361 modules/gui/gtk/gtk_interface.c:3034
-#: modules/gui/win32/strings.cpp:221 modules/gui/wxwindows/open.cpp:184
-#: modules/gui/wxwindows/streamout.cpp:135
+#: modules/gui/win32/strings.cpp:221 modules/gui/wxwindows/open.cpp:213
+#: modules/gui/wxwindows/streamout.cpp:151
 #, fuzzy
 msgid "Stream output"
 msgstr "Standard output:"
 
-#: src/libvlc.h:543
+#: src/libvlc.h:544
 msgid "CPU"
 msgstr ""
 
-#: src/libvlc.h:555 modules/gui/familiar/interface.c:610
-#: modules/gui/gtk/gnome_interface.c:643
+#: src/libvlc.h:556 modules/gui/beos/InterfaceWindow.cpp:206
+#: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
-#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:281
-#: modules/gui/macosx/intf.m:369 modules/gui/win32/strings.cpp:120
-#: modules/gui/win32/strings.cpp:180 modules/gui/wxwindows/interface.cpp:328
+#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:297
+#: modules/gui/macosx/intf.m:385 modules/gui/win32/strings.cpp:120
+#: modules/gui/win32/strings.cpp:180 modules/gui/wxwindows/interface.cpp:337
+#: modules/gui/wxwindows/playlist.cpp:102
 msgid "Playlist"
 msgstr "Spilleliste"
 
-#: src/libvlc.h:562 modules/audio_filter/converter/a52tofloat32.c:85
+#: src/libvlc.h:563 modules/audio_filter/converter/a52tofloat32.c:85
 #: modules/audio_filter/converter/mpgatofixed32.c:60
 #: modules/codec/a52old/a52old.c:59 modules/codec/mpeg_video/parser.c:84
 #: modules/demux/mpeg/ts.c:118 modules/gui/familiar/familiar.c:70
@@ -1013,31 +1191,31 @@ msgstr "Spilleliste"
 msgid "Miscellaneous"
 msgstr "Forskjellig"
 
-#: src/libvlc.h:575
+#: src/libvlc.h:576
 msgid "main program"
 msgstr "hovedprogrammet"
 
-#: src/libvlc.h:581
+#: src/libvlc.h:582
 msgid "print help"
 msgstr "skriv ut hjelp"
 
-#: src/libvlc.h:583
+#: src/libvlc.h:584
 msgid "print detailed help"
 msgstr "skriv ut detaljert hjelp"
 
-#: src/libvlc.h:586
+#: src/libvlc.h:587
 msgid "print a list of available modules"
 msgstr "skriv ut liste av tilgjengelige moduler"
 
-#: src/libvlc.h:588
+#: src/libvlc.h:589
 msgid "print help on module"
 msgstr "skriv ut hjelp for et modul"
 
-#: src/libvlc.h:591
+#: src/libvlc.h:592
 msgid "print version information"
 msgstr "skriv ut versjonsinformasjon"
 
-#: src/misc/configuration.c:904
+#: src/misc/configuration.c:946
 msgid "boolean"
 msgstr "boolsk"
 
@@ -1082,10 +1260,6 @@ msgstr ""
 msgid "DVD input (uses libdvdcss)"
 msgstr ""
 
-#: modules/access/dvdread/dvdread.c:45
-msgid "DVD input (using libdvdread)"
-msgstr ""
-
 #: modules/access/dvdplay/dvd.c:51
 msgid "[dvdplay:][device][@[title][,[chapter][,angle]]]"
 msgstr ""
@@ -1094,46 +1268,16 @@ msgstr ""
 msgid "DVD input with menus support"
 msgstr ""
 
-#: modules/access/mms/mms.c:57 modules/access/v4l/v4l.c:69
-#: modules/access/file.c:69 modules/access/ftp.c:86 modules/access/http.c:80
-#: modules/access/udp.c:72
-msgid "caching value in ms"
-msgstr ""
-
-#: modules/access/mms/mms.c:59
-msgid ""
-"Allows you to modify the default caching value for mms streams. This value "
-"should be set in miliseconds units."
-msgstr ""
-
-#: modules/access/mms/mms.c:63
-msgid "Microsoft Media Server (MMS) input"
-msgstr ""
-
-#: modules/access/vcd/vcd.c:79
-msgid "VCD input"
-msgstr ""
-
-#: modules/access/v4l/v4l.c:71
-msgid ""
-"Allows you to modify the default caching value for v4l streams. This value "
-"should be set in miliseconds units."
+#: modules/access/dvdread/dvdread.c:45
+msgid "DVD input (using libdvdread)"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:75
-#, fuzzy
-msgid "Video4Linux input"
-msgstr "Standard grensesnitt: "
-
-#: modules/access/v4l/v4l.c:76
-msgid "v4l"
+#: modules/access/file.c:69 modules/access/ftp.c:86 modules/access/http.c:80
+#: modules/access/mms/mms.c:57 modules/access/udp.c:72
+#: modules/access/v4l/v4l.c:64
+msgid "caching value in ms"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:84
-#, fuzzy
-msgid "Video4Linux demuxer"
-msgstr "Standard grensesnitt: "
-
 #: modules/access/file.c:71
 msgid ""
 "Allows you to modify the default caching value for file streams. This value "
@@ -1183,18 +1327,14 @@ msgstr ""
 msgid "HTTP input"
 msgstr ""
 
-#: modules/access/udp.c:74
+#: modules/access/mms/mms.c:59
 msgid ""
-"Allows you to modify the default caching value for udp streams. This value "
+"Allows you to modify the default caching value for mms streams. This value "
 "should be set in miliseconds units."
 msgstr ""
 
-#: modules/access/udp.c:78
-msgid "UDP/RTP input"
-msgstr ""
-
-#: modules/access/udp.c:79
-msgid "udp"
+#: modules/access/mms/mms.c:63
+msgid "Microsoft Media Server (MMS) input"
 msgstr ""
 
 #: modules/access/satellite/satellite.c:41
@@ -1242,16 +1382,63 @@ msgstr ""
 msgid "slp"
 msgstr ""
 
-#: modules/access_output/file.c:58
+#: modules/access/udp.c:74
+msgid ""
+"Allows you to modify the default caching value for udp streams. This value "
+"should be set in miliseconds units."
+msgstr ""
+
+#: modules/access/udp.c:78
+msgid "UDP/RTP input"
+msgstr ""
+
+#: modules/access/udp.c:79
+msgid "udp"
+msgstr ""
+
+#: modules/access/v4l/v4l.c:66
+msgid ""
+"Allows you to modify the default caching value for v4l streams. This value "
+"should be set in miliseconds units."
+msgstr ""
+
+#: modules/access/v4l/v4l.c:70
 #, fuzzy
-msgid "File stream ouput"
-msgstr "Standard output:"
+msgid "Video4Linux input"
+msgstr "Standard grensesnitt: "
+
+#: modules/access/v4l/v4l.c:71
+msgid "v4l"
+msgstr ""
+
+#: modules/access/v4l/v4l.c:79
+#, fuzzy
+msgid "Video4Linux demuxer"
+msgstr "Standard grensesnitt: "
+
+#: modules/access/vcd/vcd.c:79
+msgid "VCD input"
+msgstr ""
+
+#: modules/access/vlcs.c:131 modules/misc/sap.c:131
+msgid "SAP"
+msgstr ""
+
+#: modules/access/vlcs.c:134
+#, fuzzy
+msgid "SAP interface module"
+msgstr "Standard grensesnitt: "
 
 #: modules/access_output/dummy.c:56
 #, fuzzy
 msgid "Dummy stream ouput"
 msgstr "Standard output:"
 
+#: modules/access_output/file.c:58
+#, fuzzy
+msgid "File stream ouput"
+msgstr "Standard output:"
+
 #: modules/access_output/http.c:54
 #, fuzzy
 msgid "HTTP stream ouput"
@@ -1270,7 +1457,9 @@ msgstr "karakteristiske forhold"
 msgid ""
 "Headphone virtual spatialization effect parameter: distance between front "
 "left speaker and listener in meters."
-msgstr "Parametre for romklangeffekt i høretelefoner: avstanden mellom fremre venstre høytaler og lytter i meter."
+msgstr ""
+"Parametre for romklangeffekt i høretelefoner: avstanden mellom fremre "
+"venstre høytaler og lytter i meter."
 
 #: modules/audio_filter/channel_mixer/headphone.c:54
 msgid "headphone"
@@ -1332,10 +1521,6 @@ msgstr ""
 msgid "audio filter for float32->u8 conversion"
 msgstr ""
 
-#: modules/audio_filter/converter/s16tofloat32.c:46
-msgid "audio filter for s16->float32 conversion"
-msgstr ""
-
 #: modules/audio_filter/converter/mpgatofixed32.c:61
 msgid "MPEG audio decoder"
 msgstr "MPEG-lyd dekoder"
@@ -1344,6 +1529,10 @@ msgstr "MPEG-lyd dekoder"
 msgid "audio filter for s16->fixed32 conversion"
 msgstr ""
 
+#: modules/audio_filter/converter/s16tofloat32.c:46
+msgid "audio filter for s16->float32 conversion"
+msgstr ""
+
 #: modules/audio_filter/converter/s16tofloat32swab.c:58
 msgid "audio filter for s16->float32 with endianness conversion"
 msgstr ""
@@ -1364,7 +1553,7 @@ msgstr ""
 msgid "audio filter for bandlimited interpolation resampling"
 msgstr ""
 
-#: modules/audio_filter/resampler/coreaudio.c:64
+#: modules/audio_filter/resampler/coreaudio.c:65
 msgid "audio filter using CoreAudio for resampling"
 msgstr ""
 
@@ -1406,7 +1595,7 @@ msgstr "Navn p
 msgid "ALSA audio output"
 msgstr "Lydeksport volum"
 
-#: modules/audio_output/alsa.c:110 modules/audio_output/coreaudio.c:1463
+#: modules/audio_output/alsa.c:110 modules/audio_output/coreaudio.c:1470
 #: modules/audio_output/directx.c:377 modules/audio_output/oss.c:129
 #: modules/audio_output/sdl.c:176 modules/audio_output/sdl.c:194
 #: modules/audio_output/waveout.c:309 modules/gui/win32/strings.cpp:58
@@ -1569,14 +1758,14 @@ msgstr ""
 msgid "Cinepak video decoder"
 msgstr "Standard grensesnitt: "
 
-#: modules/codec/dv.c:48
-msgid "DV video decoder"
-msgstr ""
-
 #: modules/codec/dts.c:80
 msgid "DTS parser"
 msgstr ""
 
+#: modules/codec/dv.c:48
+msgid "DV video decoder"
+msgstr ""
+
 #: modules/codec/faad/decoder.c:55
 msgid "AAC audio decoder (using libfaad2)"
 msgstr ""
@@ -1630,6 +1819,11 @@ msgstr ""
 msgid "MPEG audio layer I/II/III parser"
 msgstr ""
 
+#: modules/codec/mpeg_audio/decoder.c:55
+#, fuzzy
+msgid "MPEG I/II layer 1/2 audio decoder"
+msgstr "Standard grensesnitt: "
+
 #: modules/codec/mpeg_video/idct/idct.c:41
 msgid "IDCT"
 msgstr ""
@@ -1824,7 +2018,7 @@ msgstr "Standard grensesnitt: "
 msgid "infrared remote control interface"
 msgstr "Standard grensesnitt: "
 
-#: modules/control/lirc/lirc.c:193
+#: modules/control/lirc/lirc.c:193 modules/gui/beos/InterfaceWindow.cpp:253
 #, fuzzy
 msgid "Quit"
 msgstr "Om"
@@ -1832,21 +2026,21 @@ msgstr "Om"
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
 #: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
-#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:894
-#: modules/gui/macosx/intf.m:895 modules/gui/macosx/intf.m:896
-#: modules/gui/win32/strings.cpp:102 modules/gui/wxwindows/interface.cpp:702
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:880
+#: modules/gui/macosx/intf.m:881 modules/gui/macosx/intf.m:882
+#: modules/gui/win32/strings.cpp:102 modules/gui/wxwindows/interface.cpp:763
 msgid "Pause"
 msgstr "Pause"
 
 #: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
 #: modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
-#: modules/gui/macosx/intf.m:284 modules/gui/macosx/intf.m:322
-#: modules/gui/macosx/intf.m:382 modules/gui/macosx/intf.m:901
-#: modules/gui/macosx/intf.m:902 modules/gui/macosx/intf.m:903
+#: modules/gui/macosx/intf.m:300 modules/gui/macosx/intf.m:338
+#: modules/gui/macosx/intf.m:398 modules/gui/macosx/intf.m:887
+#: modules/gui/macosx/intf.m:888 modules/gui/macosx/intf.m:889
 #: modules/gui/macosx/playlist.m:172 modules/gui/win32/strings.cpp:100
-#: modules/gui/win32/strings.cpp:204 modules/gui/wxwindows/interface.cpp:325
-#: modules/gui/wxwindows/interface.cpp:707
+#: modules/gui/win32/strings.cpp:204 modules/gui/wxwindows/interface.cpp:334
+#: modules/gui/wxwindows/interface.cpp:768
 msgid "Play"
 msgstr "Spill"
 
@@ -1884,29 +2078,29 @@ msgstr ""
 msgid "AAC stream demuxer"
 msgstr ""
 
-#: modules/demux/aac/demux.c:546
+#: modules/demux/aac/demux.c:555
 msgid "Aac"
 msgstr ""
 
-#: modules/demux/aac/demux.c:548 modules/demux/mpeg/audio.c:627
-#: modules/demux/mpeg/audio.c:644
+#: modules/demux/aac/demux.c:557 modules/demux/mpeg/audio.c:627
+#: modules/demux/mpeg/audio.c:644 modules/demux/mpeg/m4v.c:150
 msgid "Input Type"
 msgstr ""
 
-#: modules/demux/aac/demux.c:551 modules/demux/mpeg/audio.c:629
+#: modules/demux/aac/demux.c:560 modules/demux/mpeg/audio.c:629
 msgid "Layer"
 msgstr ""
 
-#: modules/demux/aac/demux.c:553 modules/demux/asf/asf.c:275
+#: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275
 #: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:821
 #: modules/demux/ogg.c:994 modules/gui/gtk/gnome_interface.c:148
 #: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
-#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:344
-#: modules/gui/macosx/intf.m:345 modules/gui/win32/strings.cpp:81
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:360
+#: modules/gui/macosx/intf.m:361 modules/gui/win32/strings.cpp:81
 msgid "Channels"
 msgstr "Kanaler"
 
-#: modules/demux/aac/demux.c:555 modules/demux/asf/asf.c:277
+#: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277
 #: modules/demux/avi/avi.c:1173 modules/demux/mpeg/audio.c:632
 #: modules/demux/ogg.c:556 modules/demux/ogg.c:655 modules/demux/ogg.c:816
 #: modules/demux/ogg.c:989
@@ -1927,7 +2121,7 @@ msgstr "Stopp str
 #: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:554
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:813 modules/demux/ogg.c:893 modules/demux/ogg.c:986
-#: modules/gui/familiar/interface.c:370
+#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:130
 msgid "Type"
 msgstr ""
 
@@ -1976,6 +2170,41 @@ msgstr ""
 msgid "Y pixels per meter"
 msgstr ""
 
+#: modules/demux/asf/libasf.c:614
+#, fuzzy
+msgid "Codec name"
+msgstr "Navn på enhet"
+
+#: modules/demux/asf/libasf.c:615
+#, fuzzy
+msgid "Codec description"
+msgstr "Varighet"
+
+#: modules/demux/asf/libasf.c:695
+msgid "Asf"
+msgstr ""
+
+#: modules/demux/asf/libasf.c:697
+#, fuzzy
+msgid "Author"
+msgstr "Forfattere"
+
+#: modules/demux/asf/libasf.c:698
+#, fuzzy
+msgid "Copyright"
+msgstr "Crop?"
+
+#: modules/demux/asf/libasf.c:699 modules/gui/gtk/preferences.c:325
+#: modules/gui/kde/pluginsbox.cpp:46
+#, fuzzy
+msgid "Description"
+msgstr "Varighet"
+
+#: modules/demux/asf/libasf.c:700
+#, fuzzy
+msgid "Rating"
+msgstr "tegn"
+
 #: modules/demux/au.c:47
 msgid "AU demuxer"
 msgstr ""
@@ -2052,6 +2281,7 @@ msgid "MPEG I/II audio stream demuxer"
 msgstr "Standard grensesnitt: "
 
 #: modules/demux/mpeg/audio.c:626 modules/demux/mpeg/audio.c:643
+#: modules/demux/mpeg/m4v.c:149
 msgid "mpeg"
 msgstr "mpeg"
 
@@ -2067,6 +2297,15 @@ msgstr ""
 msgid "ISO 13818-1 MPEG Elementary Stream input"
 msgstr ""
 
+#: modules/demux/mpeg/m4v.c:43
+#, fuzzy
+msgid "MPEG-4 video elementary stream demuxer"
+msgstr "Standard grensesnitt: "
+
+#: modules/demux/mpeg/m4v.c:150
+msgid "Video MPEG-4 (raw ES)"
+msgstr ""
+
 #: modules/demux/mpeg/ps.c:60
 msgid "ISO 13818-1 MPEG Program Stream input"
 msgstr ""
@@ -2150,38 +2389,685 @@ msgstr ""
 msgid "Simple id3 tag skipper"
 msgstr ""
 
-#: modules/demux/util/id3tag.c:47
-msgid "id3 tag parser using libid3tag"
+#: modules/demux/util/id3genres.h:8
+msgid "Blues"
 msgstr ""
 
-#: modules/demux/util/sub.c:67
-#, fuzzy
-msgid "text subtitle demux"
-msgstr "Velg teksting kanal"
+#: modules/demux/util/id3genres.h:9
+msgid "Classic Rock"
+msgstr ""
 
-#: modules/demux/wav/wav.c:49
-msgid "WAV demuxer"
+#: modules/demux/util/id3genres.h:10
+msgid "Country"
 msgstr ""
 
-#: modules/encoder/ffmpeg/encoder.c:51
+#: modules/demux/util/id3genres.h:11
 #, fuzzy
-msgid "ffmpeg video encoder"
-msgstr "mpeg"
+msgid "Dance"
+msgstr "Avbryt"
 
-#: modules/encoder/ffmpeg/encoder.c:62
+#: modules/demux/util/id3genres.h:12
 #, fuzzy
-msgid "ffmpeg audio encoder"
-msgstr "mpeg"
+msgid "Disco"
+msgstr "Disk"
 
-#: modules/encoder/xvid.c:58
-msgid "XviD video encoder (MPEG-4)"
+#: modules/demux/util/id3genres.h:13
+msgid "Funk"
 msgstr ""
 
-#: modules/gui/beos/BeOS.cpp:53
-#, fuzzy
+#: modules/demux/util/id3genres.h:14
+msgid "Grunge"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:15
+msgid "Hip-Hop"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:16
+msgid "Jazz"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:17
+msgid "Metal"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:18
+msgid "New Age"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:19
+msgid "Oldies"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:20
+#, fuzzy
+msgid "Other"
+msgstr "_Gjem grensesnitt"
+
+#: modules/demux/util/id3genres.h:21
+msgid "Pop"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:22
+msgid "R&B"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:23
+msgid "Rap"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:24
+msgid "Reggae"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:25
+msgid "Rock"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:26
+msgid "Techno"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:27
+msgid "Industrial"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:28
+msgid "Alternative"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:29
+msgid "Ska"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:30
+msgid "Death Metal"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:31
+#, fuzzy
+msgid "Pranks"
+msgstr "Spill"
+
+#: modules/demux/util/id3genres.h:32
+#, fuzzy
+msgid "Soundtrack"
+msgstr "Lyd"
+
+#: modules/demux/util/id3genres.h:33
+msgid "Euro-Techno"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:34
+msgid "Ambient"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:35
+msgid "Trip-Hop"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:36
+msgid "Vocal"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:37
+msgid "Jazz+Funk"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:38
+#, fuzzy
+msgid "Fusion"
+msgstr "skrifttype"
+
+#: modules/demux/util/id3genres.h:39
+#, fuzzy
+msgid "Trance"
+msgstr "Avbryt"
+
+#: modules/demux/util/id3genres.h:40
+msgid "Classical"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:41
+msgid "Instrumental"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:42
+msgid "Acid"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:43
+#, fuzzy
+msgid "House"
+msgstr "Pause"
+
+#: modules/demux/util/id3genres.h:44
+#, fuzzy
+msgid "Game"
+msgstr "Navn"
+
+#: modules/demux/util/id3genres.h:45
+msgid "Sound Clip"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:46
+msgid "Gospel"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:47
+msgid "Noise"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:48
+msgid "AlternRock"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:49
+msgid "Bass"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:50
+msgid "Soul"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:51
+msgid "Punk"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:52
+#, fuzzy
+msgid "Space"
+msgstr "Tjener"
+
+#: modules/demux/util/id3genres.h:53
+msgid "Meditative"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:54
+msgid "Instrumental Pop"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:55
+msgid "Instrumental Rock"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:56
+msgid "Ethnic"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:57
+msgid "Gothic"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:58
+msgid "Darkwave"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:59
+msgid "Techno-Industrial"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:60
+#, fuzzy
+msgid "Electronic"
+msgstr "Valg"
+
+#: modules/demux/util/id3genres.h:61
+msgid "Pop-Folk"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:62
+msgid "Eurodance"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:63
+msgid "Dream"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:64
+msgid "Southern Rock"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:65
+#, fuzzy
+msgid "Comedy"
+msgstr "Crop?"
+
+#: modules/demux/util/id3genres.h:66
+msgid "Cult"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:67
+msgid "Gangsta"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:68
+msgid "Top 40"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:69
+msgid "Christian Rap"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:70
+msgid "Pop/Funk"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:71
+#, fuzzy
+msgid "Jungle"
+msgstr "_Vinkel"
+
+#: modules/demux/util/id3genres.h:72
+msgid "Native American"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:73
+msgid "Cabaret"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:74
+msgid "New Wave"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:75
+msgid "Psychadelic"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:76
+#, fuzzy
+msgid "Rave"
+msgstr "Tjener"
+
+#: modules/demux/util/id3genres.h:77
+msgid "Showtunes"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:78
+#, fuzzy
+msgid "Trailer"
+msgstr "Tittel"
+
+#: modules/demux/util/id3genres.h:79
+msgid "Lo-Fi"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:80
+msgid "Tribal"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:81
+msgid "Acid Punk"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:82
+msgid "Acid Jazz"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:83
+#, fuzzy
+msgid "Polka"
+msgstr "Spill"
+
+#: modules/demux/util/id3genres.h:84
+msgid "Retro"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:85
+msgid "Musical"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:86
+msgid "Rock & Roll"
+msgstr ""
+
+#: modules/demux/util/id3genres.h:87
+msgid "Hard Rock"
+msgstr ""
+
+#: modules/demux/util/id3tag.c:47
+msgid "id3 tag parser using libid3tag"
+msgstr ""
+
+#: modules/demux/util/sub.c:72
+#, fuzzy
+msgid "Text subtitles demux"
+msgstr "Velg teksting kanal"
+
+#: modules/demux/wav/wav.c:49
+msgid "WAV demuxer"
+msgstr ""
+
+#: modules/encoder/ffmpeg/encoder.c:51
+#, fuzzy
+msgid "ffmpeg video encoder"
+msgstr "mpeg"
+
+#: modules/encoder/ffmpeg/encoder.c:62
+#, fuzzy
+msgid "ffmpeg audio encoder"
+msgstr "mpeg"
+
+#: modules/encoder/xvid.c:58
+msgid "XviD video encoder (MPEG-4)"
+msgstr ""
+
+#: modules/gui/beos/BeOS.cpp:53
+#, fuzzy
 msgid "BeOS standard API interface"
 msgstr "_Gjem grensesnitt"
 
+#: modules/gui/beos/InterfaceWindow.cpp:158
+msgid "Open files from all sub-folders as well?"
+msgstr ""
+
+#: modules/gui/beos/InterfaceWindow.cpp:159
+msgid "No"
+msgstr ""
+
+#: modules/gui/beos/InterfaceWindow.cpp:159
+msgid "Yes"
+msgstr ""
+
+#: modules/gui/beos/InterfaceWindow.cpp:201
+#: modules/gui/beos/InterfaceWindow.cpp:300
+#: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
+#: modules/gui/macosx/intf.m:304 modules/gui/macosx/prefs.m:192
+#: modules/gui/win32/strings.cpp:211 modules/gui/wxwindows/preferences.cpp:229
+msgid "Preferences"
+msgstr "Innstillinger"
+
+#: modules/gui/beos/InterfaceWindow.cpp:211
+#: modules/gui/beos/InterfaceWindow.cpp:298
+#: modules/gui/gtk/gnome_interface.c:2692 modules/gui/gtk/gtk_interface.c:2947
+#: modules/gui/kde/info.cpp:9 modules/gui/kde/messages.cpp:8
+#: modules/gui/macosx/intf.m:310 modules/gui/macosx/intf.m:387
+#: modules/gui/win32/strings.cpp:153 modules/gui/wxwindows/messages.cpp:79
+msgid "Messages"
+msgstr "Beskjeder"
+
+#: modules/gui/beos/InterfaceWindow.cpp:238
+#: modules/gui/beos/MediaControlView.cpp:1257
+#: modules/gui/beos/PlayListWindow.cpp:82 modules/gui/familiar/interface.c:378
+#: modules/gui/gtk/gnome_interface.c:503
+#: modules/gui/gtk/gnome_interface.c:1569
+#: modules/gui/gtk/gnome_interface.c:2274
+#: modules/gui/gtk/gnome_interface.c:2847 modules/gui/gtk/gtk_interface.c:618
+#: modules/gui/gtk/gtk_interface.c:1884 modules/gui/gtk/gtk_interface.c:2733
+#: modules/gui/gtk/gtk_interface.c:2850 modules/gui/gtk/gtk_interface.c:3102
+#: modules/gui/macosx/open.m:141 modules/gui/macosx/open.m:263
+#: modules/gui/macosx/output.m:121 modules/gui/macosx/output.m:194
+#: modules/gui/macosx/output.m:279 modules/gui/win32/strings.cpp:93
+#: modules/gui/win32/strings.cpp:226 modules/gui/wxwindows/interface.cpp:321
+#: modules/gui/wxwindows/open.cpp:271 modules/gui/wxwindows/streamout.cpp:345
+msgid "File"
+msgstr "Fil"
+
+#: modules/gui/beos/InterfaceWindow.cpp:240
+#: modules/gui/beos/PlayListWindow.cpp:84
+#: modules/gui/gtk/gnome_interface.c:2179
+#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:331
+#: modules/gui/macosx/open.m:614 modules/gui/macosx/open.m:661
+msgid "Open File"
+msgstr "Åpne fil"
+
+#: modules/gui/beos/InterfaceWindow.cpp:243
+#: modules/gui/beos/PlayListWindow.cpp:89 modules/gui/win32/strings.cpp:19
+#, fuzzy
+msgid "Open Disc"
+msgstr "Åpne Disk"
+
+#: modules/gui/beos/InterfaceWindow.cpp:245
+#, fuzzy
+msgid "Open Subtitles"
+msgstr "_Teksting"
+
+#: modules/gui/beos/InterfaceWindow.cpp:249
+#: modules/gui/familiar/interface.c:231 modules/gui/familiar/interface.c:232
+#: modules/gui/familiar/interface.c:765 modules/gui/gtk/gtk_interface.c:1580
+#: modules/gui/win32/strings.cpp:7
+msgid "About"
+msgstr "Om"
+
+#: modules/gui/beos/InterfaceWindow.cpp:256 modules/gui/kde/interface.cpp:93
+#: modules/gui/macosx/intf.m:376 modules/gui/macosx/intf.m:377
+#: modules/gui/win32/strings.cpp:87
+#, fuzzy
+msgid "Subtitles"
+msgstr "_Teksting"
+
+#: modules/gui/beos/InterfaceWindow.cpp:264
+#, fuzzy
+msgid "Prev Title"
+msgstr "Forrige fil"
+
+#: modules/gui/beos/InterfaceWindow.cpp:265
+#, fuzzy
+msgid "Next Title"
+msgstr "Neste fil"
+
+#: modules/gui/beos/InterfaceWindow.cpp:266
+#, fuzzy
+msgid "Prev Chapter"
+msgstr "Kapittel"
+
+#: modules/gui/beos/InterfaceWindow.cpp:267
+#, fuzzy
+msgid "Next Chapter"
+msgstr "Kapittel"
+
+#: modules/gui/beos/InterfaceWindow.cpp:268
+msgid "Goto Menu"
+msgstr ""
+
+#: modules/gui/beos/InterfaceWindow.cpp:277
+#, fuzzy
+msgid "Go to Title"
+msgstr "Tittel"
+
+#: modules/gui/beos/InterfaceWindow.cpp:281
+#, fuzzy
+msgid "Go to Chapter"
+msgstr "Kapittel"
+
+#: modules/gui/beos/InterfaceWindow.cpp:284
+#, fuzzy
+msgid "Speed"
+msgstr "Valgte"
+
+#: modules/gui/beos/InterfaceWindow.cpp:286 modules/gui/macosx/controls.m:422
+#: modules/gui/macosx/intf.m:299 modules/gui/macosx/intf.m:341
+#, fuzzy
+msgid "Slower"
+msgstr "Sakte"
+
+#: modules/gui/beos/InterfaceWindow.cpp:287
+msgid "Normal"
+msgstr ""
+
+#: modules/gui/beos/InterfaceWindow.cpp:290 modules/gui/macosx/controls.m:421
+#: modules/gui/macosx/intf.m:302 modules/gui/macosx/intf.m:340
+#, fuzzy
+msgid "Faster"
+msgstr "Fort"
+
+#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:381
+msgid "Window"
+msgstr ""
+
+#: modules/gui/beos/InterfaceWindow.cpp:296
+#, fuzzy
+msgid "Play List"
+msgstr "Spilleliste"
+
+#: modules/gui/beos/InterfaceWindow.cpp:356
+#: modules/gui/gtk/gtk_interface.c:1661 modules/gui/gtk/gtk_interface.c:2396
+#: modules/gui/gtk/gtk_interface.c:2638 modules/gui/gtk/gtk_interface.c:2869
+#: modules/gui/gtk/gtk_interface.c:2976 modules/gui/gtk/gtk_interface.c:3250
+#: modules/gui/gtk/preferences.c:605 modules/gui/macosx/open.m:138
+#: modules/gui/macosx/open.m:178 modules/gui/macosx/output.m:117
+#: modules/gui/macosx/prefs.m:587 modules/gui/macosx/prefs.m:750
+#: modules/gui/win32/strings.cpp:13 modules/gui/win32/strings.cpp:26
+#: modules/gui/win32/strings.cpp:154 modules/gui/win32/strings.cpp:173
+#: modules/gui/win32/strings.cpp:183 modules/gui/win32/strings.cpp:214
+#: modules/gui/win32/strings.cpp:233 modules/gui/win32/strings.cpp:249
+#: modules/gui/wxwindows/fileinfo.cpp:96
+#: modules/gui/wxwindows/messages.cpp:102 modules/gui/wxwindows/open.cpp:262
+#: modules/gui/wxwindows/preferences.cpp:250
+#: modules/gui/wxwindows/streamout.cpp:194
+#: modules/gui/wxwindows/subtitles.cpp:149
+msgid "OK"
+msgstr "OK"
+
+#: modules/gui/beos/InterfaceWindow.cpp:364
+msgid "VideoLAN Client: Open Media Files"
+msgstr ""
+
+#: modules/gui/beos/InterfaceWindow.cpp:368
+#, fuzzy
+msgid "VideoLAN Client: Open Subtitle File"
+msgstr "Velg teksting kanal"
+
+#: modules/gui/beos/MediaControlView.cpp:64
+msgid "Drop files to play"
+msgstr ""
+
+#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:163
+#: modules/gui/wxwindows/playlist.cpp:154
+msgid "Close"
+msgstr ""
+
+#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:330
+#, fuzzy
+msgid "Edit"
+msgstr "_Avslutt"
+
+#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:335
+#: modules/gui/macosx/playlist.m:174
+#, fuzzy
+msgid "Select All"
+msgstr "Velg fil"
+
+#: modules/gui/beos/PlayListWindow.cpp:103
+#, fuzzy
+msgid "Select None"
+msgstr "Valg"
+
+#: modules/gui/beos/PlayListWindow.cpp:108
+msgid "Sort Reverse"
+msgstr ""
+
+#: modules/gui/beos/PlayListWindow.cpp:111
+msgid "Sort by Name"
+msgstr ""
+
+#: modules/gui/beos/PlayListWindow.cpp:115
+msgid "Sort by Path"
+msgstr ""
+
+#: modules/gui/beos/PlayListWindow.cpp:119
+msgid "Randomize"
+msgstr ""
+
+#: modules/gui/beos/PlayListWindow.cpp:124
+msgid "Remove"
+msgstr ""
+
+#: modules/gui/beos/PlayListWindow.cpp:127
+#, fuzzy
+msgid "Remove All"
+msgstr "Velg fil"
+
+#: modules/gui/beos/PlayListWindow.cpp:132
+#, fuzzy
+msgid "View"
+msgstr "_Vis"
+
+#: modules/gui/beos/PlayListWindow.cpp:138
+#, fuzzy
+msgid "Path"
+msgstr "Port"
+
+#: modules/gui/beos/PlayListWindow.cpp:144
+#: modules/gui/familiar/interface.c:362 modules/gui/gtk/preferences.c:325
+#: modules/gui/kde/pluginsbox.cpp:45
+msgid "Name"
+msgstr "Navn"
+
+#: modules/gui/beos/PreferencesWindow.cpp:103
+#: modules/gui/gtk/gnome_interface.c:2216
+msgid "Modules"
+msgstr "Moduler"
+
+#: modules/gui/beos/PreferencesWindow.cpp:255
+#: modules/gui/gtk/preferences.c:609 modules/gui/win32/strings.cpp:212
+msgid "Apply"
+msgstr "Bruk"
+
+#: modules/gui/beos/PreferencesWindow.cpp:260
+#: modules/gui/gtk/preferences.c:596 modules/gui/gtk/preferences.c:613
+#: modules/gui/macosx/output.m:329 modules/gui/win32/strings.cpp:213
+#: modules/gui/wxwindows/preferences.cpp:254
+#, fuzzy
+msgid "Save"
+msgstr "Tjener"
+
+#: modules/gui/beos/PreferencesWindow.cpp:264
+#, fuzzy
+msgid "Defaults"
+msgstr "Slett"
+
+#: modules/gui/beos/VideoOutput.cpp:1125
+#, fuzzy
+msgid "Show Interface"
+msgstr "_Gjem grensesnitt"
+
+#: modules/gui/beos/VideoOutput.cpp:1129
+msgid "50%"
+msgstr ""
+
+#: modules/gui/beos/VideoOutput.cpp:1132
+msgid "100%"
+msgstr ""
+
+#: modules/gui/beos/VideoOutput.cpp:1135
+msgid "200%"
+msgstr ""
+
+#: modules/gui/beos/VideoOutput.cpp:1138 modules/gui/macosx/controls.m:342
+#: modules/gui/macosx/controls.m:486 modules/gui/macosx/intf.m:370
+#, fuzzy
+msgid "Fullscreen"
+msgstr "_Fullskjerm"
+
+#: modules/gui/beos/VideoOutput.cpp:1145
+msgid "Vertical Sync"
+msgstr ""
+
+#: modules/gui/beos/VideoOutput.cpp:1149
+#, fuzzy
+msgid "Correct Aspect Ratio"
+msgstr "kildens bildeformat"
+
+#: modules/gui/beos/VideoOutput.cpp:1178
+msgid "Stay On Top"
+msgstr ""
+
+#: modules/gui/beos/VideoOutput.cpp:1184
+msgid "Take Screen Shot"
+msgstr ""
+
+#: modules/gui/beos/VlcWrapper.cpp:185 modules/gui/gtk/menu.c:733
+#: modules/gui/macosx/prefs.m:403 modules/gui/macosx/prefs.m:432
+#: modules/gui/macosx/prefs.m:684 modules/gui/macosx/prefs.m:713
+msgid "None"
+msgstr ""
+
+#: modules/gui/beos/VlcWrapper.cpp:198
+#, fuzzy
+msgid "<unknown>"
+msgstr "Ukjent"
+
 #: modules/gui/familiar/familiar.c:62
 msgid "autoplay selected file"
 msgstr ""
@@ -2202,17 +3088,12 @@ msgstr "Standard grensesnitt: "
 msgid "VLC media player"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:554
-#: modules/gui/wxwindows/preferences.cpp:853
+#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:590
+#: modules/gui/wxwindows/preferences.cpp:965
+#: modules/gui/wxwindows/subtitles.cpp:196
 #, fuzzy
-msgid "Open file"
-msgstr "Åpne fil"
-
-#: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:288 modules/gui/macosx/prefs.m:191
-#: modules/gui/win32/strings.cpp:211 modules/gui/wxwindows/preferences.cpp:228
-msgid "Preferences"
-msgstr "Innstillinger"
+msgid "Open file"
+msgstr "Åpne fil"
 
 #: modules/gui/familiar/interface.c:164
 msgid "Rewind"
@@ -2235,10 +3116,10 @@ msgstr "Spill str
 
 #: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
 #: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
-#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/intf.m:285
-#: modules/gui/macosx/intf.m:323 modules/gui/macosx/intf.m:383
-#: modules/gui/macosx/controls.m:435 modules/gui/win32/strings.cpp:104
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:435
+#: modules/gui/macosx/intf.m:301 modules/gui/macosx/intf.m:339
+#: modules/gui/macosx/intf.m:399 modules/gui/win32/strings.cpp:104
+#: modules/gui/wxwindows/interface.cpp:332
 msgid "Stop"
 msgstr "Stopp"
 
@@ -2255,12 +3136,6 @@ msgstr ""
 msgid "Forward stream"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:231 modules/gui/familiar/interface.c:232
-#: modules/gui/familiar/interface.c:765 modules/gui/gtk/gtk_interface.c:1580
-#: modules/gui/win32/strings.cpp:7
-msgid "About"
-msgstr "Om"
-
 #: modules/gui/familiar/interface.c:285 modules/gui/gtk/gnome_interface.c:2345
 #: modules/gui/gtk/gtk_interface.c:2712 modules/gui/macosx/playlist.m:176
 msgid "Add"
@@ -2270,31 +3145,14 @@ msgstr "Legg til"
 msgid "MRL :"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:362 modules/gui/gtk/preferences.c:325
-#: modules/gui/kde/pluginsbox.cpp:45
-msgid "Name"
-msgstr "Navn"
-
-#: modules/gui/familiar/interface.c:378 modules/gui/gtk/gnome_interface.c:503
-#: modules/gui/gtk/gnome_interface.c:1569
-#: modules/gui/gtk/gnome_interface.c:2274
-#: modules/gui/gtk/gnome_interface.c:2847 modules/gui/gtk/gtk_interface.c:618
-#: modules/gui/gtk/gtk_interface.c:1884 modules/gui/gtk/gtk_interface.c:2733
-#: modules/gui/gtk/gtk_interface.c:2850 modules/gui/gtk/gtk_interface.c:3102
-#: modules/gui/macosx/open.m:141 modules/gui/macosx/open.m:263
-#: modules/gui/win32/strings.cpp:93 modules/gui/win32/strings.cpp:226
-#: modules/gui/wxwindows/interface.cpp:312 modules/gui/wxwindows/open.cpp:240
-#: modules/gui/wxwindows/streamout.cpp:269
-msgid "File"
-msgstr "Fil"
-
 #: modules/gui/familiar/interface.c:394
 msgid "UDP/RTP (Adress when Multicast)"
 msgstr ""
 
 #: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
 #: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:159
-#: modules/gui/wxwindows/open.cpp:401 modules/gui/wxwindows/streamout.cpp:305
+#: modules/gui/macosx/output.m:124 modules/gui/wxwindows/open.cpp:433
+#: modules/gui/wxwindows/streamout.cpp:385
 msgid "Address"
 msgstr "Adresse"
 
@@ -2303,13 +3161,14 @@ msgstr "Adresse"
 #: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
 #: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
 #: modules/gui/macosx/open.m:158 modules/gui/macosx/open.m:160
-#: modules/gui/wxwindows/open.cpp:386 modules/gui/wxwindows/open.cpp:409
-#: modules/gui/wxwindows/streamout.cpp:314
+#: modules/gui/macosx/output.m:125 modules/gui/wxwindows/open.cpp:418
+#: modules/gui/wxwindows/open.cpp:441 modules/gui/wxwindows/streamout.cpp:395
 msgid "Port"
 msgstr "Port"
 
-#: modules/gui/familiar/interface.c:478
-#: modules/gui/wxwindows/streamout.cpp:270
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:127
+#: modules/gui/macosx/output.m:221 modules/gui/macosx/output.m:289
+#: modules/gui/wxwindows/streamout.cpp:346
 msgid "HTTP"
 msgstr ""
 
@@ -2325,7 +3184,7 @@ msgstr ""
 #: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
 #: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
 #: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:143
-#: modules/gui/macosx/open.m:271 modules/gui/wxwindows/open.cpp:244
+#: modules/gui/macosx/open.m:271 modules/gui/wxwindows/open.cpp:275
 msgid "Network"
 msgstr "Nettverk"
 
@@ -2396,6 +3255,8 @@ msgstr ""
 
 #: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
+#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
+#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
@@ -2448,7 +3309,7 @@ msgstr "_
 #: modules/gui/gtk/gnome_interface.c:20 modules/gui/gtk/gnome_interface.c:504
 #: modules/gui/gtk/gnome_interface.c:986 modules/gui/gtk/gtk_interface.c:173
 #: modules/gui/gtk/gtk_interface.c:619 modules/gui/gtk/gtk_interface.c:1399
-#: modules/gui/win32/strings.cpp:94 modules/gui/wxwindows/interface.cpp:220
+#: modules/gui/win32/strings.cpp:94 modules/gui/wxwindows/interface.cpp:218
 #, fuzzy
 msgid "Open a file"
 msgstr "Åpne en fil"
@@ -2560,25 +3421,25 @@ msgstr "Velg lydkanal"
 
 #: modules/gui/gtk/gnome_interface.c:126 modules/gui/gtk/gnome_interface.c:909
 #: modules/gui/gtk/gtk_interface.c:452 modules/gui/gtk/gtk_interface.c:1253
-#: modules/gui/macosx/intf.m:339
+#: modules/gui/macosx/intf.m:355
 msgid "Volume Up"
 msgstr "Øk volum"
 
 #: modules/gui/gtk/gnome_interface.c:133 modules/gui/gtk/gnome_interface.c:916
 #: modules/gui/gtk/gtk_interface.c:459 modules/gui/gtk/gtk_interface.c:1260
-#: modules/gui/macosx/intf.m:340
+#: modules/gui/macosx/intf.m:356
 msgid "Volume Down"
 msgstr "Senk volum"
 
 #: modules/gui/gtk/gnome_interface.c:140 modules/gui/gtk/gnome_interface.c:923
 #: modules/gui/gtk/gtk_interface.c:466 modules/gui/gtk/gtk_interface.c:1267
-#: modules/gui/macosx/intf.m:341 modules/gui/macosx/controls.m:482
+#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:357
 msgid "Mute"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:155 modules/gui/gtk/gnome_interface.c:938
 #: modules/gui/gtk/gtk_interface.c:488 modules/gui/gtk/gtk_interface.c:1289
-#: modules/gui/macosx/intf.m:346 modules/gui/macosx/intf.m:347
+#: modules/gui/macosx/intf.m:362 modules/gui/macosx/intf.m:363
 #: modules/gui/win32/strings.cpp:80
 #, fuzzy
 msgid "Device"
@@ -2601,8 +3462,8 @@ msgstr "_Fullskjerm"
 
 #: modules/gui/gtk/gnome_interface.c:183 modules/gui/gtk/gnome_interface.c:966
 #: modules/gui/gtk/gtk_interface.c:553 modules/gui/gtk/gtk_interface.c:1349
-#: modules/gui/macosx/intf.m:362 modules/gui/macosx/intf.m:363
-#: modules/gui/macosx/controls.m:526
+#: modules/gui/macosx/controls.m:526 modules/gui/macosx/intf.m:378
+#: modules/gui/macosx/intf.m:379
 #: modules/video_filter/deinterlace/deinterlace.c:81
 #, fuzzy
 msgid "Deinterlace"
@@ -2610,8 +3471,9 @@ msgstr "Standard grensesnitt: "
 
 #: modules/gui/gtk/gnome_interface.c:190 modules/gui/gtk/gnome_interface.c:973
 #: modules/gui/gtk/gtk_interface.c:560 modules/gui/gtk/gtk_interface.c:1356
-#: modules/gui/macosx/intf.m:358 modules/gui/macosx/intf.m:359
-#: modules/gui/macosx/vout.m:202 modules/gui/win32/strings.cpp:83
+#: modules/gui/macosx/intf.m:374 modules/gui/macosx/intf.m:375
+#: modules/gui/macosx/output.m:120 modules/gui/macosx/vout.m:202
+#: modules/gui/win32/strings.cpp:83
 msgid "Screen"
 msgstr "Fullskjerm"
 
@@ -2629,18 +3491,18 @@ msgstr "_Video"
 #: modules/gui/gtk/gtk_interface.c:816 modules/gui/gtk/gtk_interface.c:2005
 #: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:142
 #: modules/gui/macosx/open.m:267 modules/gui/win32/strings.cpp:43
-#: modules/gui/win32/strings.cpp:95 modules/gui/wxwindows/interface.cpp:314
-#: modules/gui/wxwindows/open.cpp:242
+#: modules/gui/win32/strings.cpp:95 modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/open.cpp:273
 msgid "Disc"
 msgstr "Disk"
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/win32/strings.cpp:97 modules/gui/wxwindows/interface.cpp:316
+#: modules/gui/win32/strings.cpp:97 modules/gui/wxwindows/interface.cpp:325
 msgid "Net"
 msgstr "Nett"
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:328
 msgid "Sat"
 msgstr ""
 
@@ -2705,7 +3567,7 @@ msgstr "
 #: modules/gui/gtk/gtk_interface.c:844 modules/gui/gtk/gtk_interface.c:888
 #: modules/gui/gtk/gtk_interface.c:1173 modules/gui/win32/strings.cpp:112
 #: modules/gui/win32/strings.cpp:132 modules/gui/win32/strings.cpp:136
-#: modules/gui/wxwindows/interface.cpp:330
+#: modules/gui/wxwindows/interface.cpp:339
 msgid "Prev"
 msgstr "Forrige"
 
@@ -2718,11 +3580,11 @@ msgstr "Forrige fil"
 #: modules/gui/gtk/gnome_interface.c:667
 #: modules/gui/gtk/gnome_interface.c:1056 modules/gui/gtk/gtk_interface.c:769
 #: modules/gui/gtk/gtk_interface.c:852 modules/gui/gtk/gtk_interface.c:896
-#: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/intf.m:287
-#: modules/gui/macosx/intf.m:327 modules/gui/macosx/intf.m:384
-#: modules/gui/macosx/controls.m:443 modules/gui/win32/strings.cpp:114
+#: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:443
+#: modules/gui/macosx/intf.m:303 modules/gui/macosx/intf.m:343
+#: modules/gui/macosx/intf.m:400 modules/gui/win32/strings.cpp:114
 #: modules/gui/win32/strings.cpp:134 modules/gui/win32/strings.cpp:138
-#: modules/gui/wxwindows/interface.cpp:332
+#: modules/gui/wxwindows/interface.cpp:341
 msgid "Next"
 msgstr "Neste"
 
@@ -2807,18 +3669,18 @@ msgid "Open Stream"
 msgstr "Stopp strøm"
 
 #: modules/gui/gtk/gnome_interface.c:1476 modules/gui/gtk/gtk_interface.c:1791
-#: modules/gui/macosx/open.m:135 modules/gui/wxwindows/open.cpp:159
+#: modules/gui/macosx/open.m:135 modules/gui/wxwindows/open.cpp:165
 msgid "Media Resource Locator (MRL)"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1498 modules/gui/gtk/gtk_interface.c:1813
-#: modules/gui/wxwindows/open.cpp:163
+#: modules/gui/wxwindows/open.cpp:169
 #, fuzzy
 msgid "Open Target:"
 msgstr "Stopp strøm"
 
 #: modules/gui/gtk/gnome_interface.c:1518 modules/gui/gtk/gtk_interface.c:1833
-#: modules/gui/wxwindows/open.cpp:178
+#: modules/gui/wxwindows/open.cpp:184
 msgid ""
 "Alternatively, you can build an MRL using one of the following predefined "
 "targets:"
@@ -2828,33 +3690,35 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1998 modules/gui/gtk/gtk_interface.c:1877
 #: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:145
 #: modules/gui/macosx/open.m:151 modules/gui/macosx/open.m:172
-#: modules/gui/win32/strings.cpp:229 modules/gui/win32/strings.cpp:248
-#: modules/gui/wxwindows/open.cpp:211 modules/gui/wxwindows/open.cpp:301
-#: modules/gui/wxwindows/preferences.cpp:667
-#: modules/gui/wxwindows/streamout.cpp:294
+#: modules/gui/macosx/output.m:123 modules/gui/win32/strings.cpp:229
+#: modules/gui/win32/strings.cpp:248 modules/gui/wxwindows/open.cpp:241
+#: modules/gui/wxwindows/open.cpp:333
+#: modules/gui/wxwindows/preferences.cpp:778
+#: modules/gui/wxwindows/streamout.cpp:372
+#: modules/gui/wxwindows/subtitles.cpp:107
 #, fuzzy
 msgid "Browse..."
 msgstr "Utforsk"
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/win32/strings.cpp:25 modules/gui/wxwindows/open.cpp:324
+#: modules/gui/win32/strings.cpp:25 modules/gui/wxwindows/open.cpp:356
 msgid "Disc type"
 msgstr "Disktype"
 
 #: modules/gui/gtk/gnome_interface.c:1605 modules/gui/gtk/gtk_interface.c:1920
 #: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:472
-#: modules/gui/wxwindows/open.cpp:319
+#: modules/gui/wxwindows/open.cpp:351
 msgid "DVD"
 msgstr "DVD"
 
 #: modules/gui/gtk/gnome_interface.c:1613 modules/gui/gtk/gtk_interface.c:1928
 #: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:381
-#: modules/gui/macosx/open.m:464 modules/gui/wxwindows/open.cpp:321
+#: modules/gui/macosx/open.m:464 modules/gui/wxwindows/open.cpp:353
 msgid "VCD"
 msgstr "VCD"
 
 #: modules/gui/gtk/gnome_interface.c:1621 modules/gui/gtk/gtk_interface.c:1936
-#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:330
+#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:362
 msgid "Device name"
 msgstr "Navn på enhet"
 
@@ -2866,26 +3730,26 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1707 modules/gui/gtk/gtk_interface.c:2022
 #: modules/gui/macosx/open.m:163 modules/gui/macosx/open.m:531
 #: modules/gui/macosx/open.m:569 modules/gui/win32/strings.cpp:169
-#: modules/gui/wxwindows/open.cpp:365
+#: modules/gui/wxwindows/open.cpp:397
 msgid "UDP/RTP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1717 modules/gui/gtk/gtk_interface.c:2032
 #: modules/gui/macosx/open.m:164 modules/gui/macosx/open.m:532
 #: modules/gui/macosx/open.m:581 modules/gui/win32/strings.cpp:170
-#: modules/gui/wxwindows/open.cpp:366
+#: modules/gui/wxwindows/open.cpp:398
 msgid "UDP/RTP Multicast"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1727 modules/gui/gtk/gtk_interface.c:2042
 #: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:533
 #: modules/gui/macosx/open.m:594 modules/gui/win32/strings.cpp:172
-#: modules/gui/wxwindows/open.cpp:367
+#: modules/gui/wxwindows/open.cpp:399
 msgid "HTTP/FTP/MMS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
-#: modules/gui/macosx/open.m:161 modules/gui/wxwindows/open.cpp:423
+#: modules/gui/macosx/open.m:161 modules/gui/wxwindows/open.cpp:455
 msgid "URL"
 msgstr ""
 
@@ -2916,7 +3780,7 @@ msgid "Horizontal"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1956 modules/gui/gtk/gtk_interface.c:2271
-#: modules/gui/wxwindows/open.cpp:247
+#: modules/gui/wxwindows/open.cpp:278
 #, fuzzy
 msgid "Satellite"
 msgstr "Åpne spilleliste-vinduet"
@@ -2938,29 +3802,23 @@ msgid "fps"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2049 modules/gui/gtk/gtk_interface.c:2369
-#: modules/gui/macosx/open.m:171 modules/gui/wxwindows/open.cpp:188
+#: modules/gui/macosx/open.m:171 modules/gui/macosx/output.m:116
+#: modules/gui/wxwindows/open.cpp:196 modules/gui/wxwindows/open.cpp:218
 #, fuzzy
 msgid "Settings..."
 msgstr "_Innstillinger"
 
-#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:331
-#: modules/gui/macosx/open.m:614 modules/gui/macosx/open.m:660
-msgid "Open File"
-msgstr "Åpne fil"
-
-#: modules/gui/gtk/gnome_interface.c:2216
-msgid "Modules"
-msgstr "Moduler"
-
 #: modules/gui/gtk/gnome_interface.c:2224
 msgid ""
 "Sorry, the module manager isn't functional yet. Please retry in a later "
 "version."
-msgstr "Beklager, modul håndtereren virker ikke ennå. Vennligst prøv på nytt i en senere versjon."
+msgstr ""
+"Beklager, modul håndtereren virker ikke ennå. Vennligst prøv på nytt i en "
+"senere versjon."
 
 #: modules/gui/gtk/gnome_interface.c:2288
 #: modules/gui/gtk/gnome_interface.c:2429 modules/gui/gtk/gtk_interface.c:2747
-#: modules/gui/wxwindows/playlist.cpp:136
+#: modules/gui/wxwindows/playlist.cpp:147
 msgid "Url"
 msgstr "Url"
 
@@ -2983,7 +3841,7 @@ msgid "Invert"
 msgstr "Inverter"
 
 #: modules/gui/gtk/gnome_interface.c:2333 modules/gui/gtk/preferences.c:382
-#: modules/gui/kde/pluginsbox.cpp:48 modules/gui/macosx/prefs.m:399
+#: modules/gui/kde/pluginsbox.cpp:48 modules/gui/macosx/prefs.m:400
 msgid "Select"
 msgstr "Velg"
 
@@ -2998,7 +3856,7 @@ msgid "Selection"
 msgstr "Valg"
 
 #: modules/gui/gtk/gnome_interface.c:2436 modules/gui/gtk/gtk_interface.c:2857
-#: modules/gui/win32/strings.cpp:182 modules/gui/wxwindows/playlist.cpp:137
+#: modules/gui/win32/strings.cpp:182 modules/gui/wxwindows/playlist.cpp:148
 msgid "Duration"
 msgstr "Varighet"
 
@@ -3019,12 +3877,6 @@ msgstr "m:"
 msgid "h:"
 msgstr "h:"
 
-#: modules/gui/gtk/gnome_interface.c:2692 modules/gui/gtk/gtk_interface.c:2947
-#: modules/gui/kde/messages.cpp:8 modules/gui/macosx/intf.m:294
-#: modules/gui/macosx/intf.m:371 modules/gui/win32/strings.cpp:153
-msgid "Messages"
-msgstr "Beskjeder"
-
 #: modules/gui/gtk/gnome_interface.c:2796 modules/gui/gtk/gtk_interface.c:3051
 #, fuzzy
 msgid "Stream output (MRL)"
@@ -3036,12 +3888,16 @@ msgid "Destination Target: "
 msgstr "Stopp strøm"
 
 #: modules/gui/gtk/gnome_interface.c:2857 modules/gui/gtk/gtk_interface.c:3112
-#: modules/gui/win32/strings.cpp:227 modules/gui/wxwindows/streamout.cpp:271
+#: modules/gui/macosx/output.m:128 modules/gui/macosx/output.m:231
+#: modules/gui/macosx/output.m:290 modules/gui/win32/strings.cpp:227
+#: modules/gui/wxwindows/streamout.cpp:347
 msgid "UDP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/win32/strings.cpp:228 modules/gui/wxwindows/streamout.cpp:272
+#: modules/gui/macosx/output.m:129 modules/gui/macosx/output.m:241
+#: modules/gui/macosx/output.m:292 modules/gui/win32/strings.cpp:228
+#: modules/gui/wxwindows/streamout.cpp:348
 msgid "RTP"
 msgstr "RTP"
 
@@ -3068,7 +3924,8 @@ msgid "PS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/wxwindows/streamout.cpp:359
+#: modules/gui/macosx/output.m:135 modules/gui/macosx/output.m:273
+#: modules/gui/macosx/output.m:316
 msgid "AVI"
 msgstr ""
 
@@ -3087,6 +3944,7 @@ msgid "Gtk+ interface"
 msgstr "Standard grensesnitt: "
 
 #: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373
+#: modules/gui/gtk2/gtk2_interface.c:77
 msgid "_File"
 msgstr "_Fil"
 
@@ -3107,7 +3965,7 @@ msgstr "_Avslutt"
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: modules/gui/gtk/gtk_interface.c:268
+#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132
 msgid "_View"
 msgstr "_Vis"
 
@@ -3131,7 +3989,7 @@ msgstr "_Preferanser..."
 msgid "Configure the application"
 msgstr "Konfigurer programmet"
 
-#: modules/gui/gtk/gtk_interface.c:569
+#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -3155,24 +4013,7 @@ msgstr "Forfattere"
 msgid "the VideoLAN team <videolan@videolan.org>"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:1661 modules/gui/gtk/gtk_interface.c:2396
-#: modules/gui/gtk/gtk_interface.c:2638 modules/gui/gtk/gtk_interface.c:2869
-#: modules/gui/gtk/gtk_interface.c:2976 modules/gui/gtk/gtk_interface.c:3250
-#: modules/gui/gtk/preferences.c:605 modules/gui/macosx/prefs.m:582
-#: modules/gui/macosx/open.m:138 modules/gui/macosx/open.m:178
-#: modules/gui/win32/strings.cpp:13 modules/gui/win32/strings.cpp:26
-#: modules/gui/win32/strings.cpp:154 modules/gui/win32/strings.cpp:173
-#: modules/gui/win32/strings.cpp:183 modules/gui/win32/strings.cpp:214
-#: modules/gui/win32/strings.cpp:233 modules/gui/win32/strings.cpp:249
-#: modules/gui/wxwindows/open.cpp:232 modules/gui/wxwindows/fileinfo.cpp:98
-#: modules/gui/wxwindows/messages.cpp:103
-#: modules/gui/wxwindows/playlist.cpp:142
-#: modules/gui/wxwindows/preferences.cpp:249
-#: modules/gui/wxwindows/streamout.cpp:176
-msgid "OK"
-msgstr "OK"
-
-#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:144
+#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:150
 #, fuzzy
 msgid "Open Target"
 msgstr "Stopp strøm"
@@ -3207,13 +4048,14 @@ msgstr "Standard output:"
 
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
-#: modules/gui/gtk/preferences.c:617 modules/gui/macosx/prefs.m:586
-#: modules/gui/macosx/prefs.m:739 modules/gui/macosx/open.m:139
-#: modules/gui/win32/strings.cpp:27 modules/gui/win32/strings.cpp:174
-#: modules/gui/win32/strings.cpp:215 modules/gui/win32/strings.cpp:234
-#: modules/gui/win32/strings.cpp:250 modules/gui/wxwindows/open.cpp:234
-#: modules/gui/wxwindows/preferences.cpp:251
-#: modules/gui/wxwindows/streamout.cpp:178
+#: modules/gui/gtk/preferences.c:617 modules/gui/macosx/open.m:139
+#: modules/gui/macosx/prefs.m:591 modules/gui/win32/strings.cpp:27
+#: modules/gui/win32/strings.cpp:174 modules/gui/win32/strings.cpp:215
+#: modules/gui/win32/strings.cpp:234 modules/gui/win32/strings.cpp:250
+#: modules/gui/wxwindows/open.cpp:265
+#: modules/gui/wxwindows/preferences.cpp:253
+#: modules/gui/wxwindows/streamout.cpp:197
+#: modules/gui/wxwindows/subtitles.cpp:152
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -3245,12 +4087,6 @@ msgstr "_Invertert"
 msgid "_Select"
 msgstr "_Valgt"
 
-#: modules/gui/gtk/menu.c:733 modules/gui/macosx/prefs.m:402
-#: modules/gui/macosx/prefs.m:431 modules/gui/macosx/prefs.m:673
-#: modules/gui/macosx/prefs.m:702
-msgid "None"
-msgstr ""
-
 #: modules/gui/gtk/menu.c:900
 #, fuzzy, c-format
 msgid "Title %d (%d)"
@@ -3261,12 +4097,7 @@ msgstr "Tittel: "
 msgid "Chapter %d"
 msgstr "Kapittel"
 
-#: modules/gui/gtk/preferences.c:325 modules/gui/kde/pluginsbox.cpp:46
-#, fuzzy
-msgid "Description"
-msgstr "Varighet"
-
-#: modules/gui/gtk/preferences.c:371 modules/gui/macosx/prefs.m:382
+#: modules/gui/gtk/preferences.c:371 modules/gui/macosx/prefs.m:383
 msgid "Configure"
 msgstr ""
 
@@ -3275,27 +4106,59 @@ msgstr ""
 msgid "Selected:"
 msgstr "Valgte"
 
-#: modules/gui/gtk/preferences.c:596 modules/gui/gtk/preferences.c:613
-#: modules/gui/win32/strings.cpp:213 modules/gui/wxwindows/preferences.cpp:252
+#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
 #, fuzzy
-msgid "Save"
-msgstr "Tjener"
+msgid "Gtk2 interface"
+msgstr "Standard grensesnitt: "
 
-#: modules/gui/gtk/preferences.c:609 modules/gui/macosx/prefs.m:590
-#: modules/gui/macosx/prefs.m:804 modules/gui/macosx/prefs.m:822
-#: modules/gui/win32/strings.cpp:212
-msgid "Apply"
-msgstr "Bruk"
+#: modules/gui/gtk2/gnome2_interface.c:31
+#, fuzzy
+msgid "_New"
+msgstr "_Vis"
 
-#: modules/gui/kde/interface.cpp:88
-msgid "Languages"
+#: modules/gui/gtk2/gnome2_interface.c:87
+msgid "gnome2"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:112
+msgid "button4"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:122
+#: modules/gui/gtk2/gtk2_interface.c:183
+msgid "button3"
 msgstr ""
 
-#: modules/gui/kde/interface.cpp:93 modules/gui/macosx/intf.m:360
-#: modules/gui/macosx/intf.m:361 modules/gui/win32/strings.cpp:87
+#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:328
 #, fuzzy
-msgid "Subtitles"
-msgstr "_Teksting"
+msgid "Save File"
+msgstr "Velg fil"
+
+#: modules/gui/gtk2/gtk2_interface.c:67
+msgid "window1"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:109
+#, fuzzy
+msgid "_Edit"
+msgstr "_Avslutt"
+
+#: modules/gui/gtk2/gtk2_interface.c:146
+#, fuzzy
+msgid "_About"
+msgstr "Om"
+
+#: modules/gui/gtk2/gtk2_interface.c:163
+msgid "button1"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:173
+msgid "button2"
+msgstr ""
+
+#: modules/gui/kde/interface.cpp:88
+msgid "Languages"
+msgstr ""
 
 #: modules/gui/kde/interface.cpp:137
 msgid "Stream info..."
@@ -3319,269 +4182,270 @@ msgstr "Standard grensesnitt: "
 msgid "Messages:"
 msgstr "Beskjeder"
 
-#: modules/gui/macosx/intf.m:277
-msgid "VLC - Controller"
+#: modules/gui/kde/preferences.cpp:95
+#: modules/gui/wxwindows/preferences.cpp:395
+msgid "Plugins"
+msgstr ""
+
+#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:315
+msgid "About VLC media player"
+msgstr ""
+
+#: modules/gui/macosx/controls.m:344 modules/gui/macosx/controls.m:487
+#: modules/gui/macosx/intf.m:366
+msgid "Half Size"
+msgstr ""
+
+#: modules/gui/macosx/controls.m:346 modules/gui/macosx/controls.m:488
+#: modules/gui/macosx/intf.m:367
+msgid "Normal Size"
+msgstr ""
+
+#: modules/gui/macosx/controls.m:348 modules/gui/macosx/controls.m:489
+#: modules/gui/macosx/intf.m:368
+msgid "Double Size"
+msgstr ""
+
+#: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:491
+#: modules/gui/macosx/controls.m:498 modules/gui/macosx/controls.m:520
+#: modules/gui/macosx/intf.m:371
+msgid "Float On Top"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:282 modules/gui/macosx/intf.m:326
-#: modules/gui/macosx/intf.m:385 modules/gui/macosx/controls.m:442
+#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:490
+#: modules/gui/macosx/intf.m:369
+#, fuzzy
+msgid "Fit To Screen"
+msgstr "Fullskjerm"
+
+#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:298
+#: modules/gui/macosx/intf.m:342 modules/gui/macosx/intf.m:401
 #, fuzzy
 msgid "Previous"
 msgstr "Forrige fil"
 
-#: modules/gui/macosx/intf.m:283 modules/gui/macosx/intf.m:325
-#: modules/gui/macosx/controls.m:422
-#, fuzzy
-msgid "Slower"
-msgstr "Sakte"
+#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:344
+msgid "Loop"
+msgstr ""
+
+#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:345
+msgid "Step Forward"
+msgstr ""
 
-#: modules/gui/macosx/intf.m:286 modules/gui/macosx/intf.m:324
-#: modules/gui/macosx/controls.m:421
+#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:346
 #, fuzzy
-msgid "Faster"
-msgstr "Fort"
+msgid "Step Backward"
+msgstr "Gå tilbake"
+
+#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:386
+#: modules/gui/macosx/intf.m:410
+msgid "Info"
+msgstr ""
+
+#: modules/gui/macosx/intf.m:293
+msgid "VLC - Controller"
+msgstr ""
 
-#: modules/gui/macosx/intf.m:289
+#: modules/gui/macosx/intf.m:305
 msgid "Volume"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:290
+#: modules/gui/macosx/intf.m:306
 #, fuzzy
 msgid "Position"
 msgstr "_Navigasjon"
 
-#: modules/gui/macosx/intf.m:296
+#: modules/gui/macosx/intf.m:312
 msgid "Open CrashLog"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:299
-msgid "About VLC media player"
-msgstr ""
-
-#: modules/gui/macosx/intf.m:300 modules/gui/win32/strings.cpp:126
+#: modules/gui/macosx/intf.m:316 modules/gui/win32/strings.cpp:126
 #, fuzzy
 msgid "Preferences..."
 msgstr "_Preferanser..."
 
-#: modules/gui/macosx/intf.m:301
+#: modules/gui/macosx/intf.m:317
 msgid "Hide VLC"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:302
+#: modules/gui/macosx/intf.m:318
 #, fuzzy
 msgid "Hide Others"
 msgstr "_Gjem grensesnitt"
 
-#: modules/gui/macosx/intf.m:303
+#: modules/gui/macosx/intf.m:319
 msgid "Show All"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:304
+#: modules/gui/macosx/intf.m:320
 #, fuzzy
 msgid "Quit VLC"
 msgstr "Om"
 
-#: modules/gui/macosx/intf.m:306
+#: modules/gui/macosx/intf.m:322
 #, fuzzy
 msgid "1:File"
 msgstr "Fil"
 
-#: modules/gui/macosx/intf.m:307
+#: modules/gui/macosx/intf.m:323
 #, fuzzy
 msgid "Open..."
 msgstr "Åpne fil"
 
-#: modules/gui/macosx/intf.m:308 modules/gui/win32/strings.cpp:90
+#: modules/gui/macosx/intf.m:324 modules/gui/win32/strings.cpp:90
 #, fuzzy
 msgid "Open File..."
 msgstr "_Åpne fil..."
 
-#: modules/gui/macosx/intf.m:309 modules/gui/win32/strings.cpp:91
+#: modules/gui/macosx/intf.m:325 modules/gui/win32/strings.cpp:91
 #, fuzzy
 msgid "Open Disc..."
 msgstr "Åpne en _disk"
 
-#: modules/gui/macosx/intf.m:310
+#: modules/gui/macosx/intf.m:326
 #, fuzzy
 msgid "Open Network..."
 msgstr "Åpne nettverk"
 
-#: modules/gui/macosx/intf.m:311
+#: modules/gui/macosx/intf.m:327
 #, fuzzy
 msgid "Open Recent"
 msgstr "Stopp strøm"
 
-#: modules/gui/macosx/intf.m:312 modules/gui/macosx/intf.m:1342
+#: modules/gui/macosx/intf.m:328 modules/gui/macosx/intf.m:1295
 msgid "Clear Menu"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:314
-#, fuzzy
-msgid "Edit"
-msgstr "_Avslutt"
-
-#: modules/gui/macosx/intf.m:315
+#: modules/gui/macosx/intf.m:331
 msgid "Cut"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:316
+#: modules/gui/macosx/intf.m:332
 #, fuzzy
 msgid "Copy"
 msgstr "Crop?"
 
-#: modules/gui/macosx/intf.m:317
+#: modules/gui/macosx/intf.m:333
 #, fuzzy
 msgid "Paste"
 msgstr "Pause"
 
-#: modules/gui/macosx/intf.m:318
+#: modules/gui/macosx/intf.m:334
 msgid "Clear"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:319 modules/gui/macosx/playlist.m:174
-#, fuzzy
-msgid "Select All"
-msgstr "Velg fil"
-
-#: modules/gui/macosx/intf.m:321 modules/gui/win32/strings.cpp:77
+#: modules/gui/macosx/intf.m:337 modules/gui/win32/strings.cpp:77
 msgid "Controls"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/controls.m:461
-msgid "Loop"
-msgstr ""
-
-#: modules/gui/macosx/intf.m:329 modules/gui/macosx/controls.m:468
-msgid "Step Forward"
-msgstr ""
-
-#: modules/gui/macosx/intf.m:330 modules/gui/macosx/controls.m:469
-#, fuzzy
-msgid "Step Backward"
-msgstr "Gå tilbake"
-
-#: modules/gui/macosx/intf.m:342 modules/gui/macosx/intf.m:343
+#: modules/gui/macosx/intf.m:358 modules/gui/macosx/intf.m:359
 #, fuzzy
 msgid "Audio Track"
 msgstr "Lyd"
 
-#: modules/gui/macosx/intf.m:350 modules/gui/macosx/controls.m:344
-#: modules/gui/macosx/controls.m:487
-msgid "Half Size"
-msgstr ""
-
-#: modules/gui/macosx/intf.m:351 modules/gui/macosx/controls.m:346
-#: modules/gui/macosx/controls.m:488
-msgid "Normal Size"
-msgstr ""
-
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/controls.m:348
-#: modules/gui/macosx/controls.m:489
-msgid "Double Size"
-msgstr ""
-
-#: modules/gui/macosx/intf.m:353 modules/gui/macosx/controls.m:352
-#: modules/gui/macosx/controls.m:490
-#, fuzzy
-msgid "Fit To Screen"
-msgstr "Fullskjerm"
-
-#: modules/gui/macosx/intf.m:354 modules/gui/macosx/controls.m:342
-#: modules/gui/macosx/controls.m:486
-#, fuzzy
-msgid "Fullscreen"
-msgstr "_Fullskjerm"
-
-#: modules/gui/macosx/intf.m:355 modules/gui/macosx/controls.m:350
-#: modules/gui/macosx/controls.m:491 modules/gui/macosx/controls.m:498
-#: modules/gui/macosx/controls.m:520
-msgid "Float On Top"
-msgstr ""
-
-#: modules/gui/macosx/intf.m:356 modules/gui/macosx/intf.m:357
+#: modules/gui/macosx/intf.m:372 modules/gui/macosx/intf.m:373
 #, fuzzy
 msgid "Video Track"
 msgstr "Video"
 
-#: modules/gui/macosx/intf.m:365
-msgid "Window"
-msgstr ""
-
-#: modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:382
 msgid "Minimize Window"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:367
+#: modules/gui/macosx/intf.m:383
 #, fuzzy
 msgid "Close Window"
 msgstr "Åpne spilleliste-vinduet"
 
-#: modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/intf.m:384
 msgid "Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:370 modules/gui/macosx/intf.m:394
-msgid "Info"
-msgstr ""
-
-#: modules/gui/macosx/intf.m:373
+#: modules/gui/macosx/intf.m:389
 msgid "Bring All to Front"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:375
+#: modules/gui/macosx/intf.m:391
 #, fuzzy
 msgid "Help"
 msgstr "_Hjelp"
 
-#: modules/gui/macosx/intf.m:376
+#: modules/gui/macosx/intf.m:392
 #, fuzzy
 msgid "ReadMe..."
 msgstr "Beskjeder"
 
-#: modules/gui/macosx/intf.m:377
+#: modules/gui/macosx/intf.m:393
 msgid "Report a Bug"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:378
+#: modules/gui/macosx/intf.m:394
 msgid "VideoLAN Website"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:379
+#: modules/gui/macosx/intf.m:395
 msgid "License"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:388
+#: modules/gui/macosx/intf.m:404
 msgid "Error"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:389
+#: modules/gui/macosx/intf.m:405
 msgid ""
 "An error has occurred which probably prevented the execution of your request:"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:390
+#: modules/gui/macosx/intf.m:406
 msgid "If you believe that it is a bug, please follow the instructions at:"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:391
+#: modules/gui/macosx/intf.m:407
 #, fuzzy
 msgid "Open Messages Window"
 msgstr "Åpne spilleliste-vinduet"
 
-#: modules/gui/macosx/intf.m:392
+#: modules/gui/macosx/intf.m:408
 msgid "Dismiss"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1305
+#: modules/gui/macosx/intf.m:1258
 msgid "No CrashLog found"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1305
+#: modules/gui/macosx/intf.m:1258
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
 msgstr ""
 
+#: modules/gui/macosx/macosx.m:47
+#, fuzzy
+msgid "video device"
+msgstr "lydenhet"
+
+#: modules/gui/macosx/macosx.m:49
+msgid "opaqueness"
+msgstr ""
+
+#: modules/gui/macosx/macosx.m:51
+msgid ""
+"Set the transparency of the video output. 1 is non-transparent (default) 0 "
+"is fully transparent."
+msgstr ""
+
+#: modules/gui/macosx/macosx.m:54
+msgid "float on top"
+msgstr ""
+
+#: modules/gui/macosx/macosx.m:56
+msgid "Let the video window float on top of other windows."
+msgstr ""
+
+#: modules/gui/macosx/macosx.m:59
+msgid "MacOS X interface, sound and video"
+msgstr ""
+
 #: modules/gui/macosx/open.m:134
 #, fuzzy
 msgid "Open Source"
@@ -3592,36 +4456,101 @@ msgstr "Stopp str
 msgid "Only enqueue in playlist, do not play"
 msgstr "Legg til i kø som standard"
 
-#: modules/gui/macosx/open.m:146
-msgid "Treat as a pipe rather than as a file"
+#: modules/gui/macosx/open.m:146
+msgid "Treat as a pipe rather than as a file"
+msgstr ""
+
+#: modules/gui/macosx/open.m:154 modules/gui/macosx/open.m:370
+msgid "VIDEO_TS folder"
+msgstr ""
+
+#: modules/gui/macosx/open.m:170
+#, fuzzy
+msgid "Load subtitles file:"
+msgstr "_Teksting"
+
+#: modules/gui/macosx/open.m:173
+msgid "Override"
+msgstr ""
+
+#: modules/gui/macosx/open.m:332 modules/gui/macosx/open.m:511
+#: modules/gui/macosx/open.m:615 modules/gui/macosx/open.m:662
+#, fuzzy
+msgid "Open"
+msgstr "Åpne fil"
+
+#: modules/gui/macosx/open.m:415 modules/gui/macosx/open.m:467
+#: modules/gui/macosx/open.m:475
+msgid "No %@s found"
+msgstr ""
+
+#: modules/gui/macosx/open.m:510
+msgid "Open VIDEO_TS Directory"
+msgstr ""
+
+#: modules/gui/macosx/output.m:115
+#, fuzzy
+msgid "Advanced output:"
+msgstr "Lydeksport volum"
+
+#: modules/gui/macosx/output.m:119
+msgid "Output Options"
+msgstr ""
+
+#: modules/gui/macosx/output.m:122 modules/gui/macosx/output.m:210
+#: modules/gui/macosx/output.m:285
+#, fuzzy
+msgid "Stream"
+msgstr "Stopp strøm"
+
+#: modules/gui/macosx/output.m:126
+msgid "TTL"
+msgstr ""
+
+#: modules/gui/macosx/output.m:132 modules/gui/wxwindows/streamout.cpp:440
+msgid "Encapsulation Method"
+msgstr ""
+
+#: modules/gui/macosx/output.m:133
+msgid "MPEG TS"
+msgstr ""
+
+#: modules/gui/macosx/output.m:134 modules/gui/macosx/output.m:275
+#: modules/gui/macosx/output.m:314
+msgid "MPEG PS"
 msgstr ""
 
-#: modules/gui/macosx/open.m:154 modules/gui/macosx/open.m:370
-msgid "VIDEO_TS folder"
+#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:274
+#: modules/gui/macosx/output.m:318
+msgid "Ogg"
 msgstr ""
 
-#: modules/gui/macosx/open.m:170
+#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:276
+#: modules/gui/macosx/output.m:320
+msgid "mp4"
+msgstr ""
+
+#: modules/gui/macosx/output.m:139
 #, fuzzy
-msgid "Load subtitles file:"
-msgstr "_Teksting"
+msgid "Transcode options"
+msgstr "Pause strøm"
 
-#: modules/gui/macosx/open.m:173
-msgid "Override"
+#: modules/gui/macosx/output.m:149 modules/gui/macosx/output.m:153
+msgid "Bitrate (bps)"
 msgstr ""
 
-#: modules/gui/macosx/open.m:332 modules/gui/macosx/open.m:511
-#: modules/gui/macosx/open.m:615 modules/gui/macosx/open.m:661
+#: modules/gui/macosx/output.m:151
 #, fuzzy
-msgid "Open"
-msgstr "Åpne fil"
+msgid "mpga"
+msgstr "mpeg"
 
-#: modules/gui/macosx/open.m:415 modules/gui/macosx/open.m:467
-#: modules/gui/macosx/open.m:475
-msgid "No %@s found"
+#: modules/gui/macosx/output.m:152
+msgid "a52 "
 msgstr ""
 
-#: modules/gui/macosx/open.m:510
-msgid "Open VIDEO_TS Directory"
+#: modules/gui/macosx/prefs.m:599 modules/gui/macosx/prefs.m:803
+#: modules/gui/macosx/prefs.m:825
+msgid "Advanced"
 msgstr ""
 
 #: modules/gui/macosx/vout.m:191
@@ -3644,46 +4573,41 @@ msgstr "Dette framtvinger eksport av monolyd"
 msgid "Qt interface"
 msgstr "Standard grensesnitt: "
 
-#: modules/gui/win32/win32.cpp:302
-msgid "maximum number of lines in the log window"
-msgstr ""
+#: modules/gui/skins/src/skin_main.cpp:251
+#: modules/gui/skins/src/vlcproc.cpp:338
+#, fuzzy
+msgid "Open a skin file"
+msgstr "Åpne en fil"
 
-#: modules/gui/win32/win32.cpp:304
-msgid ""
-"You can set the maximum number of lines that the log window will display."
+#: modules/gui/skins/src/skin_main.cpp:292
+#: modules/gui/skins/src/skin_main.cpp:293
+msgid "Last skin actually used"
 msgstr ""
 
-#: modules/gui/win32/win32.cpp:305
-msgid " Enter -1 if you want to keep all messages."
+#: modules/gui/skins/src/skin_main.cpp:294
+#: modules/gui/skins/src/skin_main.cpp:295
+msgid "Config of last used skin"
 msgstr ""
 
-#: modules/gui/win32/win32.cpp:306
-msgid "display text under images in the toolbar"
+#: modules/gui/skins/src/skin_main.cpp:296
+#: modules/gui/skins/src/skin_main.cpp:297
+msgid "Show application in system tray"
 msgstr ""
 
-#: modules/gui/win32/win32.cpp:308
-#, fuzzy
-msgid "Check this option if you want to display the caption of the buttons in "
-msgstr "Hvis du vil bruke VideoLAN Channel Server skrur du på dette alternativet."
-
-#: modules/gui/win32/win32.cpp:309
-msgid "the toolbar. Beware, the display may be messed up"
+#: modules/gui/skins/src/skin_main.cpp:298
+#: modules/gui/skins/src/skin_main.cpp:299
+msgid "Show application in taskbar"
 msgstr ""
 
-#: modules/gui/win32/win32.cpp:317
+#: modules/gui/skins/src/skin_main.cpp:310
 #, fuzzy
-msgid "Native Windows interface"
-msgstr "Standard grensesnitt: "
+msgid "Skinnable Interface"
+msgstr "Grensesnitt"
 
 #: modules/gui/win32/strings.cpp:12
 msgid "Version x.y.z"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:19
-#, fuzzy
-msgid "Open Disc"
-msgstr "Åpne Disk"
-
 #: modules/gui/win32/strings.cpp:20
 #, fuzzy
 msgid "Device &name:"
@@ -3746,7 +4670,7 @@ msgstr "G
 msgid "0:00:00"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:47 modules/gui/wxwindows/interface.cpp:276
+#: modules/gui/win32/strings.cpp:47 modules/gui/wxwindows/interface.cpp:284
 #, fuzzy
 msgid "&File"
 msgstr "Fil"
@@ -3766,7 +4690,7 @@ msgstr "
 msgid "&Network stream..."
 msgstr "_Nettverksstrøm"
 
-#: modules/gui/win32/strings.cpp:51 modules/gui/wxwindows/interface.cpp:277
+#: modules/gui/win32/strings.cpp:51 modules/gui/wxwindows/interface.cpp:285
 #, fuzzy
 msgid "&View"
 msgstr "_Vis"
@@ -3776,7 +4700,7 @@ msgstr "_Vis"
 msgid "&Hide interface"
 msgstr "_Gjem grensesnitt"
 
-#: modules/gui/win32/strings.cpp:54 modules/gui/wxwindows/interface.cpp:252
+#: modules/gui/win32/strings.cpp:54 modules/gui/wxwindows/interface.cpp:255
 #, fuzzy
 msgid "&Playlist..."
 msgstr "Spilleliste..."
@@ -3834,12 +4758,12 @@ msgstr "Velg fil"
 msgid "&Language"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:72 modules/gui/wxwindows/interface.cpp:258
+#: modules/gui/win32/strings.cpp:72
 #, fuzzy
 msgid "&Subtitles"
 msgstr "_Teksting"
 
-#: modules/gui/win32/strings.cpp:74 modules/gui/wxwindows/interface.cpp:281
+#: modules/gui/win32/strings.cpp:74 modules/gui/wxwindows/interface.cpp:290
 #, fuzzy
 msgid "&Help"
 msgstr "_Hjelp"
@@ -3869,10 +4793,6 @@ msgstr "_Innstillinger"
 msgid "Video settings"
 msgstr "_Innstillinger"
 
-#: modules/gui/win32/strings.cpp:86
-msgid "Language"
-msgstr ""
-
 #: modules/gui/win32/strings.cpp:89
 #, fuzzy
 msgid "New stream"
@@ -4000,7 +4920,7 @@ msgstr ""
 msgid "Channel server"
 msgstr "Kanaltjener:"
 
-#: modules/gui/win32/strings.cpp:181 modules/gui/wxwindows/streamout.cpp:290
+#: modules/gui/win32/strings.cpp:181 modules/gui/wxwindows/streamout.cpp:368
 #, fuzzy
 msgid "Filename"
 msgstr "Fil"
@@ -4030,13 +4950,13 @@ msgstr "Nettverk"
 msgid "&Url"
 msgstr "Url"
 
-#: modules/gui/win32/strings.cpp:189 modules/gui/wxwindows/playlist.cpp:113
+#: modules/gui/win32/strings.cpp:189 modules/gui/wxwindows/playlist.cpp:124
 #, fuzzy
 msgid "&Delete"
 msgstr "Slett"
 
 #: modules/gui/win32/strings.cpp:190 modules/gui/win32/strings.cpp:191
-#: modules/gui/wxwindows/playlist.cpp:119
+#: modules/gui/wxwindows/playlist.cpp:130
 #, fuzzy
 msgid "&Selection"
 msgstr "Valg"
@@ -4115,185 +5035,217 @@ msgstr ""
 msgid "0.0"
 msgstr ""
 
-#: modules/gui/wxwindows/wxwindows.cpp:82
+#: modules/gui/win32/win32.cpp:302
+msgid "maximum number of lines in the log window"
+msgstr ""
+
+#: modules/gui/win32/win32.cpp:304
+msgid ""
+"You can set the maximum number of lines that the log window will display."
+msgstr ""
+
+#: modules/gui/win32/win32.cpp:305
+msgid " Enter -1 if you want to keep all messages."
+msgstr ""
+
+#: modules/gui/win32/win32.cpp:306
+msgid "display text under images in the toolbar"
+msgstr ""
+
+#: modules/gui/win32/win32.cpp:308
 #, fuzzy
-msgid "wxWindows interface module"
+msgid "Check this option if you want to display the caption of the buttons in "
+msgstr ""
+"Hvis du vil bruke VideoLAN Channel Server skrur du på dette alternativet."
+
+#: modules/gui/win32/win32.cpp:309
+msgid "the toolbar. Beware, the display may be messed up"
+msgstr ""
+
+#: modules/gui/win32/win32.cpp:317
+#, fuzzy
+msgid "Native Windows interface"
 msgstr "Standard grensesnitt: "
 
-#: modules/gui/wxwindows/interface.cpp:221
+#: modules/gui/wxwindows/fileinfo.cpp:77
+#, fuzzy
+msgid "FileInfo"
+msgstr "_Åpne fil..."
+
+#: modules/gui/wxwindows/interface.cpp:219
 #, fuzzy
 msgid "Open a DVD or (S)VCD"
 msgstr "Åpne en DVD eller VCD"
 
-#: modules/gui/wxwindows/interface.cpp:222
+#: modules/gui/wxwindows/interface.cpp:220
 #, fuzzy
 msgid "Open a network stream"
 msgstr "Velg en nettverksstrøm"
 
-#: modules/gui/wxwindows/interface.cpp:223
+#: modules/gui/wxwindows/interface.cpp:221
 #, fuzzy
 msgid "Open a satellite stream"
 msgstr "Åpne spilleliste-vinduet"
 
-#: modules/gui/wxwindows/interface.cpp:224
+#: modules/gui/wxwindows/interface.cpp:222
 msgid "Eject the DVD/CD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:225
+#: modules/gui/wxwindows/interface.cpp:223
 #, fuzzy
 msgid "Exit this program"
 msgstr "Avslutt programmet"
 
-#: modules/gui/wxwindows/interface.cpp:227
+#: modules/gui/wxwindows/interface.cpp:225
 #, fuzzy
 msgid "Open the playlist"
 msgstr "Åpne spilleliste-vinduet"
 
-#: modules/gui/wxwindows/interface.cpp:228
+#: modules/gui/wxwindows/interface.cpp:226
 #, fuzzy
 msgid "Show the program logs"
 msgstr "Avslutt programmet"
 
-#: modules/gui/wxwindows/interface.cpp:229
+#: modules/gui/wxwindows/interface.cpp:227
 msgid "Show information about the file being played"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:231
-msgid "Change the current audio track"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:232
-msgid "Change the current subtitles stream"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:233
+#: modules/gui/wxwindows/interface.cpp:229
 msgid "Go to the preferences menu"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:235
+#: modules/gui/wxwindows/interface.cpp:231
 #, fuzzy
 msgid "About this program"
 msgstr "Avslutt programmet"
 
-#: modules/gui/wxwindows/interface.cpp:239
+#: modules/gui/wxwindows/interface.cpp:235
 #, fuzzy
 msgid "&Open File..."
 msgstr "_Åpne fil..."
 
-#: modules/gui/wxwindows/interface.cpp:240
+#: modules/gui/wxwindows/interface.cpp:237
 #, fuzzy
 msgid "Open &Disc..."
 msgstr "Åpne en _disk"
 
-#: modules/gui/wxwindows/interface.cpp:241
+#: modules/gui/wxwindows/interface.cpp:239
 #, fuzzy
 msgid "&Network Stream..."
 msgstr "_Nettverksstrøm"
 
-#: modules/gui/wxwindows/interface.cpp:243
+#: modules/gui/wxwindows/interface.cpp:242
 #, fuzzy
 msgid "&Satellite Stream..."
 msgstr "_Nettverksstrøm"
 
-#: modules/gui/wxwindows/interface.cpp:246
+#: modules/gui/wxwindows/interface.cpp:247
 #, fuzzy
 msgid "&Eject Disc"
 msgstr "Løs ut disk"
 
-#: modules/gui/wxwindows/interface.cpp:248
+#: modules/gui/wxwindows/interface.cpp:251
 #, fuzzy
 msgid "E&xit"
 msgstr "_Avslutt"
 
-#: modules/gui/wxwindows/interface.cpp:253
+#: modules/gui/wxwindows/interface.cpp:257
 #, fuzzy
 msgid "&Logs..."
 msgstr "Åpne en _disk"
 
-#: modules/gui/wxwindows/interface.cpp:254
+#: modules/gui/wxwindows/interface.cpp:258
 #, fuzzy
 msgid "&File info..."
 msgstr "_Åpne fil..."
 
-#: modules/gui/wxwindows/interface.cpp:260
+#: modules/gui/wxwindows/interface.cpp:263
 #, fuzzy
 msgid "&Preferences..."
 msgstr "_Preferanser..."
 
-#: modules/gui/wxwindows/interface.cpp:272
+#: modules/gui/wxwindows/interface.cpp:280
 #, fuzzy
 msgid "&About..."
 msgstr "_Om..."
 
-#: modules/gui/wxwindows/interface.cpp:278
+#: modules/gui/wxwindows/interface.cpp:286
 #, fuzzy
 msgid "&Settings"
 msgstr "_Innstillinger"
 
-#: modules/gui/wxwindows/interface.cpp:279
-#: modules/gui/wxwindows/interface.cpp:422
-#: modules/gui/wxwindows/interface.cpp:445
+#: modules/gui/wxwindows/interface.cpp:287
+#: modules/gui/wxwindows/interface.cpp:453
+#: modules/gui/wxwindows/interface.cpp:501
 #, fuzzy
 msgid "&Audio"
 msgstr "Lyd"
 
-#: modules/gui/wxwindows/interface.cpp:280
-#: modules/gui/wxwindows/interface.cpp:435
-#: modules/gui/wxwindows/interface.cpp:449
+#: modules/gui/wxwindows/interface.cpp:288
+#: modules/gui/wxwindows/interface.cpp:472
+#: modules/gui/wxwindows/interface.cpp:505
 #, fuzzy
 msgid "&Video"
 msgstr "Video"
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:289
+#: modules/gui/wxwindows/interface.cpp:491
+#: modules/gui/wxwindows/interface.cpp:509
+#, fuzzy
+msgid "&Navigation"
+msgstr "_Navigasjon"
+
+#: modules/gui/wxwindows/interface.cpp:306
 #, fuzzy
 msgid "Stop current playlist item"
 msgstr "Åpne spilleliste-vinduet"
 
-#: modules/gui/wxwindows/interface.cpp:298
+#: modules/gui/wxwindows/interface.cpp:307
 msgid "Play current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:299
+#: modules/gui/wxwindows/interface.cpp:308
 msgid "Pause current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:300
+#: modules/gui/wxwindows/interface.cpp:309
+#: modules/gui/wxwindows/playlist.cpp:351
 #, fuzzy
 msgid "Open playlist"
 msgstr "Åpne Spilleliste"
 
-#: modules/gui/wxwindows/interface.cpp:301
+#: modules/gui/wxwindows/interface.cpp:310
 #, fuzzy
 msgid "Previous playlist item"
 msgstr "Forrige fil"
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:311
 #, fuzzy
 msgid "Next playlist item"
 msgstr "Åpne spilleliste-vinduet"
 
-#: modules/gui/wxwindows/interface.cpp:476
+#: modules/gui/wxwindows/interface.cpp:537
 #, fuzzy
 msgid ""
 " (wxWindows interface)\n"
 "\n"
 msgstr "Standard grensesnitt: "
 
-#: modules/gui/wxwindows/interface.cpp:477
+#: modules/gui/wxwindows/interface.cpp:538
 #, fuzzy
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
 msgstr "© 1996-2003 the VideoLAN team"
 
-#: modules/gui/wxwindows/interface.cpp:478
+#: modules/gui/wxwindows/interface.cpp:539
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:480
+#: modules/gui/wxwindows/interface.cpp:541
 #, fuzzy
 msgid ""
 "This is the VideoLAN Client, a DVD, MPEG and DivX player.\n"
@@ -4302,174 +5254,214 @@ msgstr ""
 "Dette er VideoLAN client, en DVD, MPEG og DivX spiller. Den kan spille MPEG "
 "og MPEG 2 filer fra en fil eller en nettverkskilde"
 
-#: modules/gui/wxwindows/interface.cpp:484
+#: modules/gui/wxwindows/interface.cpp:545
 #, fuzzy, c-format
 msgid "About %s"
 msgstr "Om"
 
-#: modules/gui/wxwindows/open.cpp:167 modules/gui/wxwindows/streamout.cpp:158
+#: modules/gui/wxwindows/menus.cpp:107
+#, fuzzy
+msgid "Audio menu"
+msgstr "_Innstillinger"
+
+#: modules/gui/wxwindows/menus.cpp:123
+#, fuzzy
+msgid "Video menu"
+msgstr "_Innstillinger"
+
+#: modules/gui/wxwindows/menus.cpp:137
+msgid "Input menu"
+msgstr ""
+
+#: modules/gui/wxwindows/menus.cpp:311
+msgid "Empty"
+msgstr ""
+
+#: modules/gui/wxwindows/messages.cpp:107
+msgid "Verbose"
+msgstr ""
+
+#: modules/gui/wxwindows/open.cpp:173
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
-"controls below"
+"controls below."
+msgstr ""
+
+#: modules/gui/wxwindows/open.cpp:190 modules/gui/wxwindows/subtitles.cpp:98
+#, fuzzy
+msgid "Subtitles file"
+msgstr "_Teksting"
+
+#: modules/gui/wxwindows/open.cpp:191
+msgid "Load an additional subtitles file. Currently only works with AVI files."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:185
+#: modules/gui/wxwindows/open.cpp:214
 msgid "Use VLC as a stream server"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:204
+#: modules/gui/wxwindows/open.cpp:234
 #, fuzzy
 msgid "Capture input stream"
 msgstr "Pause strøm"
 
-#: modules/gui/wxwindows/open.cpp:206
+#: modules/gui/wxwindows/open.cpp:236
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:320
+#: modules/gui/wxwindows/open.cpp:352
 msgid "DVD (menus support)"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:684 modules/gui/wxwindows/streamout.cpp:545
+#: modules/gui/wxwindows/open.cpp:757 modules/gui/wxwindows/streamout.cpp:728
 #, fuzzy
 msgid "Save file"
 msgstr "Velg fil"
 
-#: modules/gui/wxwindows/menus.cpp:106
-#, fuzzy
-msgid "Audio menu"
-msgstr "_Innstillinger"
-
-#: modules/gui/wxwindows/menus.cpp:122
-#, fuzzy
-msgid "Video menu"
-msgstr "_Innstillinger"
-
-#: modules/gui/wxwindows/menus.cpp:136
-msgid "Input menu"
-msgstr ""
-
-#: modules/gui/wxwindows/menus.cpp:162
-msgid "Close"
-msgstr ""
-
-#: modules/gui/wxwindows/menus.cpp:283
-msgid "Empty"
-msgstr ""
-
-#: modules/gui/wxwindows/messages.cpp:108
-msgid "Verbose"
+#: modules/gui/wxwindows/playlist.cpp:115
+msgid "&Add MRL..."
 msgstr ""
 
-#: modules/gui/wxwindows/playlist.cpp:105
-msgid "Add &Url..."
-msgstr ""
+#: modules/gui/wxwindows/playlist.cpp:116
+#, fuzzy
+msgid "&Open Playlist..."
+msgstr "Åpne Spilleliste"
 
-#: modules/gui/wxwindows/playlist.cpp:106
-msgid "Add &Directory..."
-msgstr ""
+#: modules/gui/wxwindows/playlist.cpp:117
+#, fuzzy
+msgid "&Save Playlist..."
+msgstr "Spilleliste..."
 
-#: modules/gui/wxwindows/playlist.cpp:108
+#: modules/gui/wxwindows/playlist.cpp:119
 msgid "&Close"
 msgstr ""
 
-#: modules/gui/wxwindows/playlist.cpp:112
+#: modules/gui/wxwindows/playlist.cpp:123
 #, fuzzy
 msgid "&Invert"
 msgstr "&Inverter"
 
-#: modules/gui/wxwindows/playlist.cpp:114
+#: modules/gui/wxwindows/playlist.cpp:125
 #, fuzzy
 msgid "&Select All"
 msgstr "Velg fil"
 
-#: modules/gui/wxwindows/playlist.cpp:118
+#: modules/gui/wxwindows/playlist.cpp:129
 #, fuzzy
 msgid "&Manage"
 msgstr "_Vinkel"
 
-#: modules/gui/wxwindows/playlist.cpp:193
+#: modules/gui/wxwindows/playlist.cpp:226
 msgid "no info"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:376
-msgid "Plugins"
+#: modules/gui/wxwindows/playlist.cpp:330
+#, fuzzy
+msgid "Save playlist"
+msgstr "Åpne Spilleliste"
+
+#: modules/gui/wxwindows/preferences.cpp:256
+#, fuzzy
+msgid "Reset All"
+msgstr "Velg fil"
+
+#: modules/gui/wxwindows/preferences.cpp:313
+msgid ""
+"Beware this will reset your VLC Media Player config file.\n"
+"Are you sure you want to continue?"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:608
+#: modules/gui/wxwindows/preferences.cpp:315
+msgid "Reset config file"
+msgstr ""
+
+#: modules/gui/wxwindows/preferences.cpp:718
 #, fuzzy
 msgid "Default"
 msgstr "Slett"
 
-#: modules/gui/wxwindows/preferences.cpp:733
+#: modules/gui/wxwindows/preferences.cpp:844
 msgid "No configuration options available"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:754
+#: modules/gui/wxwindows/preferences.cpp:865
 msgid "Advanced..."
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:150
+#: modules/gui/wxwindows/streamout.cpp:166
 #, fuzzy
 msgid "Stream output MRL"
 msgstr "Standard output:"
 
-#: modules/gui/wxwindows/streamout.cpp:154
+#: modules/gui/wxwindows/streamout.cpp:170
 #, fuzzy
 msgid "Destination Target:"
 msgstr "Stopp strøm"
 
-#: modules/gui/wxwindows/streamout.cpp:263
-msgid "Output Method"
+#: modules/gui/wxwindows/streamout.cpp:173
+msgid ""
+"You can use this field directly by typing the full MRL you want to open.\n"
+"Alternatively, the field will be filled automatically when you use the "
+"controls below"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:351
-msgid "Encapsulation Method"
+#: modules/gui/wxwindows/streamout.cpp:338
+msgid "Output Methods"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:357
-msgid "MPEG TS"
-msgstr ""
+#: modules/gui/wxwindows/streamout.cpp:344
+#, fuzzy
+msgid "Play locally"
+msgstr "Spill saktere"
 
-#: modules/gui/wxwindows/streamout.cpp:358
-msgid "MPEG PS"
-msgstr ""
+#: modules/gui/wxwindows/streamout.cpp:478
+#, fuzzy
+msgid "Transcoding options"
+msgstr "vis avanserte alternativer"
 
-#: modules/gui/wxwindows/streamout.cpp:360
-msgid "Ogg"
+#: modules/gui/wxwindows/streamout.cpp:511
+#, fuzzy
+msgid "Video codec"
+msgstr "lydenhet"
+
+#: modules/gui/wxwindows/streamout.cpp:517
+#: modules/gui/wxwindows/streamout.cpp:556
+msgid "Bitrate (kb/s)"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:251
-#: modules/gui/skins/src/vlcproc.cpp:338
+#: modules/gui/wxwindows/streamout.cpp:550
 #, fuzzy
-msgid "Open a skin file"
-msgstr "Åpne en fil"
+msgid "Audio codec"
+msgstr "Standard grensesnitt: "
 
-#: modules/gui/skins/src/skin_main.cpp:292
-#: modules/gui/skins/src/skin_main.cpp:293
-msgid "Last skin actually used"
-msgstr ""
+#: modules/gui/wxwindows/subtitles.cpp:83
+#, fuzzy
+msgid "Open Subtitles File"
+msgstr "Velg teksting kanal"
 
-#: modules/gui/skins/src/skin_main.cpp:294
-#: modules/gui/skins/src/skin_main.cpp:295
-msgid "Config of last used skin"
-msgstr ""
+#: modules/gui/wxwindows/subtitles.cpp:115
+#, fuzzy
+msgid "Subtitles options"
+msgstr "_Teksting"
 
-#: modules/gui/skins/src/skin_main.cpp:296
-#: modules/gui/skins/src/skin_main.cpp:297
-msgid "Show application in system tray"
+#: modules/gui/wxwindows/subtitles.cpp:119
+#, fuzzy
+msgid "Delay subtitles (in 1/10s)"
+msgstr "Velg teksting kanal"
+
+#: modules/gui/wxwindows/subtitles.cpp:130
+msgid "Frames per second"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:298
-#: modules/gui/skins/src/skin_main.cpp:299
-msgid "Show application in taskbar"
+#: modules/gui/wxwindows/subtitles.cpp:138
+msgid "Override frames per second. It will only work with MicroDVD subtitles."
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:310
+#: modules/gui/wxwindows/wxwindows.cpp:82
 #, fuzzy
-msgid "Skinnable Interface"
-msgstr "Grensesnitt"
+msgid "wxWindows interface module"
+msgstr "Standard grensesnitt: "
 
 #: modules/misc/dummy/dummy.c:37
 msgid "dummy image chroma format"
@@ -4596,10 +5588,6 @@ msgstr ""
 msgid "Qt Embedded GUI helper"
 msgstr "Standard grensesnitt: "
 
-#: modules/misc/sap.c:131
-msgid "SAP"
-msgstr ""
-
 #: modules/misc/sap.c:134
 #, fuzzy
 msgid "SAP interface"
@@ -4978,6 +5966,10 @@ msgstr ""
 msgid "DirectX video output"
 msgstr "DirectX videomodul"
 
+#: modules/video_output/encoder.c:53
+msgid "Encoder wrapper"
+msgstr ""
+
 #: modules/video_output/fb.c:68
 msgid "Frame Buffer"
 msgstr ""
@@ -5047,7 +6039,9 @@ msgstr "QT Embedded skjermnavn"
 msgid ""
 "Specify the Qt Embedded hardware display you want to use. By default VLC "
 "will use the value of the DISPLAY environment variable."
-msgstr "Oppgi hvilket Qt Embedded hardware skjerm du ønsker å bruke. Standardvalget til VLC er å bruke verdien fra miljøvariabelen DISPLAY."
+msgstr ""
+"Oppgi hvilket Qt Embedded hardware skjerm du ønsker å bruke. Standardvalget "
+"til VLC er å bruke verdien fra miljøvariabelen DISPLAY."
 
 #: modules/video_output/qte/qte.cpp:115
 #, fuzzy
@@ -5094,7 +6088,9 @@ msgstr "XVideo tilkoblingsnummer"
 msgid ""
 "If you graphics card provides several adaptors, this option allows you to "
 "choose which one will be used (you shouldn't have to change this)."
-msgstr "Hvis grafikkortet støtter flere tilkoblinger, kan du velge hvilken som skal brukes med dette alternativet (det skal ikke være nødvendig å bytte dette)."
+msgstr ""
+"Hvis grafikkortet støtter flere tilkoblinger, kan du velge hvilken som skal "
+"brukes med dette alternativet (det skal ikke være nødvendig å bytte dette)."
 
 #: modules/video_output/x11/xvideo.c:63
 msgid "XVimage chroma format"
@@ -5104,7 +6100,9 @@ msgstr "XVimage chroma format"
 msgid ""
 "Force the XVideo renderer to use a specific chroma format instead of trying "
 "to improve performances by using the most efficient one."
-msgstr "Krev at XVideo-gjengiveren skal bruke et bestemt chroma format, i stedet for å forsøke å forbedre yttelsen ved å benytte det mest effektive."
+msgstr ""
+"Krev at XVideo-gjengiveren skal bruke et bestemt chroma format, i stedet for "
+"å forsøke å forbedre yttelsen ved å benytte det mest effektive."
 
 #: modules/video_output/x11/xvideo.c:73
 msgid "XVideo"
@@ -5160,6 +6158,10 @@ msgstr "XOSD modul"
 msgid "xosd interface"
 msgstr "xosd modulgrensesnitt"
 
+#, fuzzy
+#~ msgid "Translation"
+#~ msgstr "oversettelse"
+
 #~ msgid "This option allows you to enable the translation of the interface."
 #~ msgstr "Dette valget lar deg skru på oversettelse av grensesnittet"
 
@@ -5168,7 +6170,8 @@ msgstr "xosd modulgrensesnitt"
 #~ msgstr "Nettverkskanal:"
 
 #~ msgid "Activate this option if you want to use the VideoLAN Channel Server."
-#~ msgstr "Hvis du vil bruke VideoLAN Channel Server skrur du på dette alternativet."
+#~ msgstr ""
+#~ "Hvis du vil bruke VideoLAN Channel Server skrur du på dette alternativet."
 
 #, fuzzy
 #~ msgid "channel server address"
@@ -5191,7 +6194,9 @@ msgstr "xosd modulgrensesnitt"
 #~ msgid ""
 #~ "If you have several interfaces on your Linux machine and use the VLAN "
 #~ "solution, you may indicate here which interface to use."
-#~ msgstr "Hvis du har flere nettverksgrensesnitt i Linux-maskinen din og bruker VLAN-løsningen, kan du skrive hvilket som skal brukes her."
+#~ msgstr ""
+#~ "Hvis du har flere nettverksgrensesnitt i Linux-maskinen din og bruker "
+#~ "VLAN-løsningen, kan du skrive hvilket som skal brukes her."
 
 #, fuzzy
 #~ msgid "Network Channel:"
@@ -5201,14 +6206,6 @@ msgstr "xosd modulgrensesnitt"
 #~ msgid "Stream output:"
 #~ msgstr "Standard output:"
 
-#, fuzzy
-#~ msgid "Save File"
-#~ msgstr "Velg fil"
-
-#, fuzzy
-#~ msgid "Open subtitle file"
-#~ msgstr "Velg teksting kanal"
-
 #~ msgid "Screen %d"
 #~ msgstr "Fullskjerm %d"
 
@@ -5276,10 +6273,6 @@ msgstr "xosd modulgrensesnitt"
 #~ msgid "Group"
 #~ msgstr "Crop?"
 
-#, fuzzy
-#~ msgid "SAP interface module"
-#~ msgstr "Standard grensesnitt: "
-
 #, fuzzy
 #~ msgid "image crop video module"
 #~ msgstr "Standard grensesnitt: "