Flush this

1 files changed, 813 insertions, 608 deletions

diff --git a/po/no.po b/po/no.po
index d37f85cce..9b23fd981 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: galeon 0.7.2\n"
-"POT-Creation-Date: 2003-04-29 22:21+0200\n"
+"POT-Creation-Date: 2003-05-14 10:43+0200\n"
 "PO-Revision-Date: 2003-04-29 22:22+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -31,205 +31,215 @@ msgid "Web Browser"
 msgstr "Epiphany nettleser"
 
 #: data/epiphany.schemas.in.h:1
+msgid ""
+"Address of the user's home page that is displayed when opening a new window "
+"or tab"
+msgstr ""
+
+#: data/epiphany.schemas.in.h:2
 msgid "Allow Java"
 msgstr "Tillat Java"
 
-#: data/epiphany.schemas.in.h:2
+#: data/epiphany.schemas.in.h:3
 msgid "Allow Java."
 msgstr "Tillat Java."
 
-#: data/epiphany.schemas.in.h:3
+#: data/epiphany.schemas.in.h:4
 msgid "Allow JavaScript"
 msgstr "Tillat JavaScript"
 
-#: data/epiphany.schemas.in.h:4
+#: data/epiphany.schemas.in.h:5
 msgid "Allow JavaScript."
 msgstr "Tillat JavaScript."
 
-#: data/epiphany.schemas.in.h:5
+#: data/epiphany.schemas.in.h:6
 msgid "Allow popups"
 msgstr "Tillat popups"
 
-#: data/epiphany.schemas.in.h:6
+#: data/epiphany.schemas.in.h:7
 msgid ""
 "Allow sites to open new windows using JavaScript (if JavaScript is enabled)."
 msgstr ""
 "Tillat nettsteder å åpne nye vinduer ved bruk av JavaScript (hvis JavaScript "
 "er aktivert)."
 
-#: data/epiphany.schemas.in.h:7
+#: data/epiphany.schemas.in.h:8
 msgid "Autowrap for find in page"
 msgstr ""
 
-#: data/epiphany.schemas.in.h:8
+# (ugh)
+#: data/epiphany.schemas.in.h:9
+#, fuzzy
+msgid "Cookie accept"
+msgstr "Egenskaper for informasjonskapsel"
+
+#: data/epiphany.schemas.in.h:10
 msgid "Default charset"
 msgstr "Forvalgt tegnsett"
 
-#: data/epiphany.schemas.in.h:9
+#: data/epiphany.schemas.in.h:11
 msgid "Default charset."
 msgstr "Forvalgt tegnsett."
 
-#: data/epiphany.schemas.in.h:10
+#: data/epiphany.schemas.in.h:12
 msgid "Default color for unvisited links in #RRGGBB hex format."
 msgstr ""
 "Forvalgt farge for lenker som ikke er vist i #RRGGBB heksadesimalt format."
 
-#: data/epiphany.schemas.in.h:11
+#: data/epiphany.schemas.in.h:13
 msgid "Default color for visited links in #RRGGBB hex format."
 msgstr "Forvalgt farge for lenker som er vist i #RRGGBB heksadesimalt format."
 
-#: data/epiphany.schemas.in.h:12
+#: data/epiphany.schemas.in.h:14
 msgid "Default font type"
 msgstr "Forvalgt skrifttype"
 
-#: data/epiphany.schemas.in.h:13
+#: data/epiphany.schemas.in.h:15
 msgid "Default font type. Possible values are 0 (serif), 1 (sans-serif)"
 msgstr "Forvalgt skrift. Mulige verdier er 0 (serif) og 1 (sans-serif)"
 
-#: data/epiphany.schemas.in.h:14
+#: data/epiphany.schemas.in.h:16
 msgid "Default page background color"
 msgstr "Forvalgt bakgrunnsfarge for siden"
 
-#: data/epiphany.schemas.in.h:15
+#: data/epiphany.schemas.in.h:17
 msgid "Default page background color in #RRGGBB hex format."
 msgstr "Forvalgt bakgrunnsfarge for sider i #RRGGBB heksadesimalt format."
 
-#: data/epiphany.schemas.in.h:16
+#: data/epiphany.schemas.in.h:18
 msgid "Default page text color"
 msgstr "Forvalgt tekstfarge for side"
 
-#: data/epiphany.schemas.in.h:17
+#: data/epiphany.schemas.in.h:19
 msgid "Default page text color in #RRGGBB hex format."
 msgstr "Forvalgt farge for tekst i #RRGGBB heksadesimalt format."
 
-#: data/epiphany.schemas.in.h:18
-msgid "Default sidebar page"
-msgstr "Forvalgt side på sidelinjen"
-
-#: data/epiphany.schemas.in.h:19
-msgid "Default sidebar page."
-msgstr "Forvalgt side på sidelinjen."
-
 #: data/epiphany.schemas.in.h:20
-msgid "Default sidebar size"
-msgstr "Forvalgt størrelse på sidelinjen"
-
-#: data/epiphany.schemas.in.h:21
-msgid "Default sidebar size."
-msgstr "Forvalgt størrelse på sidelinjen."
-
-#: data/epiphany.schemas.in.h:22
 msgid "Default spinner theme"
 msgstr "Forvalgt tema for spinner"
 
-#: data/epiphany.schemas.in.h:23
+#: data/epiphany.schemas.in.h:21
 msgid "Default unvisited link color"
 msgstr "Forvalgt farge på ikke-besøkt lenke"
 
-#: data/epiphany.schemas.in.h:24
+#: data/epiphany.schemas.in.h:22
 msgid "Default visited link color"
 msgstr "Forvalgt farge for viste lenker"
 
+#: data/epiphany.schemas.in.h:23
+msgid "Enable Java"
+msgstr ""
+
+#: data/epiphany.schemas.in.h:24
+#, fuzzy
+msgid "Enable Java."
+msgstr "Tillat Java."
+
 #: data/epiphany.schemas.in.h:25
+#, fuzzy
+msgid "Enable JavaScript"
+msgstr "Tillat JavaScript"
+
+#: data/epiphany.schemas.in.h:26
+#, fuzzy
+msgid "Enable JavaScript."
+msgstr "Tillat JavaScript."
+
+#: data/epiphany.schemas.in.h:27
 msgid "Expire history"
 msgstr "Tøm historikk"
 
-#: data/epiphany.schemas.in.h:26
+#: data/epiphany.schemas.in.h:28
 msgid "Expire history after how many days."
 msgstr "Tøm historikk etter dette antall dager."
 
-#: data/epiphany.schemas.in.h:27
+#: data/epiphany.schemas.in.h:29
 msgid "Filename to print to"
 msgstr "Filnavn for utskrift"
 
-#: data/epiphany.schemas.in.h:28
+#: data/epiphany.schemas.in.h:30
 msgid "Filename to print to."
 msgstr "Filnavn for utskrift."
 
-#: data/epiphany.schemas.in.h:29
+#: data/epiphany.schemas.in.h:31
 msgid ""
 "For find in page, whether to start again at the beginning after reaching the "
 "end of the page"
 msgstr ""
 
-#: data/epiphany.schemas.in.h:30
+#: data/epiphany.schemas.in.h:32
 msgid "History search time"
 msgstr ""
 
-#: data/epiphany.schemas.in.h:31
+#: data/epiphany.schemas.in.h:33
 msgid "Home page"
 msgstr "Hjemmeside"
 
-#: data/epiphany.schemas.in.h:32
+#: data/epiphany.schemas.in.h:34
 msgid "Image animation type"
 msgstr "Type bildeanimasjon"
 
-#: data/epiphany.schemas.in.h:33
+#: data/epiphany.schemas.in.h:35
 msgid ""
 "Image animation type. Possible values are 0 (continuously), 1 (once "
 "through), 2 (never)"
 msgstr ""
 
-#: data/epiphany.schemas.in.h:34
+#: data/epiphany.schemas.in.h:36
 msgid "Jump to new tabs"
 msgstr "Hopp til nye faner"
 
-#: data/epiphany.schemas.in.h:35
+#: data/epiphany.schemas.in.h:37
 msgid "Jump to new tabs."
 msgstr "Hopp til nye faner."
 
-#: data/epiphany.schemas.in.h:36
+#: data/epiphany.schemas.in.h:38
 msgid "Keep downloader open after all downloads have finished."
 msgstr ""
 
-#: data/epiphany.schemas.in.h:37
+#: data/epiphany.schemas.in.h:39
 msgid "Keep downloader open after download finished"
 msgstr ""
 
-#: data/epiphany.schemas.in.h:38
+#: data/epiphany.schemas.in.h:40
 msgid "Languages"
 msgstr "Språk"
 
-#: data/epiphany.schemas.in.h:39
+#: data/epiphany.schemas.in.h:41
 msgid "List of domains for wherefore not to use the proxy, comma delimited"
 msgstr "Liste over domener hvor proxy ikke skal benyttes. Kommaseparert"
 
-#: data/epiphany.schemas.in.h:40
+#: data/epiphany.schemas.in.h:42
 msgid "Match case for find in page"
 msgstr ""
 
-#: data/epiphany.schemas.in.h:41
+#: data/epiphany.schemas.in.h:43
 msgid "Match case for find in page."
 msgstr ""
 
-#: data/epiphany.schemas.in.h:42
-msgid "Middle click on the web page will load the url in X clipboard."
+#: data/epiphany.schemas.in.h:44
+msgid ""
+"Middle click to open the web page pointed to by the currently selected text"
 msgstr ""
 
-#: data/epiphany.schemas.in.h:43
-msgid "Middle click will load the url in X clipboard"
+#: data/epiphany.schemas.in.h:45
+msgid ""
+"Middle clicking on the main view pane will open the web page pointed to by "
+"the currently selected text."
 msgstr ""
 
-#: data/epiphany.schemas.in.h:44
+#: data/epiphany.schemas.in.h:46
 msgid "New page type"
 msgstr "Ny sidetype"
 
-#: data/epiphany.schemas.in.h:45
+#: data/epiphany.schemas.in.h:47
 msgid "No proxy for"
 msgstr "Ingen proxy for"
 
-#: data/epiphany.schemas.in.h:46
+#: data/epiphany.schemas.in.h:48
 msgid "Open in tabs by default."
 msgstr "Åpne i faner som forvalg."
 
-#: data/epiphany.schemas.in.h:47
-msgid "Open popups in tabs"
-msgstr "Åpne oppsprettvinduer i faner"
-
-#: data/epiphany.schemas.in.h:48
-msgid "Open popups in tabs instead of new windows."
-msgstr "Åpne oppsprettvinduer i faner i stedet for nye vinduer."
-
 #: data/epiphany.schemas.in.h:49
 msgid "Paper type"
 msgstr "Papirtype"
@@ -318,152 +328,110 @@ msgid ""
 msgstr ""
 
 #: data/epiphany.schemas.in.h:70
-msgid "Show sidebar by default"
-msgstr "Vis sidelinje som forvalg"
-
-#: data/epiphany.schemas.in.h:71
-msgid "Show sidebar by default."
-msgstr "Vis sidelinje som forvalg."
-
-#: data/epiphany.schemas.in.h:72
-msgid "Show sidebar in full screen mode"
-msgstr "Vis sidelinje i fullskjermmodus"
-
-#: data/epiphany.schemas.in.h:73
-msgid "Show sidebar in full screen mode."
-msgstr "Vis sidelinje i fullskjermmodus."
-
-#: data/epiphany.schemas.in.h:74
 msgid "Show statusbar by default"
 msgstr "Vis statuslinje som forvalg"
 
-#: data/epiphany.schemas.in.h:75
+#: data/epiphany.schemas.in.h:71
 msgid "Show statusbar by default."
 msgstr "Vis statuslinje som forvalg."
 
-#: data/epiphany.schemas.in.h:76
-msgid "Show statusbar in full screen mode"
-msgstr "Vis statuslinje i fullskjermmodus"
-
-#: data/epiphany.schemas.in.h:77
-msgid "Show statusbar in full screen mode."
-msgstr "Vis statuslinje i fullskjermmodus."
-
-#: data/epiphany.schemas.in.h:78
+#: data/epiphany.schemas.in.h:72
 msgid "Show toolbars by default"
 msgstr "Vis verktøylinjer som forvalg"
 
-#: data/epiphany.schemas.in.h:79
+#: data/epiphany.schemas.in.h:73
 msgid "Show toolbars by default."
 msgstr "Vis verktøylinjer som forvalg."
 
-#: data/epiphany.schemas.in.h:80
-msgid "Show toolbars in full screen mode"
-msgstr "Vis verktøylinjer i fullskjermmodus"
-
-#: data/epiphany.schemas.in.h:81
-msgid "Show toolbars in full screen mode."
-msgstr "Vis verktøylinjer i fullskjermmodus."
-
-#: data/epiphany.schemas.in.h:82
+#: data/epiphany.schemas.in.h:74
 msgid "Size of disk cache"
 msgstr "Størrelse på diskbuffer"
 
-#: data/epiphany.schemas.in.h:83
+#: data/epiphany.schemas.in.h:75
 msgid "Size of disk cache, in KB."
 msgstr "Størrelse på diskbuffer i KB."
 
-#: data/epiphany.schemas.in.h:84
+#: data/epiphany.schemas.in.h:76
 msgid "Size of memory cache"
 msgstr "Størrelse på minnebuffer"
 
-#: data/epiphany.schemas.in.h:85
+#: data/epiphany.schemas.in.h:77
 msgid "Size of memory cache, in KB."
 msgstr "Størrelse på minnebuffer i KB."
 
-#: data/epiphany.schemas.in.h:86
-msgid ""
-"The list of controls that will be present in the toolbar. You should edit "
-"this setting with the toolbar editor unless you know what you are doing."
-msgstr ""
-
-#: data/epiphany.schemas.in.h:87
-msgid "Toolbar setup"
-msgstr "Oppsett av verktøylinjer"
-
-#: data/epiphany.schemas.in.h:88
+#: data/epiphany.schemas.in.h:78
 msgid ""
 "Type of page to show when opening a new window or tab. Possible values are: "
 "0 (home page), 1 (last page), 2 (blank)"
 msgstr ""
 
-#: data/epiphany.schemas.in.h:89
-msgid ""
-"URL for the user's home page. Displayed on start up and when a new window or "
-"tab is created"
-msgstr ""
-
-#: data/epiphany.schemas.in.h:90
+#: data/epiphany.schemas.in.h:79
 msgid "Underline links"
 msgstr "Understrek lenker"
 
-#: data/epiphany.schemas.in.h:91
+#: data/epiphany.schemas.in.h:80
 msgid "Underline links."
 msgstr "Understrek lenker."
 
-#: data/epiphany.schemas.in.h:92
+#: data/epiphany.schemas.in.h:81
 msgid "Use own colors"
 msgstr "Bruk egne farger"
 
-#: data/epiphany.schemas.in.h:93
+#: data/epiphany.schemas.in.h:82
 msgid "Use own fonts"
 msgstr "Bruk egne skrifter"
 
-#: data/epiphany.schemas.in.h:94
+#: data/epiphany.schemas.in.h:83
 msgid "Use tabs"
 msgstr "Bruk faner"
 
-#: data/epiphany.schemas.in.h:95
+#: data/epiphany.schemas.in.h:84
 msgid "Use your own colors instead of the colors the page requests."
 msgstr "Bruk egne farger i stedet for farger som etterspørres av siden."
 
-#: data/epiphany.schemas.in.h:96
+#: data/epiphany.schemas.in.h:85
 msgid "Use your own fonts instead of the fonts the page requests."
 msgstr "Bruk egne skrifter i stedet for dokumentspesifikke skrifter."
 
-#: data/epiphany.schemas.in.h:97
+#: data/epiphany.schemas.in.h:86
 msgid "When to compare cached copy"
 msgstr ""
 
-#: data/epiphany.schemas.in.h:98
+#: data/epiphany.schemas.in.h:87
 msgid ""
 "When to compare cached copy to web copy. Possible values are 0 (once per "
 "session), 1 (every time), 2 (never), 3 (automatic)."
 msgstr ""
 
-#: data/epiphany.schemas.in.h:99
+#: data/epiphany.schemas.in.h:88
 msgid "When to load images"
 msgstr "Når bilder skal lastes"
 
-#: data/epiphany.schemas.in.h:100
+#: data/epiphany.schemas.in.h:89
 msgid ""
 "When to load images. Possible values are 0 (always), 1 (from current server "
 "only), 2 (never)"
 msgstr ""
 
-#: data/epiphany.schemas.in.h:101
+#: data/epiphany.schemas.in.h:90
+msgid ""
+"Where to accept cookies from. Possible values are 0 (anywhere), 1 (from "
+"current server only), 2 (nowhere)"
+msgstr ""
+
+#: data/epiphany.schemas.in.h:91
 msgid "Whether to print the date in the footer."
 msgstr ""
 
-#: data/epiphany.schemas.in.h:102
-msgid "Whether to print the page URL in the header"
+#: data/epiphany.schemas.in.h:92
+msgid "Whether to print the page address in the header"
 msgstr ""
 
-#: data/epiphany.schemas.in.h:103
+#: data/epiphany.schemas.in.h:93
 msgid "Whether to print the page numbers (x of total) in the footer."
 msgstr ""
 
-#: data/epiphany.schemas.in.h:104
+#: data/epiphany.schemas.in.h:94
 msgid "Whether to print the page title in the header."
 msgstr ""
 
@@ -477,30 +445,23 @@ msgid "*"
 msgstr "*"
 
 #: data/glade/epiphany.glade.h:3
-msgid "<b>File:</b>"
-msgstr "<b>Fil:</b>"
+#, fuzzy
+msgid "<b>Address:</b>"
+msgstr "<b>Topptekst</b>"
 
 #: data/glade/epiphany.glade.h:4
-msgid "<b>Find text in the document:</b>"
-msgstr "<b>Finn tekst i dokumentet:</b>"
-
-#: data/glade/epiphany.glade.h:5
-msgid "<b>Location:</b>"
-msgstr "<b>Lokasjon:</b>"
-
-#: data/glade/epiphany.glade.h:6
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
-#: data/glade/epiphany.glade.h:7
+#: data/glade/epiphany.glade.h:5
 msgid "<b>Time Elapsed:</b>"
 msgstr "<b>Tid medgått:</b>"
 
-#: data/glade/epiphany.glade.h:8
+#: data/glade/epiphany.glade.h:6
 msgid "<b>Time Remaining:</b>"
 msgstr "<b>Tid som gjenstår:</b>"
 
-#: data/glade/epiphany.glade.h:9
+#: data/glade/epiphany.glade.h:7
 msgid ""
 "<span weight=\"bold\" size=\"larger\">What do you want to do with this "
 "file?\n"
@@ -511,69 +472,70 @@ msgstr ""
 "</span>\n"
 "Det er ikke mulig å vise denne filtypen direkte i nettleseren:"
 
-#: data/glade/epiphany.glade.h:12
-msgid "Automatically _wrap around"
-msgstr "_Bryt teksten automatisk"
+#: data/glade/epiphany.glade.h:10
+msgid "C_ase sensitive"
+msgstr ""
 
-#: data/glade/epiphany.glade.h:13
+#: data/glade/epiphany.glade.h:11
 msgid "Choose the file type action"
 msgstr "Velg handling for filtype"
 
-#: data/glade/epiphany.glade.h:14
+#: data/glade/epiphany.glade.h:12
 msgid "Cookies"
 msgstr "Informasjonskapsler"
 
-#: data/glade/epiphany.glade.h:15
+#: data/glade/epiphany.glade.h:13
 msgid "DYNAMIC"
 msgstr "DYNAMISK"
 
-#: data/glade/epiphany.glade.h:16
+#: data/glade/epiphany.glade.h:14
 msgid "Download _details..."
 msgstr "_Detaljer om nedlasting..."
 
-#: data/glade/epiphany.glade.h:17
+#: data/glade/epiphany.glade.h:15
 msgid "Downloading"
 msgstr "Nedlasting"
 
-#: data/glade/epiphany.glade.h:18
-msgid "Find text..."
-msgstr "Finn tekst..."
+#: data/glade/epiphany.glade.h:16 data/ui/nautilus-epiphany-view.xml.in.h:11
+msgid "Find"
+msgstr "Finn"
 
-#: data/glade/epiphany.glade.h:19
+#: data/glade/epiphany.glade.h:17
 msgid "Passwords"
 msgstr "Passord"
 
-#: data/glade/epiphany.glade.h:20
+#: data/glade/epiphany.glade.h:18
 msgid "Personal data manager"
 msgstr "Håndtering av personlige data"
 
-#: data/glade/epiphany.glade.h:21
+#: data/glade/epiphany.glade.h:19
 msgid "You can open it with another application or save it on disk."
 msgstr "Du kan åpne den med en annen applikasjon eller lagre den på disk."
 
-#: data/glade/epiphany.glade.h:22
+#: data/glade/epiphany.glade.h:20
+msgid "_Find:"
+msgstr "_Finn:"
+
+#: data/glade/epiphany.glade.h:21
 msgid "_Keep the dialog open"
 msgstr "_Hold dialogen åpen"
 
-#: data/glade/epiphany.glade.h:23
-msgid "_Match upper/lower case"
-msgstr ""
-
-#: data/glade/epiphany.glade.h:24
+#: data/glade/epiphany.glade.h:22
 msgid "_Next"
 msgstr "_Neste"
 
-#: data/glade/epiphany.glade.h:25
+#: data/glade/epiphany.glade.h:23
 msgid "_Pause"
 msgstr "_Pause"
 
-#: data/glade/epiphany.glade.h:26
+#: data/glade/epiphany.glade.h:24
 msgid "_Previous"
 msgstr "_Forrige"
 
-#: data/glade/epiphany.glade.h:27
-msgid "_Resume"
-msgstr "_Gjenoppta"
+#: data/glade/epiphany.glade.h:25
+#, fuzzy
+msgid "_Wrap around"
+msgstr "_Bakgrunn"
 
 #: data/glade/prefs-dialog.glade.h:1 data/glade/print.glade.h:1
 msgid "    "
@@ -588,295 +550,345 @@ msgid "<b>Colors</b>"
 msgstr "<b>Farger</b>"
 
 #: data/glade/prefs-dialog.glade.h:5
+#, fuzzy
+msgid "<b>Cookies</b>"
+msgstr "<b>Farger</b>"
+
+#: data/glade/prefs-dialog.glade.h:6
 msgid "<b>Fonts</b>"
 msgstr "<b>Skrifter</b>"
 
-#: data/glade/prefs-dialog.glade.h:6
+#: data/glade/prefs-dialog.glade.h:7
 msgid "<b>Home page</b>"
 msgstr "<b>Hjemmeside</b>"
 
-#: data/glade/prefs-dialog.glade.h:7
+#: data/glade/prefs-dialog.glade.h:8
 msgid "<b>Language</b>"
 msgstr "<b>Språk</b>"
 
-#: data/glade/prefs-dialog.glade.h:8
+#: data/glade/prefs-dialog.glade.h:9
 msgid "<b>Links</b>"
 msgstr "<b>Lenker</b>"
 
-#: data/glade/prefs-dialog.glade.h:9
+#: data/glade/prefs-dialog.glade.h:10
 msgid "<b>On New Page</b>"
 msgstr "<b>På ny side</b>"
 
-#: data/glade/prefs-dialog.glade.h:10
+#: data/glade/prefs-dialog.glade.h:11
 msgid "<b>Tabs</b>"
 msgstr "<b>Faner</b>"
 
-#: data/glade/prefs-dialog.glade.h:11
+#: data/glade/prefs-dialog.glade.h:12
+#, fuzzy
+msgid "<b>Web Content</b>"
+msgstr "<b>Skrifter</b>"
+
+#: data/glade/prefs-dialog.glade.h:13
+msgid "Accept _from current site only"
+msgstr ""
+
+#: data/glade/prefs-dialog.glade.h:14
+msgid "Advanced"
+msgstr "Avansert"
+
+#: data/glade/prefs-dialog.glade.h:15
 msgid "Al_ways use these colors"
 msgstr "All_tid bruk disse fargene"
 
-#: data/glade/prefs-dialog.glade.h:12
+#: data/glade/prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Allow popup windows"
+msgstr "Tillat popups"
+
+#: data/glade/prefs-dialog.glade.h:17
 msgid "Always use t_hese fonts"
 msgstr "Alltid bruk _disse skriftene"
 
-#: data/glade/prefs-dialog.glade.h:13 embed/mozilla/mozilla-i18n.c:24
-#: src/general-prefs.c:88
+#: data/glade/prefs-dialog.glade.h:18 data/glade/print.glade.h:12
+msgid "Appearance"
+msgstr "Utseende"
+
+#: data/glade/prefs-dialog.glade.h:19 embed/mozilla/mozilla-i18n.c:24
+#: src/prefs-dialog.c:105
 msgid "Arabic"
 msgstr "Arabisk"
 
-#: data/glade/prefs-dialog.glade.h:14
+#: data/glade/prefs-dialog.glade.h:20
 msgid "Autodetec_t encoding:"
 msgstr "Gjenkjenn koding au_tomatisk:"
 
-#: data/glade/prefs-dialog.glade.h:15 embed/mozilla/mozilla-i18n.c:25
+#: data/glade/prefs-dialog.glade.h:21 embed/mozilla/mozilla-i18n.c:25
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: data/glade/prefs-dialog.glade.h:16 embed/mozilla/mozilla-i18n.c:26
+#: data/glade/prefs-dialog.glade.h:22 embed/mozilla/mozilla-i18n.c:26
 msgid "Central European"
 msgstr "Sentraleuropeisk"
 
-#: data/glade/prefs-dialog.glade.h:17 embed/mozilla/mozilla-i18n.c:27
-#: src/general-prefs.c:95
+#: data/glade/prefs-dialog.glade.h:23 embed/mozilla/mozilla-i18n.c:27
+#: src/prefs-dialog.c:112
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: data/glade/prefs-dialog.glade.h:18
+#: data/glade/prefs-dialog.glade.h:24
 msgid "Clear _Disk Cache"
 msgstr "Tøm _diskbuffer"
 
-#: data/glade/prefs-dialog.glade.h:19
+#: data/glade/prefs-dialog.glade.h:25
 msgid "Clear _Memory Cache"
 msgstr "Tøm _minnebuffer"
 
-#: data/glade/prefs-dialog.glade.h:20
+#: data/glade/prefs-dialog.glade.h:26
 msgid "Compare page:"
 msgstr "Sammenlign side:"
 
-#: data/glade/prefs-dialog.glade.h:21 embed/mozilla/mozilla-i18n.c:28
+#: data/glade/prefs-dialog.glade.h:27 embed/mozilla/mozilla-i18n.c:28
 msgid "Cyrillic"
 msgstr "Kyrillisk"
 
-#: data/glade/prefs-dialog.glade.h:22
+#: data/glade/prefs-dialog.glade.h:28
 msgid "Dis_k cache:"
 msgstr "Dis_kbuffer:"
 
-#: data/glade/prefs-dialog.glade.h:23
+#: data/glade/prefs-dialog.glade.h:29
 msgid "E_very time"
 msgstr "H_ver gang"
 
-#: data/glade/prefs-dialog.glade.h:24
+#: data/glade/prefs-dialog.glade.h:30
 msgid "East asian"
 msgstr "Øst-asiatisk"
 
-#: data/glade/prefs-dialog.glade.h:25 embed/mozilla/mozilla-i18n.c:29
-#: src/general-prefs.c:108
+#: data/glade/prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Enable Java_Script"
+msgstr "Tillat JavaScript"
+
+#: data/glade/prefs-dialog.glade.h:32
+msgid "Enable _Java"
+msgstr ""
+
+#: data/glade/prefs-dialog.glade.h:33 data/glade/print.glade.h:16
+msgid "General"
+msgstr "Generell"
+
+#: data/glade/prefs-dialog.glade.h:34 embed/mozilla/mozilla-i18n.c:29
+#: src/prefs-dialog.c:125
 msgid "Greek"
 msgstr "Gresk"
 
-#: data/glade/prefs-dialog.glade.h:26 embed/mozilla/mozilla-i18n.c:30
-#: src/general-prefs.c:109
+#: data/glade/prefs-dialog.glade.h:35 embed/mozilla/mozilla-i18n.c:30
+#: src/prefs-dialog.c:126
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: data/glade/prefs-dialog.glade.h:27 embed/mozilla/mozilla-i18n.c:32
-#: src/general-prefs.c:115
+#: data/glade/prefs-dialog.glade.h:36 embed/mozilla/mozilla-i18n.c:32
+#: src/prefs-dialog.c:132
 msgid "Japanese"
 msgstr "Japansk"
 
-#: data/glade/prefs-dialog.glade.h:28 embed/mozilla/mozilla-i18n.c:33
-#: src/general-prefs.c:116
+#: data/glade/prefs-dialog.glade.h:37 embed/mozilla/mozilla-i18n.c:33
+#: src/prefs-dialog.c:133
 msgid "Korean"
 msgstr "Koreansk"
 
-#: data/glade/prefs-dialog.glade.h:29
+#: data/glade/prefs-dialog.glade.h:38
 msgid "Lan_guage:"
 msgstr "S_pråk:"
 
-#: data/glade/prefs-dialog.glade.h:30
+#: data/glade/prefs-dialog.glade.h:39
 msgid "Language"
 msgstr "Språk"
 
-#: data/glade/prefs-dialog.glade.h:31
+#: data/glade/prefs-dialog.glade.h:40
 msgid "Languages editor"
 msgstr "Språkredigering"
 
-#: data/glade/prefs-dialog.glade.h:32
+#: data/glade/prefs-dialog.glade.h:41
 msgid "Memor_y cache:"
 msgstr "Minne_buffer:"
 
-#: data/glade/prefs-dialog.glade.h:33
+#: data/glade/prefs-dialog.glade.h:42
 msgid "Min_imum font size:"
 msgstr "M_inimum skriftstørrelse:"
 
-#: data/glade/prefs-dialog.glade.h:34
+#: data/glade/prefs-dialog.glade.h:43
 msgid "Off"
 msgstr "Av"
 
-#: data/glade/prefs-dialog.glade.h:35
+#: data/glade/prefs-dialog.glade.h:44
 msgid "Once per _session"
 msgstr "En gang per _sesjon"
 
-#: data/glade/prefs-dialog.glade.h:36
-msgid "Open _popups in tabs"
-msgstr "Åpne o_ppsprettvinduer i faner"
-
-#: data/glade/prefs-dialog.glade.h:37
+#: data/glade/prefs-dialog.glade.h:45
 msgid "Pick the background color"
 msgstr "Velg bakgrunnsfarge"
 
-#: data/glade/prefs-dialog.glade.h:38
+#: data/glade/prefs-dialog.glade.h:46
 msgid "Pick the text color"
 msgstr "Velg tekstfarge"
 
-#: data/glade/prefs-dialog.glade.h:39
+#: data/glade/prefs-dialog.glade.h:47
 msgid "Pick the unvisited link color"
 msgstr "Velg farge for ikke-besøkte lenker"
 
-#: data/glade/prefs-dialog.glade.h:40
+#: data/glade/prefs-dialog.glade.h:48
 msgid "Pick the visited link color"
 msgstr "Velg farge for besøkte lenker"
 
-#: data/glade/prefs-dialog.glade.h:41 src/general-prefs.c:128
+#: data/glade/prefs-dialog.glade.h:49
+msgid "Preferences"
+msgstr "Brukervalg..."
+
+#: data/glade/prefs-dialog.glade.h:50 src/prefs-dialog.c:145
 msgid "Russian"
 msgstr "Russisk"
 
-#: data/glade/prefs-dialog.glade.h:42
+#: data/glade/prefs-dialog.glade.h:51
 msgid "S_ans serif:"
 msgstr "S_ans serif:"
 
-#: data/glade/prefs-dialog.glade.h:43
+#: data/glade/prefs-dialog.glade.h:52
 msgid "Sans Serif"
 msgstr "Sans Serif"
 
-#: data/glade/prefs-dialog.glade.h:44
+#: data/glade/prefs-dialog.glade.h:53
+#, fuzzy
+msgid "Security"
+msgstr "Sikker"
+
+#: data/glade/prefs-dialog.glade.h:54
 msgid "Serif"
 msgstr "Serif"
 
-#: data/glade/prefs-dialog.glade.h:45
+#: data/glade/prefs-dialog.glade.h:55
 msgid "Set to Current _Page"
 msgstr "Sett til denne _siden"
 
-#: data/glade/prefs-dialog.glade.h:46
+#: data/glade/prefs-dialog.glade.h:56
 msgid "Set to _Blank Page"
 msgstr "Sett til _tom side"
 
-#: data/glade/prefs-dialog.glade.h:47
+#: data/glade/prefs-dialog.glade.h:57
 msgid "Show blan_k page"
 msgstr "Vis _tom side"
 
-#: data/glade/prefs-dialog.glade.h:48
+#: data/glade/prefs-dialog.glade.h:58
 msgid "Show hom_e page"
 msgstr "Vis hj_emmeside"
 
-#: data/glade/prefs-dialog.glade.h:49
+#: data/glade/prefs-dialog.glade.h:59
 msgid "Show la_st page"
 msgstr "Vis sis_te side"
 
-#: data/glade/prefs-dialog.glade.h:50
+#: data/glade/prefs-dialog.glade.h:60
 msgid "Si_ze:"
 msgstr "S_tørrelse:"
 
-#: data/glade/prefs-dialog.glade.h:51
+#: data/glade/prefs-dialog.glade.h:61
 msgid "Simplified Chinese"
 msgstr "Forenklet kinesisk"
 
-#: data/glade/prefs-dialog.glade.h:52
+#: data/glade/prefs-dialog.glade.h:62
 msgid "Siz_e:"
 msgstr "Størr_else:"
 
-#: data/glade/prefs-dialog.glade.h:53
+#: data/glade/prefs-dialog.glade.h:63
 msgid "Thai"
 msgstr "Thailandsk"
 
-#: data/glade/prefs-dialog.glade.h:54
+#: data/glade/prefs-dialog.glade.h:64
 msgid "Traditional Chinese"
 msgstr "Tradisjonell kinesisk"
 
-#: data/glade/prefs-dialog.glade.h:55 embed/mozilla/mozilla-i18n.c:34
-#: src/general-prefs.c:136
+#: data/glade/prefs-dialog.glade.h:65 embed/mozilla/mozilla-i18n.c:34
+#: src/prefs-dialog.c:153
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: data/glade/prefs-dialog.glade.h:56 src/general-prefs.c:137
+#: data/glade/prefs-dialog.glade.h:66 src/prefs-dialog.c:154
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: data/glade/prefs-dialog.glade.h:57 embed/mozilla/mozilla-i18n.c:35
+#: data/glade/prefs-dialog.glade.h:67 embed/mozilla/mozilla-i18n.c:35
 msgid "Unicode"
 msgstr "Unicode"
 
-#: data/glade/prefs-dialog.glade.h:58
+#: data/glade/prefs-dialog.glade.h:68
 msgid "Use s_ystem colors"
 msgstr "Bruk s_ystemfarger"
 
-#: data/glade/prefs-dialog.glade.h:59 embed/mozilla/mozilla-i18n.c:37
+#: data/glade/prefs-dialog.glade.h:69 embed/mozilla/mozilla-i18n.c:37
 msgid "Western"
 msgstr "Vestlig"
 
-#: data/glade/prefs-dialog.glade.h:60
+#: data/glade/prefs-dialog.glade.h:70
+#: src/bookmarks/ephy-bookmark-properties.c:373
+msgid "_Address:"
+msgstr ""
+
+#: data/glade/prefs-dialog.glade.h:71
+msgid "_Always accept"
+msgstr ""
+
+#: data/glade/prefs-dialog.glade.h:72
 msgid "_Automatically"
 msgstr "_Automatisk"
 
-#: data/glade/prefs-dialog.glade.h:61
+#: data/glade/prefs-dialog.glade.h:73
 msgid "_Background"
 msgstr "_Bakgrunn"
 
-#: data/glade/prefs-dialog.glade.h:62
+#: data/glade/prefs-dialog.glade.h:74
 msgid "_Default encoding:"
 msgstr "_Forvalgt koding:"
 
-#: data/glade/prefs-dialog.glade.h:63
-msgid "_Jump to new tabs automatically"
-msgstr "_Hopp til nye faner automatisk"
-
-#: data/glade/prefs-dialog.glade.h:64
+#: data/glade/prefs-dialog.glade.h:75
 msgid "_Language encoding:"
 msgstr "_Språkkoding:"
 
-#: data/glade/prefs-dialog.glade.h:65
-#: src/bookmarks/ephy-bookmark-properties.c:376
-msgid "_Location:"
-msgstr "_Lokasjon:"
-
-#: data/glade/prefs-dialog.glade.h:66
+#: data/glade/prefs-dialog.glade.h:76
 msgid "_Monospace:"
 msgstr "_Fast bredde:"
 
-#: data/glade/prefs-dialog.glade.h:67
+#: data/glade/prefs-dialog.glade.h:77
 msgid "_More..."
 msgstr "_Mer..."
 
-#: data/glade/prefs-dialog.glade.h:68
+#: data/glade/prefs-dialog.glade.h:78
 msgid "_Never"
 msgstr "_Aldri"
 
-#: data/glade/prefs-dialog.glade.h:69
+#: data/glade/prefs-dialog.glade.h:79
+#, fuzzy
+msgid "_Never accept"
+msgstr "_Aldri"
+
+#: data/glade/prefs-dialog.glade.h:80
 msgid "_Open in tabs by default"
 msgstr "_Åpne i faner som forvalg"
 
 # (ugh)
-#: data/glade/prefs-dialog.glade.h:70
+#: data/glade/prefs-dialog.glade.h:81
 msgid "_Proportional:"
 msgstr "_Proporsjonal:"
 
-#: data/glade/prefs-dialog.glade.h:71
+#: data/glade/prefs-dialog.glade.h:82
 msgid "_Serif:"
 msgstr "_Serif:"
 
-#: data/glade/prefs-dialog.glade.h:72
+#: data/glade/prefs-dialog.glade.h:83
 msgid "_Text"
 msgstr "_Tekst"
 
-#: data/glade/prefs-dialog.glade.h:73
+#: data/glade/prefs-dialog.glade.h:84
 msgid "_Unvisited link"
 msgstr "_Ikke-besøkt lenke"
 
-#: data/glade/prefs-dialog.glade.h:74
+#: data/glade/prefs-dialog.glade.h:85
 msgid "_Visited link"
 msgstr "_Besøkt lenke"
 
-#: data/glade/prefs-dialog.glade.h:75
+#: data/glade/prefs-dialog.glade.h:86
 msgid "kB"
 msgstr "kB"
 
@@ -913,98 +925,93 @@ msgstr "<b>Størrelse</b>"
 msgid "A_4 (8.27\" x 11.69\")"
 msgstr "A_4"
 
-#: data/glade/print.glade.h:12 src/prefs-dialog.c:305
-msgid "Appearance"
-msgstr "Utseende"
-
 #: data/glade/print.glade.h:13
+#, fuzzy
+msgid "C_olor"
+msgstr "_Farge"
+
+#: data/glade/print.glade.h:14
 msgid "Choose a file to print to"
 msgstr "Velg en fil å skrive ut til"
 
-#: data/glade/print.glade.h:14
+#: data/glade/print.glade.h:15
 msgid "E_xecutive (7.25\" x 10.5\")"
 msgstr ""
 
-#: data/glade/print.glade.h:15
-msgid "G_rayscale"
+#: data/glade/print.glade.h:17
+#, fuzzy
+msgid "Gra_yscale"
 msgstr "G_råtone"
 
-#: data/glade/print.glade.h:16 src/prefs-dialog.c:304
-msgid "General"
-msgstr "Generell"
-
-#: data/glade/print.glade.h:17
+#: data/glade/print.glade.h:18
 msgid "L_egal (8.5\" x 14\")"
 msgstr ""
 
-#: data/glade/print.glade.h:18
+#: data/glade/print.glade.h:19
 msgid "Lan_dscape"
 msgstr "Lan_dskap"
 
-#: data/glade/print.glade.h:19
+#: data/glade/print.glade.h:20
 msgid "Le_ft"
 msgstr "_Venstre"
 
-#: data/glade/print.glade.h:20
+#: data/glade/print.glade.h:21
 msgid "P_age Title"
 msgstr "S_idetittel"
 
-#: data/glade/print.glade.h:21
+#: data/glade/print.glade.h:22
 msgid "P_ortrait"
 msgstr "P_ortrett"
 
-#: data/glade/print.glade.h:22
+#: data/glade/print.glade.h:23
+#, fuzzy
+msgid "P_rinter"
+msgstr "_Skriver"
+
+#: data/glade/print.glade.h:24
 msgid "Pa_ges"
 msgstr "Si_der"
 
-#: data/glade/print.glade.h:23
-msgid "Page _URL"
-msgstr "Sidens _URL"
+#: data/glade/print.glade.h:25
+msgid "Page Addre_ss"
+msgstr ""
 
-#: data/glade/print.glade.h:24
+#: data/glade/print.glade.h:26
 msgid "Page nu_mbers"
 msgstr "Sidenu_mmer"
 
-#: data/glade/print.glade.h:25
+#: data/glade/print.glade.h:27
 msgid "Paper Details"
 msgstr "Papirdetaljer"
 
-#: data/glade/print.glade.h:26 data/ui/nautilus-epiphany-view.xml.in.h:25
-#: src/ephy-window.c:497
+#: data/glade/print.glade.h:28 data/ui/nautilus-epiphany-view.xml.in.h:25
+#: src/ephy-window.c:496
 msgid "Print"
 msgstr "Skriv ut"
 
-#: data/glade/print.glade.h:27
+#: data/glade/print.glade.h:29
 msgid "_All pages"
 msgstr "_Alle sider"
 
-#: data/glade/print.glade.h:28
+#: data/glade/print.glade.h:30
 msgid "_Bottom"
 msgstr "_Bunn"
 
-#: data/glade/print.glade.h:29
-msgid "_Color"
-msgstr "_Farge"
-
-#: data/glade/print.glade.h:30
+#: data/glade/print.glade.h:31
 msgid "_Date"
 msgstr "_Dato"
 
 #. Toplevel
-#: data/glade/print.glade.h:31 data/ui/nautilus-epiphany-view.xml.in.h:35
-#: src/bookmarks/ephy-bookmarks-editor.c:142 src/ephy-history-window.c:117
+#: data/glade/print.glade.h:32 data/ui/nautilus-epiphany-view.xml.in.h:35
+#: src/bookmarks/ephy-bookmarks-editor.c:144 src/ephy-history-window.c:120
 #: src/ephy-window.c:57
 msgid "_File"
 msgstr "_Fil"
 
-#: data/glade/print.glade.h:32
+#: data/glade/print.glade.h:33
 msgid "_Letter (8.5\" x 11\")"
 msgstr ""
 
-#: data/glade/print.glade.h:33
-msgid "_Printer"
-msgstr "_Skriver"
-
 #: data/glade/print.glade.h:34
 msgid "_Right"
 msgstr "Høy_re"
@@ -1018,16 +1025,18 @@ msgid "_Top"
 msgstr "_Topp"
 
 #: data/glade/print.glade.h:37
-msgid "from:"
+#, fuzzy
+msgid "_from:"
 msgstr "fra:"
 
 #: data/glade/print.glade.h:38
-msgid "lpr"
-msgstr "lpr"
+#, fuzzy
+msgid "_to:"
+msgstr "til:"
 
 #: data/glade/print.glade.h:39
-msgid "to:"
-msgstr "til:"
+msgid "lpr"
+msgstr "lpr"
 
 #: data/GNOME_Epiphany_Automation.server.in.h:1
 msgid "Epiphany automation"
@@ -1090,11 +1099,12 @@ msgstr ""
 "nettleser som er installert på ditt system:"
 
 #: data/starthere/index.xml.in.h:6
+#, fuzzy
 msgid ""
-"You can start browsing web pages either by typing a location (example: www."
-"google.com) or a keyword (example: best computer shop) in the toolbar text "
-"entry and then pressing the Enter key. You can remember important visited "
-"pages using bookmarks or browse all of them with the history dialog."
+"You can start browsing web pages either by typing a web address (example: "
+"www.google.com) or a search phrase (example: best computer shop) in the "
+"address entry and then pressing the Enter key. You can remember important "
+"visited pages using bookmarks or browse all of them with the history dialog."
 msgstr ""
 "Du kan begynne å se på nettsider ved å skrive inn en lokasjon (for eksempel: "
 "www.google.com) eller et nøkkelord (for eksempel: best computer shop) i "
@@ -1118,7 +1128,7 @@ msgstr "Smarte bokmerker"
 #: data/starthere/smartbookmarks.xml.in.h:3
 msgid ""
 "Smart bookmarks allows to perform searches and similar actions directly from "
-"the location entry."
+"the address entry."
 msgstr ""
 
 #: data/ui/nautilus-epiphany-view.xml.in.h:1
@@ -1161,10 +1171,6 @@ msgstr "Klipp ut utvalget"
 msgid "Download Link"
 msgstr "Last ned lenke"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:11
-msgid "Find"
-msgstr "Finn"
-
 #: data/ui/nautilus-epiphany-view.xml.in.h:12 src/ppview-toolbar.c:86
 msgid "First"
 msgstr "Første"
@@ -1250,7 +1256,7 @@ msgid "Use Image As Background"
 msgstr "Bruk bilde som bakgrunn"
 
 #: data/ui/nautilus-epiphany-view.xml.in.h:34
-#: src/bookmarks/ephy-bookmarks-editor.c:143 src/ephy-history-window.c:118
+#: src/bookmarks/ephy-bookmarks-editor.c:145 src/ephy-history-window.c:121
 #: src/ephy-window.c:58
 msgid "_Edit"
 msgstr "R_ediger"
@@ -1263,47 +1269,53 @@ msgstr "_Finn..."
 msgid "_Print..."
 msgstr "_Skriv ut..."
 
-#: embed/downloader-view.c:382
+#: embed/downloader-view.c:359
+#, fuzzy
+msgid "Resume"
+msgstr "_Gjenoppta"
+
+#: embed/downloader-view.c:363
+#, fuzzy
+msgid "Pause"
+msgstr "_Pause"
+
+#: embed/downloader-view.c:381
 #, c-format
 msgid "%.1f of %.1f MB"
 msgstr "%.1f av %.1f MB"
 
-#: embed/downloader-view.c:388
+#: embed/downloader-view.c:387
 #, c-format
 msgid "%d of %d KB"
 msgstr "%d av %d KB"
 
-#: embed/downloader-view.c:394
+#: embed/downloader-view.c:393
 #, c-format
 msgid "%d KB"
 msgstr "%d KB"
 
-#: embed/downloader-view.c:498 embed/downloader-view.c:516
-#: src/ephy-window.c:1067
+#: embed/downloader-view.c:497 embed/downloader-view.c:515
+#: src/ephy-window.c:1047
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: embed/downloader-view.c:515
-msgid "00.00"
-msgstr "00.00"
-
-#: embed/downloader-view.c:759
+#: embed/downloader-view.c:751
 msgid "%"
 msgstr "%"
 
-#: embed/downloader-view.c:769
+#: embed/downloader-view.c:761
 msgid "Filename"
 msgstr "Filnavn"
 
-#: embed/downloader-view.c:780
+#: embed/downloader-view.c:772
 msgid "Size"
 msgstr "Størrelse"
 
-#: embed/downloader-view.c:791
+#: embed/downloader-view.c:783
 msgid "Remaining"
 msgstr "Gjenstår"
 
-#: embed/downloader-view.c:1014
+#: embed/downloader-view.c:973
 msgid "Cancel all pending downloads?"
 msgstr "Avbryt alle utestående nedlastinger?"
 
@@ -1315,7 +1327,7 @@ msgstr "Åpne filnavn for destinasjon"
 msgid "No available applications to open the specified file."
 msgstr "Ingen applikasjoner tilgjengelig til å åpne spesifisert fil."
 
-#: embed/ephy-history.c:414 src/bookmarks/ephy-bookmarks.c:563
+#: embed/ephy-history.c:414 src/bookmarks/ephy-bookmarks.c:591
 msgid "All"
 msgstr "Alle"
 
@@ -1357,15 +1369,15 @@ msgstr "En fil ble valgt men en mappe var ventet."
 msgid "A folder was selected when a file was expected."
 msgstr "En mappe ble valgt men en fil var ventet."
 
-#: embed/mozilla/mozilla-embed-single.cpp:759
+#: embed/mozilla/mozilla-embed-single.cpp:652
 msgid "Yes"
 msgstr "Ja"
 
-#: embed/mozilla/mozilla-embed-single.cpp:761
+#: embed/mozilla/mozilla-embed-single.cpp:654
 msgid "No"
 msgstr "Nei"
 
-#: embed/mozilla/mozilla-embed-single.cpp:766
+#: embed/mozilla/mozilla-embed-single.cpp:659
 msgid "End of current session"
 msgstr "Slutten på siste sesjon"
 
@@ -1709,10 +1721,20 @@ msgstr "Vestlig (MacRoman)"
 msgid "Western (Windows-1252)"
 msgstr "Vestlig (Windows-1252)"
 
-#: embed/mozilla/mozilla-notifiers.cpp:671
+#: embed/mozilla/mozilla-notifiers.cpp:661
 msgid "Default (recommended)"
 msgstr "Forvalgt (anbefalt)"
 
+#: lib/egg/egg-toolbar-editor.c:427
+msgid "Separator"
+msgstr ""
+
+#: lib/egg/egg-toolbar-editor.c:457
+msgid ""
+"Drag an item onto the toolbars above to add it, from the toolbars in the "
+"items table to remove it."
+msgstr ""
+
 #: lib/eel-gconf-extensions.c:79
 #, c-format
 msgid ""
@@ -1737,7 +1759,7 @@ msgstr "%s eksisterer. Vennligst flytt den unna."
 msgid "Failed to create directory %s."
 msgstr "Kunne ikke opprette katalog %s."
 
-#: lib/ephy-gui.c:135
+#: lib/ephy-gui.c:137
 #, c-format
 msgid ""
 "File %s will be overwritten.\n"
@@ -1750,6 +1772,11 @@ msgstr ""
 "\n"
 "Vil du fortsette?"
 
+#: lib/ephy-gui.c:168
+#, c-format
+msgid "Could not display help: %s"
+msgstr "Kunne ikke vise hjelp: %s"
+
 #: lib/ephy-node.c:826 lib/ephy-node.c:832 lib/ephy-node.c:863
 msgid "Never"
 msgstr "Aldri"
@@ -1782,336 +1809,391 @@ msgstr "Importer bokmerker fra Konqueror"
 msgid "%Y-%m-%d"
 msgstr "%d.%m.%Y"
 
-#: lib/egg/egg-toolbar-editor.c:454
-msgid "Separator"
-msgstr ""
+#: lib/egg/egg-editable-toolbar.c:263
+#, fuzzy
+msgid "_Remove Toolbar"
+msgstr "Verk_tøylinje"
 
-#: lib/egg/egg-toolbar-editor.c:491
-msgid ""
-"Drag an item onto the toolbars above to add it, from the toolbars in the "
-"items table to remove it."
+#: src/bookmarks/ephy-bookmark-action.c:173
+#, c-format
+msgid "%s:"
 msgstr ""
 
-#: lib/egg/egg-toolbar-editor.c:498
-msgid "_Add a New Toolbar"
-msgstr "_Legg til en ny verktøylinje"
-
-#. setup label
-#: src/ephy-notebook.c:744 src/ephy-tab.c:579 src/ephy-tab.c:1036
-#: src/window-commands.c:274
-msgid "Untitled"
-msgstr "Uten tittel"
-
 # (ugh)
-#: src/bookmarks/ephy-bookmark-properties.c:243
+#: src/bookmarks/ephy-bookmark-properties.c:240
 #, c-format
 msgid "%s Properties"
 msgstr "Egenskaper for %s"
 
-#: src/bookmarks/ephy-bookmark-properties.c:357
-#: src/bookmarks/ephy-new-bookmark.c:216
+#: src/bookmarks/ephy-bookmark-properties.c:354
+#: src/bookmarks/ephy-new-bookmark.c:217
 msgid "_Title:"
 msgstr "_Tittel:"
 
-#: src/bookmarks/ephy-bookmark-properties.c:399
-#: src/bookmarks/ephy-new-bookmark.c:239
+#: src/bookmarks/ephy-bookmark-properties.c:396
+#: src/bookmarks/ephy-new-bookmark.c:240
 msgid "To_pics:"
 msgstr "Em_ner:"
 
-#: src/bookmarks/ephy-bookmark-properties.c:408
+#: src/bookmarks/ephy-bookmark-properties.c:405
 msgid "_Show in bookmarks bar"
 msgstr "Vi_s i bokmerkelinjen"
 
-#: src/bookmarks/ephy-bookmarks.c:54
+#. Translators you should change these links to respect your locale.
+#. * For instance in .nl these should be
+#. * "http://www.google.nl" and "http://www.google.nl/search?q=%s"
+#.
+#: src/bookmarks/ephy-bookmarks.c:64
 msgid "Search the web"
 msgstr "Søk på nettet"
 
-#: src/bookmarks/ephy-bookmarks.c:60
+#: src/bookmarks/ephy-bookmarks.c:64
+msgid "http://www.google.com"
+msgstr ""
+
+#: src/bookmarks/ephy-bookmarks.c:64
+#, c-format
+msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8"
+msgstr ""
+
+#: src/bookmarks/ephy-bookmarks.c:70
+msgid "Entertainment"
+msgstr ""
+
+#: src/bookmarks/ephy-bookmarks.c:71
 msgid "News"
 msgstr "Nyheter"
 
-#: src/bookmarks/ephy-bookmarks.c:61
-msgid "People"
-msgstr "Folk"
-
-#: src/bookmarks/ephy-bookmarks.c:62
-msgid "Shop"
+#: src/bookmarks/ephy-bookmarks.c:72
+#, fuzzy
+msgid "Shopping"
 msgstr "Handle"
 
-#: src/bookmarks/ephy-bookmarks.c:63
-msgid "Art"
-msgstr "Kunst"
+#: src/bookmarks/ephy-bookmarks.c:73
+msgid "Sports"
+msgstr ""
 
-#: src/bookmarks/ephy-bookmarks.c:64
+#: src/bookmarks/ephy-bookmarks.c:74
+msgid "Travel"
+msgstr ""
+
+#: src/bookmarks/ephy-bookmarks.c:75
 msgid "Work"
 msgstr "Arbeid"
 
-#: src/bookmarks/ephy-bookmarks.c:601
+#: src/bookmarks/ephy-bookmarks.c:629
 msgid "Most Visited"
 msgstr "Mest besøkt"
 
-#: src/bookmarks/ephy-bookmarks.c:618
+#: src/bookmarks/ephy-bookmarks.c:646
 msgid "Not Categorized"
 msgstr "Ikke kategorisert"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:144 src/ephy-history-window.c:119
+#: src/bookmarks/ephy-bookmarks-editor.c:146 src/ephy-history-window.c:122
 #: src/ephy-window.c:59
 msgid "_View"
 msgstr "_Vis"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:145 src/ephy-history-window.c:120
+#: src/bookmarks/ephy-bookmarks-editor.c:147 src/ephy-history-window.c:123
 #: src/ephy-window.c:62
 msgid "_Help"
 msgstr "_Hjelp"
 
 #. File Menu
-#: src/bookmarks/ephy-bookmarks-editor.c:149
+#: src/bookmarks/ephy-bookmarks-editor.c:151
 msgid "_New Topic"
 msgstr "_Nytt emne"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:150
+#: src/bookmarks/ephy-bookmarks-editor.c:152
 msgid "Create a new topic"
 msgstr "Opprett et nytt emne"
 
 #. File Menu
-#: src/bookmarks/ephy-bookmarks-editor.c:152
-#: src/bookmarks/ephy-bookmarks-editor.c:738 src/ephy-history-window.c:124
-#: src/ephy-history-window.c:553
+#: src/bookmarks/ephy-bookmarks-editor.c:154
+#: src/bookmarks/ephy-bookmarks-editor.c:742 src/ephy-history-window.c:127
+#: src/ephy-history-window.c:645
 msgid "_Open in New Window"
 msgstr "_Åpne i nytt vindu"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:153
+#: src/bookmarks/ephy-bookmarks-editor.c:155
 msgid "Open the selected bookmark in a new window"
 msgstr "Åpne valgte bokmerker i et nytt vindu"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:155
-#: src/bookmarks/ephy-bookmarks-editor.c:739 src/ephy-history-window.c:127
-#: src/ephy-history-window.c:554
+#: src/bookmarks/ephy-bookmarks-editor.c:157
+#: src/bookmarks/ephy-bookmarks-editor.c:743 src/ephy-history-window.c:130
+#: src/ephy-history-window.c:646
 msgid "Open in New _Tab"
 msgstr "Åpne i ny _fane"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:156
+#: src/bookmarks/ephy-bookmarks-editor.c:158
 msgid "Open the selected bookmark in a new tab"
 msgstr "Åpne valgte bokmerker i en ny fane"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:158
+#: src/bookmarks/ephy-bookmarks-editor.c:160
 msgid "_Rename"
 msgstr "End_re navn"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:159
+#: src/bookmarks/ephy-bookmarks-editor.c:161
 msgid "Rename the selected bookmark or topic"
 msgstr "Endre navn på valgt bokmerke eller emne"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:160 src/ephy-history-window.c:130
+#: src/bookmarks/ephy-bookmarks-editor.c:162 src/ephy-history-window.c:133
 msgid "_Delete"
 msgstr "_Slett"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:161
+#: src/bookmarks/ephy-bookmarks-editor.c:163
 msgid "Delete the selected bookmark or topic"
 msgstr "Slett valgt bokmerke eller emne"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:163
+#: src/bookmarks/ephy-bookmarks-editor.c:165
 msgid "_Show in Bookmarks Bar"
 msgstr "Vi_s i bokmerkelinjen"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:164
+#: src/bookmarks/ephy-bookmarks-editor.c:166
 msgid "Show the selected bookmark or topic in the bookmarks bar"
 msgstr "Vis valgt bokmerke eller emne i bokmerkelinjen"
 
 # (ugh)
-#: src/bookmarks/ephy-bookmarks-editor.c:166
+#: src/bookmarks/ephy-bookmarks-editor.c:168
 msgid "_Properties"
 msgstr "Egenska_per"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:167
+#: src/bookmarks/ephy-bookmarks-editor.c:169
 msgid "View or modify the properties of the selected bookmark"
 msgstr "Vis eller endre egenskaper for valgt bokmerke"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:169 src/ephy-history-window.c:136
+#: src/bookmarks/ephy-bookmarks-editor.c:171 src/ephy-history-window.c:139
 #: src/ephy-window.c:86
 msgid "_Close"
 msgstr "L_ukk"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:170
+#: src/bookmarks/ephy-bookmarks-editor.c:172
 msgid "Close the bookmarks window"
 msgstr "Lukk bokmerkevinduet"
 
 #. Edit Menu
-#: src/bookmarks/ephy-bookmarks-editor.c:174 src/ephy-history-window.c:141
+#: src/bookmarks/ephy-bookmarks-editor.c:176 src/ephy-history-window.c:144
 #: src/ephy-window.c:91
 msgid "Cu_t"
 msgstr "Klipp u_t"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:175 src/ephy-history-window.c:142
+#: src/bookmarks/ephy-bookmarks-editor.c:177 src/ephy-history-window.c:145
 #: src/ephy-window.c:92
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:177
-#: src/bookmarks/ephy-bookmarks-editor.c:748 src/ephy-history-window.c:144
-#: src/ephy-history-window.c:563 src/ephy-window.c:94
+#: src/bookmarks/ephy-bookmarks-editor.c:179
+#: src/bookmarks/ephy-bookmarks-editor.c:752 src/ephy-history-window.c:147
+#: src/ephy-history-window.c:655 src/ephy-window.c:94
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:178 src/ephy-history-window.c:145
+#: src/bookmarks/ephy-bookmarks-editor.c:180 src/ephy-history-window.c:148
 #: src/ephy-window.c:95
 msgid "Copy the selection"
 msgstr "Kopier utvalget"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:180 src/ephy-history-window.c:147
+#: src/bookmarks/ephy-bookmarks-editor.c:182 src/ephy-history-window.c:150
 #: src/ephy-window.c:97
 msgid "_Paste"
 msgstr "Li_m inn"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:181 src/ephy-history-window.c:148
+#: src/bookmarks/ephy-bookmarks-editor.c:183 src/ephy-history-window.c:151
 msgid "Paste the clipboard"
 msgstr "Lim inn utklippstavlen"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:183 src/ephy-history-window.c:150
+#: src/bookmarks/ephy-bookmarks-editor.c:185 src/ephy-history-window.c:153
 #: src/ephy-window.c:100
 msgid "Select _All"
 msgstr "Velg _alt"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:184
+#: src/bookmarks/ephy-bookmarks-editor.c:186
 msgid "Select all bookmarks or text"
 msgstr "Velg alle bokmerker eller all tekst"
 
 #. View Menu
-#: src/bookmarks/ephy-bookmarks-editor.c:188 src/ephy-history-window.c:158
+#: src/bookmarks/ephy-bookmarks-editor.c:190 src/ephy-history-window.c:161
 msgid "_Title"
 msgstr "_Tittel"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:189 src/ephy-history-window.c:159
+#: src/bookmarks/ephy-bookmarks-editor.c:191 src/ephy-history-window.c:162
 msgid "Show only the title column"
 msgstr "Vis kun tittelkolonnen"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:191 src/ephy-history-window.c:161
-msgid "_Location"
-msgstr "_Adresse"
+#: src/bookmarks/ephy-bookmarks-editor.c:193 src/ephy-history-window.c:164
+msgid "_Address"
+msgstr ""
 
-#: src/bookmarks/ephy-bookmarks-editor.c:192 src/ephy-history-window.c:162
-msgid "Show only the location column"
-msgstr "Vis kun adressekolonnen"
+#: src/bookmarks/ephy-bookmarks-editor.c:194 src/ephy-history-window.c:165
+#, fuzzy
+msgid "Show only the address column"
+msgstr "Vis kun tittelkolonnen"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:194 src/ephy-history-window.c:164
-msgid "T_itle and Location"
-msgstr "T_ittel og adresse"
+#: src/bookmarks/ephy-bookmarks-editor.c:196 src/ephy-history-window.c:167
+msgid "T_itle and Address"
+msgstr ""
 
-#: src/bookmarks/ephy-bookmarks-editor.c:195 src/ephy-history-window.c:165
-msgid "Show both the title and location columns"
+#: src/bookmarks/ephy-bookmarks-editor.c:197 src/ephy-history-window.c:168
+#, fuzzy
+msgid "Show both the title and address columns"
 msgstr "Vis både tittel- og adressekolonnene"
 
 #. Help Menu
-#: src/bookmarks/ephy-bookmarks-editor.c:199 src/ephy-history-window.c:169
+#: src/bookmarks/ephy-bookmarks-editor.c:201 src/ephy-history-window.c:172
 #: src/ephy-window.c:196
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:200
+#: src/bookmarks/ephy-bookmarks-editor.c:202
 msgid "Display bookmarks help"
 msgstr "Vis hjelp for bokmerker"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:202 src/ephy-history-window.c:172
+#: src/bookmarks/ephy-bookmarks-editor.c:204 src/ephy-history-window.c:175
 #: src/ephy-window.c:199
 msgid "_About"
 msgstr "_Om"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:203 src/ephy-history-window.c:173
+#: src/bookmarks/ephy-bookmarks-editor.c:205 src/ephy-history-window.c:176
 #: src/ephy-window.c:200
 msgid "Display credits for the web browser creators"
 msgstr "Vis kreditering for skaperene av nettleseren"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:245
+#: src/bookmarks/ephy-bookmarks-editor.c:247
 msgid "Type a topic"
 msgstr "Skriv et emne"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:733 src/ephy-history-window.c:548
+#: src/bookmarks/ephy-bookmarks-editor.c:737 src/ephy-history-window.c:640
 msgid "_Open in New Windows"
 msgstr "_Åpne i nye vinduer"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:734 src/ephy-history-window.c:549
+#: src/bookmarks/ephy-bookmarks-editor.c:738 src/ephy-history-window.c:641
 msgid "Open in New _Tabs"
 msgstr "_Åpne i nye _faner"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:744 src/ephy-history-window.c:559
-msgid "_Copy Location"
-msgstr "_Kopier adresse"
+#: src/bookmarks/ephy-bookmarks-editor.c:748 src/ephy-history-window.c:651
+#, fuzzy
+msgid "_Copy Address"
+msgstr "Kopier e-postadresse"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1023 src/ephy-history-window.c:731
+#: src/bookmarks/ephy-bookmarks-editor.c:1028 src/ephy-history-window.c:875
 msgid "_Search:"
 msgstr "_Søk:"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1114
+#: src/bookmarks/ephy-bookmarks-editor.c:1119
 msgid "Bookmarks"
 msgstr "Bokmerker"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1186
+#: src/bookmarks/ephy-bookmarks-editor.c:1191
 msgid "Topics"
 msgstr "Emner"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1242 src/ephy-history-window.c:916
+#: src/bookmarks/ephy-bookmarks-editor.c:1247 src/ephy-history-window.c:1058
 msgid "Title"
 msgstr "Tittel"
 
-#: src/bookmarks/ephy-new-bookmark.c:261
+#: src/bookmarks/ephy-new-bookmark.c:262
 msgid "New Bookmark"
 msgstr "Nytt bokmerke"
 
-#: src/ephy-go-action.c:74
+#. FIXME: We "should" use gtk_message dialog here
+#. * but it doesn't support markup of text yet
+#. * so we build our own. See bug 65501.
+#.
+#: src/bookmarks/ephy-new-bookmark.c:306
+#, fuzzy
+msgid "Duplicated bookmark"
+msgstr "Vis hjelp for bokmerker"
+
+#: src/bookmarks/ephy-new-bookmark.c:334
+msgid "A bookmark titled "
+msgstr ""
+
+#: src/bookmarks/ephy-new-bookmark.c:335
+msgid " already exists for this address."
+msgstr ""
+
+#: src/bookmarks/ephy-topic-action.c:188
+#, fuzzy
+msgid "Empty"
+msgstr "Epiphany"
+
+#: src/ephy-go-action.c:74 src/toolbar.c:311
 msgid "Go"
 msgstr "Gå til"
 
-#: src/ephy-history-window.c:125
-msgid "Open the selected history item in a new window"
+#: src/ephy-history-window.c:128
+#, fuzzy
+msgid "Open the selected history link in a new window"
 msgstr "Åpne valgt oppføring i historikken i et nytt vindu"
 
-#: src/ephy-history-window.c:128
-msgid "Open the selected history item in a new tab"
+#: src/ephy-history-window.c:131
+#, fuzzy
+msgid "Open the selected history link in a new tab"
 msgstr "Åpne valgt oppføring i historikken i en ny fane"
 
-#: src/ephy-history-window.c:131
-msgid "Delete the selected history item"
+#: src/ephy-history-window.c:134
+#, fuzzy
+msgid "Delete the selected history link"
 msgstr "Slett valgt oppføring fra historikken"
 
-#: src/ephy-history-window.c:133 src/ephy-window.c:83
-msgid "Boo_kmark Page..."
-msgstr "Lag bo_kmerke av siden..."
+#: src/ephy-history-window.c:136
+#, fuzzy
+msgid "Boo_kmark Link..."
+msgstr "_Lag bokmerke av lenke..."
 
-#: src/ephy-history-window.c:134
-msgid "Bookmark the selected history item"
+#: src/ephy-history-window.c:137
+#, fuzzy
+msgid "Bookmark the selected history link"
 msgstr "Lag bokmerke av valgt oppføring fra historikken"
 
-#: src/ephy-history-window.c:137
+#: src/ephy-history-window.c:140
 msgid "Close the history window"
 msgstr "Lukk historikkvinduet"
 
-#: src/ephy-history-window.c:151
-msgid "Select all history items or text"
+#: src/ephy-history-window.c:154
+#, fuzzy
+msgid "Select all history links or text"
 msgstr "Velg alle oppføringer eller tekst for historikk"
 
-#: src/ephy-history-window.c:153
+#: src/ephy-history-window.c:156
 msgid "C_lear History"
 msgstr "_Tøm historikk"
 
-#: src/ephy-history-window.c:154
+#: src/ephy-history-window.c:157
 msgid "Clear your browsing history"
 msgstr "Tøm nettleserens historikk?"
 
-#: src/ephy-history-window.c:170
+#: src/ephy-history-window.c:173
 msgid "Display history help"
 msgstr "Vis hjelp for historikk"
 
-#: src/ephy-history-window.c:806
+#: src/ephy-history-window.c:217
+#, fuzzy
+msgid "Clear history"
+msgstr "_Tøm historikk"
+
+#: src/ephy-history-window.c:248
+#, fuzzy
+msgid "Clear browsing history?"
+msgstr "Tøm nettleserens historikk?"
+
+#: src/ephy-history-window.c:255
+msgid ""
+"Clearing the browsing history will cause all history links to be permanently "
+"deleted."
+msgstr ""
+
+#: src/ephy-history-window.c:948
 msgid "History"
 msgstr "Historie"
 
-#: src/ephy-history-window.c:875
+#: src/ephy-history-window.c:1012
 msgid "Sites"
 msgstr "Nettsteder"
 
-#: src/ephy-history-window.c:920
-msgid "Location"
-msgstr "Lokasjon"
+#: src/ephy-history-window.c:1062
+msgid "Address"
+msgstr ""
 
 #: src/ephy-main.c:71
 msgid "Open a new tab in an existing Ephy window"
@@ -2185,6 +2267,10 @@ msgstr "Epiphany"
 msgid "Ephy already running, using existing process"
 msgstr "Epiphany kjører allerede, bruker eksisterende prosess"
 
+#: src/ephy-notebook.c:852 src/ephy-tab.c:1014 src/window-commands.c:273
+msgid "Untitled"
+msgstr "Uten tittel"
+
 #: src/ephy-nautilus-view.c:744
 msgid "name of icon for the mozilla view"
 msgstr "navn på ikon for mozilla-visning"
@@ -2225,31 +2311,36 @@ msgstr "Import av bokmerker fra Konqueror fullført."
 msgid "Importing Konqueror bookmarks failed."
 msgstr "Import av bokmerker fra Konqueror feilet."
 
-#: src/ephy-tab.c:623
+#: src/ephy-tab.c:457
+#, fuzzy
+msgid "Blank page"
+msgstr "Vis _tom side"
+
+#: src/ephy-tab.c:502
 msgid "site"
 msgstr "nettsted"
 
-#: src/ephy-tab.c:649
+#: src/ephy-tab.c:528
 #, c-format
 msgid "Redirecting to %s..."
 msgstr "Omdirigerer til %s..."
 
-#: src/ephy-tab.c:653
+#: src/ephy-tab.c:532
 #, c-format
 msgid "Transferring data from %s..."
 msgstr "Overfører data fra %s..."
 
-#: src/ephy-tab.c:657
+#: src/ephy-tab.c:536
 #, c-format
 msgid "Waiting for authorization from %s..."
 msgstr "Venter på godkjenning fra %s..."
 
-#: src/ephy-tab.c:665
+#: src/ephy-tab.c:544
 #, c-format
 msgid "Loading %s..."
 msgstr "Laster %s..."
 
-#: src/ephy-tab.c:669
+#: src/ephy-tab.c:548
 msgid "Done."
 msgstr "Ferdig."
 
@@ -2306,6 +2397,10 @@ msgstr "S_end til..."
 msgid "Send a link of the current page"
 msgstr "Send en lenke til denne siden"
 
+#: src/ephy-window.c:83
+msgid "Boo_kmark Page..."
+msgstr "Lag bo_kmerke av siden..."
+
 #: src/ephy-window.c:84
 msgid "Add a bookmark for the current page"
 msgstr "Legg til et bokmerke for denne siden"
@@ -2597,8 +2692,9 @@ msgid "_Bookmark Link..."
 msgstr "_Lag bokmerke av lenke..."
 
 #: src/ephy-window.c:232
-msgid "_Copy Link Location"
-msgstr "_Kopier lenkens adresse"
+#, fuzzy
+msgid "_Copy Link Address"
+msgstr "Kopier e-postadresse"
 
 #: src/ephy-window.c:234
 msgid "Copy _Email"
@@ -2626,42 +2722,43 @@ msgid "Use Image As _Background"
 msgstr "Bruk bilde som _bakgrunn"
 
 #: src/ephy-window.c:248
-msgid "_Copy Image Location"
-msgstr "_Kopier bildeplassering"
+#, fuzzy
+msgid "_Copy Image Address"
+msgstr "Kopier e-postadresse"
 
-#: src/ephy-window.c:493
+#: src/ephy-window.c:492
 msgid "Open"
 msgstr "Åpne"
 
-#: src/ephy-window.c:495
+#: src/ephy-window.c:494
 msgid "Save As"
 msgstr "Lagre som"
 
-#: src/ephy-window.c:499
+#: src/ephy-window.c:498
 msgid "Bookmark"
 msgstr "Bokmerke"
 
-#: src/ephy-window.c:1070
+#: src/ephy-window.c:1050
 msgid "Insecure"
 msgstr "Usikker"
 
-#: src/ephy-window.c:1073
+#: src/ephy-window.c:1053
 msgid "Broken"
 msgstr "Ødelagt"
 
-#: src/ephy-window.c:1076
+#: src/ephy-window.c:1056
 msgid "Medium"
 msgstr "Middels"
 
-#: src/ephy-window.c:1080
+#: src/ephy-window.c:1060
 msgid "Low"
 msgstr "Lav"
 
-#: src/ephy-window.c:1084
+#: src/ephy-window.c:1064
 msgid "High"
 msgstr "Høy"
 
-#: src/ephy-window.c:1094
+#: src/ephy-window.c:1074
 #, c-format
 msgid ""
 "Security level: %s\n"
@@ -2670,269 +2767,257 @@ msgstr ""
 "Sikkerhetsnivå: %s\n"
 "%s"
 
-#: src/ephy-window.c:1100
+#: src/ephy-window.c:1080
 #, c-format
 msgid "Security level: %s"
 msgstr "Sikkerhetsnivå: %s"
 
-#: src/general-prefs.c:86
+#: src/pdm-dialog.c:224
+msgid "Host"
+msgstr "Vert"
+
+#: src/pdm-dialog.c:236
+msgid "User Name"
+msgstr "Brukernavn"
+
+#: src/pdm-dialog.c:281
+msgid "Domain"
+msgstr "Domene"
+
+#: src/pdm-dialog.c:293
+msgid "Name"
+msgstr "Navn"
+
+# (ugh)
+#: src/pdm-dialog.c:599
+msgid "Cookie properties"
+msgstr "Egenskaper for informasjonskapsel"
+
+#: src/pdm-dialog.c:612
+msgid "Value"
+msgstr "Verdi"
+
+#: src/pdm-dialog.c:626
+msgid "Path"
+msgstr "Sti"
+
+#: src/pdm-dialog.c:640
+msgid "Secure"
+msgstr "Sikker"
+
+#: src/pdm-dialog.c:654
+msgid "Expire"
+msgstr "Utgå"
+
+#: src/ppview-toolbar.c:88
+msgid "Go to the first page"
+msgstr "Gå til den første siden"
+
+#: src/ppview-toolbar.c:92
+msgid "Go to the last page"
+msgstr "Gå til den siste siden"
+
+#: src/ppview-toolbar.c:96
+msgid "Go to the previous page"
+msgstr "Gå til forrige side"
+
+#: src/ppview-toolbar.c:100
+msgid "Go to next page"
+msgstr "Gå til neste side"
+
+#: src/ppview-toolbar.c:102
+msgid "Close"
+msgstr "Lukk"
+
+#: src/ppview-toolbar.c:104
+msgid "Close print preview"
+msgstr "Lukk forhåndsvisning av utskrift"
+
+#: src/prefs-dialog.c:102
+#, fuzzy
+msgid "System language"
+msgstr "Språk"
+
+#: src/prefs-dialog.c:103
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: src/general-prefs.c:87
+#: src/prefs-dialog.c:104
 msgid "Albanian"
 msgstr "Albansk"
 
-#: src/general-prefs.c:89
+#: src/prefs-dialog.c:106
 msgid "Azerbaijani"
 msgstr "Asserbajdsjansk"
 
-#: src/general-prefs.c:90
+#: src/prefs-dialog.c:107
 msgid "Basque"
 msgstr "Baskisk"
 
-#: src/general-prefs.c:91
+#: src/prefs-dialog.c:108
 msgid "Breton"
 msgstr "Breton"
 
-#: src/general-prefs.c:92
+#: src/prefs-dialog.c:109
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: src/general-prefs.c:93
+#: src/prefs-dialog.c:110
 msgid "Byelorussian"
 msgstr "Hvite-russisk"
 
-#: src/general-prefs.c:94
+#: src/prefs-dialog.c:111
 msgid "Catalan"
 msgstr "Katalansk"
 
-#: src/general-prefs.c:96
+#: src/prefs-dialog.c:113
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: src/general-prefs.c:97
+#: src/prefs-dialog.c:114
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: src/general-prefs.c:98
+#: src/prefs-dialog.c:115
 msgid "Danish"
 msgstr "Dansk"
 
-#: src/general-prefs.c:99
+#: src/prefs-dialog.c:116
 msgid "Dutch"
 msgstr "Nederlandsk"
 
-#: src/general-prefs.c:100
+#: src/prefs-dialog.c:117
 msgid "English"
 msgstr "Engelsk"
 
-#: src/general-prefs.c:101
+#: src/prefs-dialog.c:118
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: src/general-prefs.c:102
+#: src/prefs-dialog.c:119
 msgid "Estonian"
 msgstr "Estisk"
 
-#: src/general-prefs.c:103
+#: src/prefs-dialog.c:120
 msgid "Faeroese"
 msgstr "Færøysk"
 
-#: src/general-prefs.c:104
+#: src/prefs-dialog.c:121
 msgid "Finnish"
 msgstr "Finsk"
 
-#: src/general-prefs.c:105
+#: src/prefs-dialog.c:122
 msgid "French"
 msgstr "Fransk"
 
-#: src/general-prefs.c:106
+#: src/prefs-dialog.c:123
 msgid "Galician"
 msgstr "Galisisk"
 
-#: src/general-prefs.c:107
+#: src/prefs-dialog.c:124
 msgid "German"
 msgstr "Tysk"
 
-#: src/general-prefs.c:110
+#: src/prefs-dialog.c:127
 msgid "Hungarian"
 msgstr "Ungarsk"
 
-#: src/general-prefs.c:111
+#: src/prefs-dialog.c:128
 msgid "Icelandic"
 msgstr "Islandsk"
 
-#: src/general-prefs.c:112
+#: src/prefs-dialog.c:129
 msgid "Indonesian"
 msgstr "Indonesisk"
 
-#: src/general-prefs.c:113
+#: src/prefs-dialog.c:130
 msgid "Irish"
 msgstr "Irsk"
 
-#: src/general-prefs.c:114
+#: src/prefs-dialog.c:131
 msgid "Italian"
 msgstr "Italiensk"
 
-#: src/general-prefs.c:117
+#: src/prefs-dialog.c:134
 msgid "Latvian"
 msgstr "Latvisk"
 
-#: src/general-prefs.c:118
+#: src/prefs-dialog.c:135
 msgid "Lithuanian"
 msgstr "Litauisk"
 
-#: src/general-prefs.c:119
+#: src/prefs-dialog.c:136
 msgid "Macedonian"
 msgstr "Makedonsk"
 
-#: src/general-prefs.c:120
+#: src/prefs-dialog.c:137
 msgid "Malay"
 msgstr "Malaysisk"
 
-#: src/general-prefs.c:121
+#: src/prefs-dialog.c:138
 msgid "Norwegian/Nynorsk"
 msgstr "Norsk/nynorsk"
 
-#: src/general-prefs.c:122
+#: src/prefs-dialog.c:139
 msgid "Norwegian/Bokmaal"
 msgstr "Norsk/bokmål"
 
-#: src/general-prefs.c:123
+#: src/prefs-dialog.c:140
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: src/general-prefs.c:124
+#: src/prefs-dialog.c:141
 msgid "Polish"
 msgstr "Polsk"
 
-#: src/general-prefs.c:125
+#: src/prefs-dialog.c:142
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: src/general-prefs.c:126
+#: src/prefs-dialog.c:143
 msgid "Portuguese of Brazil"
 msgstr "Portugisisk, brasiliensk"
 
-#: src/general-prefs.c:127
+#: src/prefs-dialog.c:144
 msgid "Romanian"
 msgstr "Rumensk"
 
-#: src/general-prefs.c:129
+#: src/prefs-dialog.c:146
 msgid "Scottish"
 msgstr "Skotsk"
 
-#: src/general-prefs.c:130
+#: src/prefs-dialog.c:147
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: src/general-prefs.c:131
+#: src/prefs-dialog.c:148
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: src/general-prefs.c:132
+#: src/prefs-dialog.c:149
 msgid "Slovenian"
 msgstr "Slovensk"
 
-#: src/general-prefs.c:133
+#: src/prefs-dialog.c:150
 msgid "Spanish"
 msgstr "Spansk"
 
-#: src/general-prefs.c:134
+#: src/prefs-dialog.c:151
 msgid "Swedish"
 msgstr "Svensk"
 
-#: src/general-prefs.c:135
+#: src/prefs-dialog.c:152
 msgid "Tamil"
 msgstr "Tamilsk"
 
-#: src/general-prefs.c:138
+#: src/prefs-dialog.c:155
 msgid "Vietnamian"
 msgstr "Vietnamesisk"
 
-#: src/general-prefs.c:139
+#: src/prefs-dialog.c:156
 msgid "Walloon"
 msgstr "Walloon"
 
-#: src/pdm-dialog.c:224
-msgid "Host"
-msgstr "Vert"
-
-#: src/pdm-dialog.c:236
-msgid "User Name"
-msgstr "Brukernavn"
-
-#: src/pdm-dialog.c:281
-msgid "Domain"
-msgstr "Domene"
-
-#: src/pdm-dialog.c:293
-msgid "Name"
-msgstr "Navn"
-
-# (ugh)
-#: src/pdm-dialog.c:599
-msgid "Cookie properties"
-msgstr "Egenskaper for informasjonskapsel"
-
-#: src/pdm-dialog.c:612
-msgid "Value"
-msgstr "Verdi"
-
-#: src/pdm-dialog.c:626
-msgid "Path"
-msgstr "Sti"
-
-#: src/pdm-dialog.c:640
-msgid "Secure"
-msgstr "Sikker"
-
-#: src/pdm-dialog.c:654
-msgid "Expire"
-msgstr "Utgå"
-
-#: src/ppview-toolbar.c:88
-msgid "Go to the first page"
-msgstr "Gå til den første siden"
-
-#: src/ppview-toolbar.c:92
-msgid "Go to the last page"
-msgstr "Gå til den siste siden"
-
-#: src/ppview-toolbar.c:96
-msgid "Go to the previous page"
-msgstr "Gå til forrige side"
-
-#: src/ppview-toolbar.c:100
-msgid "Go to next page"
-msgstr "Gå til neste side"
-
-#: src/ppview-toolbar.c:102
-msgid "Close"
-msgstr "Lukk"
-
-#: src/ppview-toolbar.c:104
-msgid "Close print preview"
-msgstr "Lukk forhåndsvisning av utskrift"
-
-#: src/prefs-dialog.c:264 src/window-commands.c:716
-#, c-format
-msgid "Could not display help: %s"
-msgstr "Kunne ikke vise hjelp: %s"
-
-#: src/prefs-dialog.c:306
-msgid "User Interface"
-msgstr "Grensesnitt"
-
-#: src/prefs-dialog.c:307
-msgid "Advanced"
-msgstr "Avansert"
-
-#: src/prefs-dialog.c:351
-msgid "Preferences"
-msgstr "Brukervalg..."
-
 #: src/session.c:189
 msgid "Crash Recovery"
 msgstr "Krasjsikring"
@@ -2955,19 +3040,31 @@ msgstr ""
 msgid "You can recover the opened tabs and windows."
 msgstr "Du kan gjenopprette de åpne fanene og vinduene."
 
-#: src/toolbar.c:245
+#: src/toolbar.c:247
 msgid "Back"
 msgstr "Tilbake"
 
-#: src/toolbar.c:257
+#: src/toolbar.c:259
 msgid "Forward"
 msgstr "Forover"
 
-#: src/toolbar.c:269
+#: src/toolbar.c:271
 msgid "Up"
 msgstr "Opp"
 
-#: src/window-commands.c:143
+#: src/toolbar.c:283
+msgid "Spinner"
+msgstr ""
+
+#: src/toolbar.c:293
+msgid "Address Entry"
+msgstr ""
+
+#: src/toolbar.c:303
+msgid "Favicon"
+msgstr ""
+
+#: src/window-commands.c:142
 msgid "Check this out!"
 msgstr "Sjekk ut dette!"
 
@@ -2975,15 +3072,126 @@ msgstr "Sjekk ut dette!"
 msgid "Select the file to open"
 msgstr "Velg fil som skal åpnes"
 
+#: src/window-commands.c:689
+#, fuzzy
+msgid "Toolbar editor"
+msgstr "Oppsett av verktøylinjer"
+
+#: src/window-commands.c:705
+msgid "_Add a New Toolbar"
+msgstr "_Legg til en ny verktøylinje"
+
 #. Translator credits
-#: src/window-commands.c:748
+#: src/window-commands.c:750
 msgid "translator_credits"
 msgstr "Kjartan Maraas <kmaraas@gnome.org>"
 
-#: src/window-commands.c:765
+#: src/window-commands.c:767
 msgid "A GNOME browser based on Mozilla"
 msgstr "En nettleser for GNOME, basert på Mozilla"
 
+#~ msgid "Default sidebar page"
+#~ msgstr "Forvalgt side på sidelinjen"
+
+#~ msgid "Default sidebar page."
+#~ msgstr "Forvalgt side på sidelinjen."
+
+#~ msgid "Default sidebar size"
+#~ msgstr "Forvalgt størrelse på sidelinjen"
+
+#~ msgid "Default sidebar size."
+#~ msgstr "Forvalgt størrelse på sidelinjen."
+
+#~ msgid "Open popups in tabs"
+#~ msgstr "Åpne oppsprettvinduer i faner"
+
+#~ msgid "Open popups in tabs instead of new windows."
+#~ msgstr "Åpne oppsprettvinduer i faner i stedet for nye vinduer."
+
+#~ msgid "Show sidebar by default"
+#~ msgstr "Vis sidelinje som forvalg"
+
+#~ msgid "Show sidebar by default."
+#~ msgstr "Vis sidelinje som forvalg."
+
+#~ msgid "Show sidebar in full screen mode"
+#~ msgstr "Vis sidelinje i fullskjermmodus"
+
+#~ msgid "Show sidebar in full screen mode."
+#~ msgstr "Vis sidelinje i fullskjermmodus."
+
+#~ msgid "Show statusbar in full screen mode"
+#~ msgstr "Vis statuslinje i fullskjermmodus"
+
+#~ msgid "Show statusbar in full screen mode."
+#~ msgstr "Vis statuslinje i fullskjermmodus."
+
+#~ msgid "Show toolbars in full screen mode"
+#~ msgstr "Vis verktøylinjer i fullskjermmodus"
+
+#~ msgid "Show toolbars in full screen mode."
+#~ msgstr "Vis verktøylinjer i fullskjermmodus."
+
+#~ msgid "<b>File:</b>"
+#~ msgstr "<b>Fil:</b>"
+
+#~ msgid "<b>Find text in the document:</b>"
+#~ msgstr "<b>Finn tekst i dokumentet:</b>"
+
+#~ msgid "<b>Location:</b>"
+#~ msgstr "<b>Lokasjon:</b>"
+
+#~ msgid "Automatically _wrap around"
+#~ msgstr "_Bryt teksten automatisk"
+
+#~ msgid "Find text..."
+#~ msgstr "Finn tekst..."
+
+#~ msgid "Open _popups in tabs"
+#~ msgstr "Åpne o_ppsprettvinduer i faner"
+
+#~ msgid "_Jump to new tabs automatically"
+#~ msgstr "_Hopp til nye faner automatisk"
+
+#~ msgid "_Location:"
+#~ msgstr "_Lokasjon:"
+
+#~ msgid "Page _URL"
+#~ msgstr "Sidens _URL"
+
+#~ msgid "00.00"
+#~ msgstr "00.00"
+
+#~ msgid "People"
+#~ msgstr "Folk"
+
+#~ msgid "Art"
+#~ msgstr "Kunst"
+
+#~ msgid "_Location"
+#~ msgstr "_Adresse"
+
+#~ msgid "Show only the location column"
+#~ msgstr "Vis kun adressekolonnen"
+
+#~ msgid "T_itle and Location"
+#~ msgstr "T_ittel og adresse"
+
+#~ msgid "_Copy Location"
+#~ msgstr "_Kopier adresse"
+
+#~ msgid "Location"
+#~ msgstr "Lokasjon"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Kopier lenkens adresse"
+
+#~ msgid "_Copy Image Location"
+#~ msgstr "_Kopier bildeplassering"
+
+#~ msgid "User Interface"
+#~ msgstr "Grensesnitt"
+
 #~ msgid "C_lear"
 #~ msgstr "Nu_llstill"
 
@@ -3005,9 +3213,6 @@ msgstr "En nettleser for GNOME, basert på Mozilla"
 #~ msgid "Week"
 #~ msgstr "Uke"
 
-#~ msgid "_Find:"
-#~ msgstr "_Finn:"
-
 #~ msgid "_Time:"
 #~ msgstr "_Tid:"