Release 1.3.0Release130

1 files changed, 677 insertions, 636 deletions

diff --git a/po/no.po b/po/no.po
index 9bf64e159..ab602e00b 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: galeon 1.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-24 18:21+0100\n"
+"POT-Creation-Date: 2004-05-31 12:02+0200\n"
 "PO-Revision-Date: 2004-02-24 18:22+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
@@ -20,26 +20,6 @@ msgstr ""
 msgid "Epiphany automation"
 msgstr "Epiphany automatisering"
 
-#: data/GNOME_Epiphany_NautilusView.server.in.h:1
-msgid "Epiphany Nautilus view"
-msgstr "Epiphany Nautilus-visning"
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:2
-msgid "Epiphany content view component"
-msgstr "Epiphany innholdsvisningskomponent"
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:3
-msgid "View as Web Page"
-msgstr "Vis som nettside"
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:4
-msgid "Web Page"
-msgstr "Nettside"
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:5
-msgid "Web Page Viewer"
-msgstr "Visning av nettside"
-
 #: data/bme.desktop.in.h:1
 msgid "Browse and organize your bookmarks"
 msgstr "Bla gjennom og organiser dine bokmerker"
@@ -598,7 +578,7 @@ msgid "MD5 Fingerprint:"
 msgstr "MD5-fingeravtrykk:"
 
 #: data/glade/certificate-dialogs.glade.h:16
-#: embed/mozilla/GtkNSSDialogs.cpp:964
+#: embed/mozilla/GtkNSSDialogs.cpp:969
 msgid "Organization:"
 msgstr "Organisasjon:"
 
@@ -643,8 +623,7 @@ msgstr "Informasjonskapsler"
 msgid "Download Manager"
 msgstr "Nedlastingshåndterer"
 
-#: data/glade/epiphany.glade.h:8 data/ui/nautilus-epiphany-view.xml.h:11
-#: src/ephy-window.c:951
+#: data/glade/epiphany.glade.h:8 src/ephy-window.c:1023
 msgid "Find"
 msgstr "Finn"
 
@@ -660,7 +639,7 @@ msgstr "Håndtering av personlige data"
 msgid "Text Encoding"
 msgstr "Tekstkoding"
 
-#: data/glade/epiphany.glade.h:12 src/ephy-encoding-menu.c:388
+#: data/glade/epiphany.glade.h:12 src/ephy-encoding-menu.c:368
 msgid "Use the encoding specified by the document"
 msgstr "Bruk koding som spesifisert av dokumentet"
 
@@ -672,7 +651,7 @@ msgstr "_Finn:"
 msgid "_Next"
 msgstr "_Neste"
 
-#: data/glade/epiphany.glade.h:15 embed/downloader-view.c:280
+#: data/glade/epiphany.glade.h:15 embed/downloader-view.c:279
 msgid "_Pause"
 msgstr "_Pause"
 
@@ -769,7 +748,8 @@ msgid "Fonts and Colors"
 msgstr "Skrifter og farger"
 
 #: data/glade/prefs-dialog.glade.h:24
-msgid "For _Language:"
+#, fuzzy
+msgid "For l_anguage:"
 msgstr "For _språk:"
 
 #: data/glade/prefs-dialog.glade.h:26
@@ -841,7 +821,7 @@ msgstr "_Aldri godta"
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: data/glade/prefs-dialog.glade.h:43 src/ephy-window.c:191
+#: data/glade/prefs-dialog.glade.h:43 src/ephy-window.c:201
 msgid "_Up"
 msgstr "_Opp"
 
@@ -925,8 +905,7 @@ msgstr "Side_nummer"
 msgid "Paper"
 msgstr "Papir"
 
-#: data/glade/print.glade.h:23 data/ui/nautilus-epiphany-view.xml.h:23
-#: src/ephy-window.c:947
+#: data/glade/print.glade.h:23 src/ephy-window.c:1019
 msgid "Print"
 msgstr "Skriv ut"
 
@@ -994,212 +973,60 @@ msgstr "fr_a:"
 msgid "lpr"
 msgstr "lpr"
 
-#: data/ui/nautilus-epiphany-view.xml.h:1
-msgid "Add Bookmark for Frame"
-msgstr "Legg til bokmerke for ramme"
-
-#: data/ui/nautilus-epiphany-view.xml.h:2
-msgid "Copy"
-msgstr "Kopier"
-
-#: data/ui/nautilus-epiphany-view.xml.h:3
-msgid "Copy Email Address"
-msgstr "Kopier e-postadresse"
-
-#: data/ui/nautilus-epiphany-view.xml.h:4
-msgid "Copy Image Address"
-msgstr "Kopier adressen til bildet"
-
-#: data/ui/nautilus-epiphany-view.xml.h:5
-msgid "Copy Link Address"
-msgstr "Kopier adressen til lenken"
-
-#: data/ui/nautilus-epiphany-view.xml.h:6
-msgid "Copy Page Address"
-msgstr "Kopier adressen til siden"
-
-#: data/ui/nautilus-epiphany-view.xml.h:7
-msgid "Copy the Selection"
-msgstr "Kopier utvalget"
-
-#: data/ui/nautilus-epiphany-view.xml.h:8
-msgid "Cut"
-msgstr "Klipp ut"
-
-#: data/ui/nautilus-epiphany-view.xml.h:9
-msgid "Cut the Selection"
-msgstr "Klipp ut utvalget"
-
-#: data/ui/nautilus-epiphany-view.xml.h:10
-#: embed/ephy-embed-popup-control.c:551
-msgid "Download Link"
-msgstr "Last ned lenke"
-
-#: data/ui/nautilus-epiphany-view.xml.h:12 src/ppview-toolbar.c:92
-msgid "First"
-msgstr "Første"
-
-#: data/ui/nautilus-epiphany-view.xml.h:13 src/ppview-toolbar.c:96
-msgid "Last"
-msgstr "Siste"
-
-#: data/ui/nautilus-epiphany-view.xml.h:14 src/ppview-toolbar.c:104
-msgid "Next"
-msgstr "Neste"
-
-#: data/ui/nautilus-epiphany-view.xml.h:15
-msgid "Open Frame"
-msgstr "Åpne ramme"
-
-#: data/ui/nautilus-epiphany-view.xml.h:16
-msgid "Open Frame in New Window"
-msgstr "Åpne ramme i nytt vindu"
-
-#: data/ui/nautilus-epiphany-view.xml.h:17
-msgid "Open Image"
-msgstr "Åpne bilde"
-
-#: data/ui/nautilus-epiphany-view.xml.h:18
-msgid "Open Image in New Window"
-msgstr "Åpne bilde i nytt vindu"
-
-#: data/ui/nautilus-epiphany-view.xml.h:19
-msgid "Open in New Window"
-msgstr "Åpne i nytt vindu"
-
-#: data/ui/nautilus-epiphany-view.xml.h:20
-msgid "Paste"
-msgstr "Lim inn"
-
-#: data/ui/nautilus-epiphany-view.xml.h:21
-msgid "Paste the Clipboard"
-msgstr "Lim inn utklippstavlen"
-
-#: data/ui/nautilus-epiphany-view.xml.h:22 src/ppview-toolbar.c:100
-msgid "Previous"
-msgstr "Forrige"
-
-#: data/ui/nautilus-epiphany-view.xml.h:24
-msgid "Print the Current File"
-msgstr "Skriv ut denne filen"
-
-#: data/ui/nautilus-epiphany-view.xml.h:25
-msgid "Save Background As..."
-msgstr "Lagre bakgrunn som..."
-
-#: data/ui/nautilus-epiphany-view.xml.h:26
-msgid "Save Image As..."
-msgstr "Lagre bilde som..."
-
-#: data/ui/nautilus-epiphany-view.xml.h:27
-msgid "Save Page As..."
-msgstr "Lagre siden som..."
-
-#: data/ui/nautilus-epiphany-view.xml.h:28
-msgid "Search for a String"
-msgstr "Søk etter en streng"
-
-#: data/ui/nautilus-epiphany-view.xml.h:29
-msgid "Select All"
-msgstr "Velg alt"
-
-#: data/ui/nautilus-epiphany-view.xml.h:30
-msgid "Select the Entire Document"
-msgstr "Marker hele dokumentet"
-
-#: data/ui/nautilus-epiphany-view.xml.h:31
-msgid "Text _Encoding..."
-msgstr "T_ekstkoding..."
-
-#: data/ui/nautilus-epiphany-view.xml.h:32
-msgid "Use Image As Background"
-msgstr "Bruk bilde som bakgrunn"
-
-#: data/ui/nautilus-epiphany-view.xml.h:33
-#: src/bookmarks/ephy-bookmarks-editor.c:162 src/ephy-history-window.c:152
-#: src/ephy-window.c:77
-msgid "_Edit"
-msgstr "R_ediger"
-
-#. Toplevel
-#: data/ui/nautilus-epiphany-view.xml.h:34
-#: src/bookmarks/ephy-bookmarks-editor.c:161 src/ephy-history-window.c:151
-#: src/ephy-window.c:76
-msgid "_File"
-msgstr "_Fil"
-
-#: data/ui/nautilus-epiphany-view.xml.h:35 src/ephy-window.c:134
-msgid "_Find..."
-msgstr "_Finn..."
-
-#: data/ui/nautilus-epiphany-view.xml.h:36 src/ephy-window.c:105
-msgid "_Print..."
-msgstr "_Skriv ut..."
-
-#: embed/downloader-view.c:225
+#: embed/downloader-view.c:224
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
-#: embed/downloader-view.c:229
+#: embed/downloader-view.c:228
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: embed/downloader-view.c:280
+#: embed/downloader-view.c:279
 msgid "_Resume"
 msgstr "_Gjenoppta"
 
-#: embed/downloader-view.c:343 lib/widgets/ephy-cell-renderer-progress.c:35
-#: src/ephy-window.c:1132
+#. Translator hint: this is a label on progress bars inside a tree view.
+#.
+#: embed/downloader-view.c:342 lib/widgets/ephy-cell-renderer-progress.c:246
+#: lib/widgets/ephy-cell-renderer-progress.c:306 src/ephy-window.c:1204
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: embed/downloader-view.c:394
+#: embed/downloader-view.c:393
 #, c-format
 msgid "About %d second left"
 msgid_plural "About %d seconds left"
 msgstr[0] "Omtrent %d sekund igjen"
 msgstr[1] "Omtrent %d sekunder igjen"
 
-#: embed/downloader-view.c:402
+#: embed/downloader-view.c:401
 #, c-format
 msgid "About %d minute left"
 msgid_plural "About %d minutes left"
 msgstr[0] "Omtrent %d minutt igjen"
 msgstr[1] "Omtrent %d minutter igjen"
 
-#: embed/downloader-view.c:409
+#: embed/downloader-view.c:408
 #, c-format
 msgid "%d download"
 msgid_plural "%d downloads"
 msgstr[0] "%d nedlasting"
 msgstr[1] "%d nedlastinger"
 
-#: embed/downloader-view.c:513
+#: embed/downloader-view.c:514
 msgid "%"
 msgstr "%"
 
-#: embed/downloader-view.c:524
+#: embed/downloader-view.c:525 src/bookmarks/ephy-bookmarks-editor.c:668
 msgid "File"
 msgstr "Fil"
 
-#: embed/downloader-view.c:538
+#: embed/downloader-view.c:539
 msgid "Remaining"
 msgstr "Gjenstår"
 
-#: embed/ephy-embed-popup-control.c:561 src/popup-commands.c:344
-msgid "Save Image As"
-msgstr "Lagre bilde som"
-
-#: embed/ephy-embed-popup-control.c:647
-msgid "Save Page As"
-msgstr "Lagre siden som"
-
-#: embed/ephy-embed-popup-control.c:656 src/popup-commands.c:434
-msgid "Save Background As"
-msgstr "Lagre bakgrunn som"
-
 #: embed/ephy-encodings.c:63
 msgid "Arabic (_IBM-864)"
 msgstr "Arabisk (_IBM-864)"
@@ -1420,183 +1247,175 @@ msgstr "Sør_europeisk (ISO-8859-3)"
 msgid "Thai (TIS-_620)"
 msgstr "Thai (TIS-_620)"
 
-#: embed/ephy-encodings.c:119
+#: embed/ephy-encodings.c:118
 msgid "Thai (IS_O-8859-11)"
 msgstr "Thai (IS_O-8859-11)"
 
-#: embed/ephy-encodings.c:120
+#: embed/ephy-encodings.c:119
 msgid "_Thai (Windows-874)"
 msgstr "_Thai (Windows-874)"
 
-#: embed/ephy-encodings.c:122
+#: embed/ephy-encodings.c:120
 msgid "Turkish (_IBM-857)"
 msgstr "Tyrkisk (_IBM-857)"
 
-#: embed/ephy-encodings.c:123
+#: embed/ephy-encodings.c:121
 msgid "Turkish (I_SO-8859-9)"
 msgstr "Tyrkisk (I_SO-8859-9)"
 
-#: embed/ephy-encodings.c:124
+#: embed/ephy-encodings.c:122
 msgid "Turkish (_MacTurkish)"
 msgstr "Tyrkisk (_MacTurkish)"
 
-#: embed/ephy-encodings.c:125
+#: embed/ephy-encodings.c:123
 msgid "Turkish (_Windows-1254)"
 msgstr "Tyrkisk (_Windows-1254)"
 
-#: embed/ephy-encodings.c:126
+#: embed/ephy-encodings.c:124
 msgid "Unicode (UTF-_8)"
 msgstr "Unicode (UTF-_8)"
 
-#: embed/ephy-encodings.c:127
+#: embed/ephy-encodings.c:125
 msgid "Cyrillic/Ukrainian (_KOI8-U)"
 msgstr "Kyrillisk/Ukrainsk (_KOI8-U)"
 
-#: embed/ephy-encodings.c:128
+#: embed/ephy-encodings.c:126
 msgid "Cyrillic/Ukrainian (Mac_Ukrainian)"
 msgstr "Kyrillisk/Ukrainsk (Mac_Ukrainian)"
 
-#: embed/ephy-encodings.c:129
+#: embed/ephy-encodings.c:127
 msgid "Vietnamese (_TCVN)"
 msgstr "Vietnamesisk (_TCVN)"
 
-#: embed/ephy-encodings.c:130
+#: embed/ephy-encodings.c:128
 msgid "Vietnamese (_VISCII)"
 msgstr "Vietnamesisk (_VISCII)"
 
-#: embed/ephy-encodings.c:131
+#: embed/ephy-encodings.c:129
 msgid "Vietnamese (V_PS)"
 msgstr "Vietnamesisk (V_PS)"
 
-#: embed/ephy-encodings.c:132
+#: embed/ephy-encodings.c:130
 msgid "Vietnamese (_Windows-1258)"
 msgstr "Vietnamesisk (_Windows-1258)"
 
-#: embed/ephy-encodings.c:133
+#: embed/ephy-encodings.c:131
 msgid "Western (_IBM-850)"
 msgstr "Vestlig (_IBM-850)"
 
-#: embed/ephy-encodings.c:134
+#: embed/ephy-encodings.c:132
 msgid "Western (_ISO-8859-1)"
 msgstr "Vestlig (_ISO-8859-1)"
 
-#: embed/ephy-encodings.c:135
+#: embed/ephy-encodings.c:133
 msgid "Western (IS_O-8859-15)"
 msgstr "Vestlig (IS_O-8859-15)"
 
-#: embed/ephy-encodings.c:136
+#: embed/ephy-encodings.c:134
 msgid "Western (_MacRoman)"
 msgstr "Vestlig (_MacRoman)"
 
-#: embed/ephy-encodings.c:137
+#: embed/ephy-encodings.c:135
 msgid "Western (_Windows-1252)"
 msgstr "Vestlig (_Windows-1252)"
 
 #. the following encodings are so rarely used that we don't want to pollute the "related"
 #. * part of the encodings menu with them, so we set the language group to 0 here
 #.
-#: embed/ephy-encodings.c:142
+#: embed/ephy-encodings.c:140
 msgid "English (_US-ASCII)"
 msgstr "Engelsk (_US-ASCII)"
 
-#: embed/ephy-encodings.c:143
+#: embed/ephy-encodings.c:141
 msgid "Unicode (UTF-_16 BE)"
 msgstr "Unicode (UTF-_16 BE)"
 
-#: embed/ephy-encodings.c:144
+#: embed/ephy-encodings.c:142
 msgid "Unicode (UTF-1_6 LE)"
 msgstr "Unicode (UTF-1_6 LE)"
 
-#: embed/ephy-encodings.c:145
+#: embed/ephy-encodings.c:143
 msgid "Unicode (UTF-_32 BE)"
 msgstr "Unicode (UTF-_32 BE)"
 
-#: embed/ephy-encodings.c:146
+#: embed/ephy-encodings.c:144
 msgid "Unicode (UTF-3_2 LE)"
 msgstr "Unicode (UTF-3_2 LE)"
 
-#: embed/ephy-encodings.c:148
+#: embed/ephy-encodings.c:146
 msgid "Off"
 msgstr "Av"
 
-#: embed/ephy-encodings.c:149 src/prefs-dialog.c:117
+#: embed/ephy-encodings.c:147 src/prefs-dialog.c:117
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: embed/ephy-encodings.c:150
+#: embed/ephy-encodings.c:148
 msgid "Chinese Simplified"
 msgstr "Kinesisk, forenklet"
 
-#: embed/ephy-encodings.c:151
+#: embed/ephy-encodings.c:149
 msgid "Chinese Traditional"
 msgstr "Kinesisk, tradisjonell"
 
-#: embed/ephy-encodings.c:152
+#: embed/ephy-encodings.c:150
 msgid "East Asian"
 msgstr "Øst-asiatisk"
 
-#: embed/ephy-encodings.c:153 lib/ephy-langs.c:38 src/prefs-dialog.c:137
+#: embed/ephy-encodings.c:151 lib/ephy-langs.c:38 src/prefs-dialog.c:137
 msgid "Japanese"
 msgstr "Japansk"
 
-#: embed/ephy-encodings.c:154 lib/ephy-langs.c:39 src/prefs-dialog.c:138
+#: embed/ephy-encodings.c:152 lib/ephy-langs.c:39 src/prefs-dialog.c:138
 msgid "Korean"
 msgstr "Koreansk"
 
-#: embed/ephy-encodings.c:155 src/prefs-dialog.c:150
+#: embed/ephy-encodings.c:153 src/prefs-dialog.c:150
 msgid "Russian"
 msgstr "Russisk"
 
-#: embed/ephy-encodings.c:156
+#: embed/ephy-encodings.c:154
 msgid "Universal"
 msgstr "Universell"
 
-#: embed/ephy-encodings.c:157 src/prefs-dialog.c:159
+#: embed/ephy-encodings.c:155 src/prefs-dialog.c:159
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
 #. translators: this is the title that an unknown encoding will
 #. * be displayed as.
 #.
-#: embed/ephy-encodings.c:320
+#: embed/ephy-encodings.c:318
 #, c-format
 msgid "Unknown (%s)"
 msgstr "Ukjent (%s)"
 
-#: embed/ephy-history.c:487 src/bookmarks/ephy-bookmarks.c:612
+#: embed/ephy-history.c:486 src/bookmarks/ephy-bookmarks.c:644
 msgid "All"
 msgstr "Alle"
 
-#: embed/ephy-history.c:662
+#: embed/ephy-history.c:660
 msgid "Others"
 msgstr "Andre"
 
-#: embed/ephy-history.c:668
+#: embed/ephy-history.c:666
 msgid "Local files"
 msgstr "Lokale filer"
 
-#: embed/mozilla/ContentHandler.cpp:135
-#: embed/mozilla/EphyHeaderSniffer.cpp:316
+#: embed/mozilla/ContentHandler.cpp:141
+#: embed/mozilla/EphyHeaderSniffer.cpp:348
 msgid "Save"
 msgstr "Lagre"
 
-#: embed/mozilla/ContentHandler.cpp:265
+#: embed/mozilla/ContentHandler.cpp:264
 msgid "_Save As..."
 msgstr "L_agre som..."
 
-#: embed/mozilla/ContentHandler.cpp:268
-msgid "_Open"
-msgstr "_Åpne"
-
-#: embed/mozilla/ContentHandler.cpp:268
-msgid "_Download"
-msgstr "Last ne_d"
-
-#: embed/mozilla/ContentHandler.cpp:286
+#: embed/mozilla/ContentHandler.cpp:281
 msgid "Download the unsafe file?"
 msgstr "Last utrygg fil?"
 
-#: embed/mozilla/ContentHandler.cpp:287
+#: embed/mozilla/ContentHandler.cpp:282
 msgid ""
 "This type of file could potentially damage your documents or invade your "
 "privacy. It's not safe to open it directly. You can save it instead."
@@ -1605,11 +1424,11 @@ msgstr ""
 "ikke ønsker. Det er ikke trygt å åpne det direkte. Du kan lagre filen i "
 "stedet."
 
-#: embed/mozilla/ContentHandler.cpp:295
+#: embed/mozilla/ContentHandler.cpp:290
 msgid "Open the file in another application?"
 msgstr "Åpne filen i en annen applikasjon?"
 
-#: embed/mozilla/ContentHandler.cpp:296
+#: embed/mozilla/ContentHandler.cpp:291
 msgid ""
 "It's not possible to view this file type directly in the browser. You can "
 "open it with another application or save it."
@@ -1617,11 +1436,11 @@ msgstr ""
 "Det er ikke mulig å vise denne filtypen direkte i nettleseren. Du kan åpne "
 "den med en annen applikasjon eller lagre den."
 
-#: embed/mozilla/ContentHandler.cpp:303
+#: embed/mozilla/ContentHandler.cpp:298
 msgid "Download the file?"
 msgstr "Last ned filen?"
 
-#: embed/mozilla/ContentHandler.cpp:304
+#: embed/mozilla/ContentHandler.cpp:299
 msgid ""
 "It's not possible to view this file because there is no application "
 "installed that can open it. You can save it instead."
@@ -1629,82 +1448,66 @@ msgstr ""
 "Det er ikke mulig å vise denne filen fordi det ikke finnes installerte "
 "applikasjoner som kan åpne den. Du kan lagre den i stedet."
 
-#: embed/mozilla/EphyHeaderSniffer.cpp:291
-#: src/bookmarks/ephy-bookmarks-import.c:247
-#: src/bookmarks/ephy-bookmarks-import.c:373 src/ephy-toolbars-model.c:201
-#: src/window-commands.c:342
+#: embed/mozilla/EphyHeaderSniffer.cpp:315
+#: src/bookmarks/ephy-bookmarks-import.c:253 src/ephy-toolbars-model.c:205
+#: src/window-commands.c:343
 msgid "Untitled"
 msgstr "Uten tittel"
 
-#: embed/mozilla/ExternalProtocolService.cpp:121
-msgid ""
-"Epiphany cannot handle this protocol,\n"
-"and no GNOME default handler is set"
-msgstr ""
-"Epiphany forstår ikke denne protokollen,\n"
-"og ingen forvalgt håndterer er satt opp i GNOME"
-
-#: embed/mozilla/ExternalProtocolService.cpp:135
-msgid ""
-"The protocol specified is not recognised.\n"
-"\n"
-"Would you like to try the GNOME default?"
-msgstr ""
-"Galeon forstår ikke denne protokollen.\n"
-"\n"
-"Vil du forsøke å bruke GNOME-håndtereren?"
-
-#: embed/mozilla/FilePicker.cpp:156
+#: embed/mozilla/FilePicker.cpp:164 embed/print-dialog.c:302
+#: lib/ephy-file-chooser.c:376 src/bookmarks/ephy-bookmarks-editor.c:578
 msgid "All files"
 msgstr "Alle filer"
 
-#: embed/mozilla/FilePicker.cpp:161
-msgid "HTML files"
-msgstr "HTML-filer"
+#: embed/mozilla/FilePicker.cpp:169 lib/ephy-file-chooser.c:360
+#, fuzzy
+msgid "Web pages"
+msgstr "Nettside"
 
-#: embed/mozilla/FilePicker.cpp:166
+#: embed/mozilla/FilePicker.cpp:177
 msgid "Text files"
 msgstr "Tekstfiler"
 
-#: embed/mozilla/FilePicker.cpp:171
-msgid "Image files"
+#: embed/mozilla/FilePicker.cpp:182 lib/ephy-file-chooser.c:368
+#, fuzzy
+msgid "Images"
 msgstr "Bildefiler"
 
-#: embed/mozilla/FilePicker.cpp:176
+#: embed/mozilla/FilePicker.cpp:190
 msgid "XML files"
 msgstr "XML-filer"
 
-#: embed/mozilla/FilePicker.cpp:181
+#: embed/mozilla/FilePicker.cpp:195
 msgid "XUL files"
 msgstr "XUL-filer"
 
-#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:182
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:156
 msgid "_Select Certificate"
 msgstr "_Velg sertifikat"
 
-#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:221
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:195
 #, c-format
 msgid "Choose a certificate to present as identification to %s."
 msgstr "Velg et sertifikat å presentere som identifikasjon til %s."
 
-#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:224
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:198
 msgid "Select a certificate to identify yourself."
 msgstr "Velg et sertifikat for å identifisere deg selv."
 
-#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:274
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:230
 msgid "Certificate _Details"
 msgstr "_Detaljer for sertifikat"
 
 #. Add the buttons
-#: embed/mozilla/GtkNSSDialogs.cpp:222 embed/mozilla/GtkNSSDialogs.cpp:533
+#: embed/mozilla/GtkNSSDialogs.cpp:227 embed/mozilla/GtkNSSDialogs.cpp:538
 msgid "_View Certificate"
 msgstr "_Vis sertifikat"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:230
+#: embed/mozilla/GtkNSSDialogs.cpp:235
 msgid "_Accept"
 msgstr "_Godta"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:294
+#: embed/mozilla/GtkNSSDialogs.cpp:299
 #, c-format
 msgid ""
 "The site %s returned security information for %s. It is possible that "
@@ -1714,16 +1517,16 @@ msgstr ""
 "Nettsted %s returnerte sikkerhetsinformasjon for %s. Det er mulig at noen "
 "fanger opp trafikken din for å få tak i din konfidensielle informasjon."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:300
+#: embed/mozilla/GtkNSSDialogs.cpp:305
 #, c-format
 msgid "You should only accept the security information if you trust %s and %s."
 msgstr "Du bør kun godta sikkerhetsinformasjonen hvis du stoler på %s og %s."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:305
+#: embed/mozilla/GtkNSSDialogs.cpp:310
 msgid "Accept incorrect security information?"
 msgstr "Godta ugyldig sikkerhetsinformasjon?"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:337
+#: embed/mozilla/GtkNSSDialogs.cpp:342
 #, c-format
 msgid ""
 "Your browser was unable to trust %s. It is possible that someone is "
@@ -1732,7 +1535,7 @@ msgstr ""
 "Nettleseren din kunne ikke stole på %s. Det er mulig at noen fanger opp "
 "trafikken din for å få tak i konfidensiell informasjon."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:343
+#: embed/mozilla/GtkNSSDialogs.cpp:348
 #, c-format
 msgid ""
 "You should only connect to the site if you are certain you are connected to %"
@@ -1741,32 +1544,32 @@ msgstr ""
 "Du bør ikke koble deg til nettstedet med mindre du er sikker på at du er "
 "koblet til %s."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:348
+#: embed/mozilla/GtkNSSDialogs.cpp:353
 msgid "Connect to untrusted site?"
 msgstr "Koble til nettsted du ikke stoler på?"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:352
+#: embed/mozilla/GtkNSSDialogs.cpp:357
 msgid "_Don't show this message again for this site"
 msgstr "I_kke vis denne meldingen igjen for dette nettstedet"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:353
+#: embed/mozilla/GtkNSSDialogs.cpp:358
 msgid "Co_nnect"
 msgstr "Ko_ble til"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:414
+#: embed/mozilla/GtkNSSDialogs.cpp:419
 msgid "Accept expired security information?"
 msgstr "Godta utgått sikkerhetsinformasjon?"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:415
+#: embed/mozilla/GtkNSSDialogs.cpp:420
 #, c-format
 msgid "The security information for %s expired on %s."
 msgstr "Sikkerhetsinformasjonen for %s gikk ut %s."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:421
+#: embed/mozilla/GtkNSSDialogs.cpp:426
 msgid "Accept not yet valid security information?"
 msgstr "Godta sikkerhetsinformasjon som ikke er gyldig ennå?"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:422
+#: embed/mozilla/GtkNSSDialogs.cpp:427
 #, c-format
 msgid "The security information for %s isn't valid until %s."
 msgstr "Sikkerhetsinformasjonen for %s er ikke gyldig før %s."
@@ -1774,42 +1577,42 @@ msgstr "Sikkerhetsinformasjonen for %s er ikke gyldig før %s."
 #. To translators: this a time format that is used while displaying the
 #. * expiry or start date of an SSL certificate, for the format see
 #. * strftime(3)
-#: embed/mozilla/GtkNSSDialogs.cpp:433
+#: embed/mozilla/GtkNSSDialogs.cpp:438
 msgid "%a %d %b %Y"
 msgstr "%a %b %d %Y"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:444
+#: embed/mozilla/GtkNSSDialogs.cpp:449
 msgid "You should ensure that your computer's time is correct."
 msgstr "Du bør sjekke at datamaskinens klokke er korrekt."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:489
+#: embed/mozilla/GtkNSSDialogs.cpp:494
 #, c-format
 msgid "Cannot establish connection to %s."
 msgstr "Kan ikke etablere forbindelse til %s."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:492
+#: embed/mozilla/GtkNSSDialogs.cpp:497
 #, c-format
 msgid "The certificate revocation list (CRL) from %s needs to be updated."
 msgstr "Tilbaketrekkingslisten for sertifikat (CRL) fra %s må oppdateres."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:497
+#: embed/mozilla/GtkNSSDialogs.cpp:502
 msgid "Please ask your system administrator for assistance."
 msgstr "Vennligst be din systemadministrator om hjelp."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:536
+#: embed/mozilla/GtkNSSDialogs.cpp:541
 msgid "_Trust CA"
 msgstr "S_tol på CA"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:548
+#: embed/mozilla/GtkNSSDialogs.cpp:553
 #, c-format
 msgid "Trust %s to identify:"
 msgstr "Stol på %s for å identifisere:"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:552
+#: embed/mozilla/GtkNSSDialogs.cpp:557
 msgid "Trust new Certificate Authority?"
 msgstr "Stol på ny sertifikatmyndighet?"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:553
+#: embed/mozilla/GtkNSSDialogs.cpp:558
 msgid ""
 "Before trusting a Certificate Authority (CA) you should verify the "
 "certificate is authentic."
@@ -1817,124 +1620,124 @@ msgstr ""
 "Før du stoler på en sertifikatmyndighet (CA) bør du sjekke at sertifikatet "
 "er autentisk."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:563
+#: embed/mozilla/GtkNSSDialogs.cpp:568
 msgid "_Web sites"
 msgstr "_Nettsteder"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:568
+#: embed/mozilla/GtkNSSDialogs.cpp:573
 msgid "_Software developers"
 msgstr "_Programvareutviklere"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:634
+#: embed/mozilla/GtkNSSDialogs.cpp:639
 msgid "Certificate already exists."
 msgstr "Sertifikatet eksisterer allerede."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:635
+#: embed/mozilla/GtkNSSDialogs.cpp:640
 msgid "The certificate has already been imported."
 msgstr "Sertifikatet er allerede importert."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:754
+#: embed/mozilla/GtkNSSDialogs.cpp:759
 msgid "_Backup Certificate"
 msgstr "Ta _sikkerhetskopi av sertifikatet"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:761
+#: embed/mozilla/GtkNSSDialogs.cpp:766
 msgid "Select password."
 msgstr "Velg passord."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:762
+#: embed/mozilla/GtkNSSDialogs.cpp:767
 msgid "Select a password to protect this certificate."
 msgstr "Velg et passord for å beskytte dette sertifikatet."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:774 embed/mozilla/GtkNSSDialogs.cpp:876
+#: embed/mozilla/GtkNSSDialogs.cpp:779 embed/mozilla/GtkNSSDialogs.cpp:881
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:788
+#: embed/mozilla/GtkNSSDialogs.cpp:793
 msgid "Con_firm password:"
 msgstr "Bekre_ft passord:"
 
 #. TODO: We need a better password quality meter
-#: embed/mozilla/GtkNSSDialogs.cpp:800
+#: embed/mozilla/GtkNSSDialogs.cpp:805
 msgid "Password quality:"
 msgstr "Passordkvalitet:"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:857
+#: embed/mozilla/GtkNSSDialogs.cpp:862
 msgid "I_mport Certificate"
 msgstr "I_mporter sertifikat"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:865
+#: embed/mozilla/GtkNSSDialogs.cpp:870
 msgid "Password required."
 msgstr "Passord kreves."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:866
+#: embed/mozilla/GtkNSSDialogs.cpp:871
 msgid "Enter the password for this certificate."
 msgstr "Oppgi passordet for dette sertifikatet."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:944
+#: embed/mozilla/GtkNSSDialogs.cpp:949
 msgid "Certificate Revocation list successfully imported."
 msgstr "Import av tilbaketrekkingsliste for sertifikat fullført."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:945
+#: embed/mozilla/GtkNSSDialogs.cpp:950
 msgid "Certificate Revocation list (CRL) imported:"
 msgstr "Tilbaketrekkingsliste for sertifikat (CRL) importert:"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:967
+#: embed/mozilla/GtkNSSDialogs.cpp:972
 msgid "Unit:"
 msgstr "Enhet:"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:970
+#: embed/mozilla/GtkNSSDialogs.cpp:975
 msgid "Next Update:"
 msgstr "Neste oppdatering:"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:997
+#: embed/mozilla/GtkNSSDialogs.cpp:1002
 msgid "Not part of certificate"
 msgstr "Ikke del av sertifikatet"
 
 # (ugh)
-#: embed/mozilla/GtkNSSDialogs.cpp:1265
+#: embed/mozilla/GtkNSSDialogs.cpp:1270
 msgid "Certificate Properties"
 msgstr "Egenskaper for sertifikat"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1287
+#: embed/mozilla/GtkNSSDialogs.cpp:1292
 msgid "This certificate has been verified for the following uses:"
 msgstr "Dette sertifikatet er verifisert for følgende bruksområder:"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1290
+#: embed/mozilla/GtkNSSDialogs.cpp:1295
 msgid "Could not verify this certificate because it has been revoked."
 msgstr "Kunne ikke verifisere dette sertifikatet fordi det er trukket tilbake."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1293
+#: embed/mozilla/GtkNSSDialogs.cpp:1298
 msgid "Could not verify this certificate because it has expired."
 msgstr "Kunne ikke verifisere dette sertifikatet fordi det er utgått."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1296
+#: embed/mozilla/GtkNSSDialogs.cpp:1301
 msgid "Could not verify this certificate because it is not trusted."
 msgstr "Kunne ikke verifisere dette sertifikatet fordi det ikke stoles på."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1299
+#: embed/mozilla/GtkNSSDialogs.cpp:1304
 msgid "Could not verify this certificate because the issuer is not trusted."
 msgstr ""
 "Kunne ikke verifisere dette sertifikatet fordi vi ikke stoler på utsteder."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1302
+#: embed/mozilla/GtkNSSDialogs.cpp:1307
 msgid "Could not verify this certificate because the issuer is unknown."
 msgstr "Kunne ikke verifisere dette sertifikatet fordi utsteder er ukjent."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1305
+#: embed/mozilla/GtkNSSDialogs.cpp:1310
 msgid ""
 "Could not verify this certificate because the CA certificate is invalid."
 msgstr ""
 "Kunne ikke verifisere dette sertifikatet fordi CA's sertifikat er ugyldig."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1310
+#: embed/mozilla/GtkNSSDialogs.cpp:1315
 msgid "Could not verify this certificate for unknown reasons."
 msgstr "Kunne ikke verifisere dette sertifikatet av ukjente årsaker."
 
-#: embed/mozilla/GtkNSSKeyPairDialogs.cpp:181
+#: embed/mozilla/GtkNSSKeyPairDialogs.cpp:195
 msgid "Generating Private Key."
 msgstr "Genererer privat nøkkel."
 
-#: embed/mozilla/GtkNSSKeyPairDialogs.cpp:182
+#: embed/mozilla/GtkNSSKeyPairDialogs.cpp:196
 msgid ""
 "Please wait while a new private key is generated. This process could take a "
 "few minutes."
@@ -1942,7 +1745,12 @@ msgstr ""
 "Vennligst vent mens en privat nøkkel genereres. Denne prosessen kan ta noen "
 "minutter."
 
-#: embed/mozilla/mozilla-embed-single.cpp:501
+#: embed/mozilla/MozDownload.cpp:591
+#, fuzzy
+msgid "Files"
+msgstr "Fil"
+
+#: embed/mozilla/mozilla-embed-single.cpp:491
 msgid ""
 "Epiphany can't be used now. Mozilla initialization failed. Check your "
 "MOZILLA_FIVE_HOME environmental variable."
@@ -1961,15 +1769,19 @@ msgstr ""
 #. * "zh_CN" translation: "zh-cn,zh"
 #. * "zh_HK" translation: "zh-hk,zh" or maybe "zh-hk,zh-tw,zh"
 #.
-#: embed/mozilla/mozilla-notifiers.cpp:737
+#: embed/mozilla/mozilla-notifiers.cpp:736
 msgid "system-language"
 msgstr "no"
 
-#: embed/print-dialog.c:289
+#: embed/print-dialog.c:294
 msgid "Print to"
 msgstr "Skriv ut til"
 
-#: lib/eel-gconf-extensions.c:82
+#: embed/print-dialog.c:299
+msgid "Postscript files"
+msgstr ""
+
+#: lib/eel-gconf-extensions.c:81
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -1978,30 +1790,15 @@ msgstr ""
 "GConf feil:\n"
 "  %s"
 
-#: lib/eel-gconf-extensions.c:86
-#, c-format
-msgid ""
-"GConf error:\n"
-"  %s\n"
-"All further errors shown only on terminal"
-msgstr ""
-"GConf-feil:\n"
-"  %s\n"
-"Alle senere feil vises kun på terminalen"
-
-#: lib/eel-gconf-extensions.c:90
-msgid "GConf Error"
-msgstr "GConf-feil"
-
-#: lib/egg/egg-editable-toolbar.c:510
+#: lib/egg/egg-editable-toolbar.c:512
 msgid "_Remove Toolbar"
 msgstr "Fje_rn verktøylinje"
 
-#: lib/egg/egg-toolbar-editor.c:552
+#: lib/egg/egg-toolbar-editor.c:563
 msgid "Separator"
 msgstr "Skillelinje"
 
-#: lib/egg/egg-toolbar-editor.c:582
+#: lib/egg/egg-toolbar-editor.c:593
 msgid ""
 "Drag an item onto the toolbars above to add it, from the toolbars in the "
 "items table to remove it."
@@ -2009,40 +1806,48 @@ msgstr ""
 "Dra en oppføring til verktøylinjene over for å legge den til, og bort fra "
 "verktøylinjene i oppføringstabellen for å fjerne den."
 
+#: lib/ephy-file-chooser.c:349
+msgid "All supported types"
+msgstr ""
+
 #. The name of the default downloads folder
-#: lib/ephy-file-helpers.c:72 src/prefs-dialog.c:1107
+#: lib/ephy-file-helpers.c:79 src/prefs-dialog.c:1108
 msgid "Downloads"
 msgstr "Nedlastinger"
 
-#: lib/ephy-file-helpers.c:149
+#: lib/ephy-file-helpers.c:168
 #, c-format
 msgid "Failed to find %s"
 msgstr "Kunne ikke finne %s"
 
-#: lib/ephy-file-helpers.c:214
+#: lib/ephy-file-helpers.c:233
 #, c-format
 msgid "%s exists, please move it out of the way."
 msgstr "%s eksisterer. Vennligst flytt den bort."
 
-#: lib/ephy-file-helpers.c:217
+#: lib/ephy-file-helpers.c:236
 #, c-format
 msgid "Failed to create directory %s."
 msgstr "Kunne ikke opprette katalog %s."
 
-#: lib/ephy-gui.c:90
-#, c-format
-msgid ""
-"File %s will be overwritten.\n"
-"If you choose yes, the contents will be lost.\n"
-"\n"
-"Do you want to continue?"
+#: lib/ephy-gui.c:96
+#, fuzzy, c-format
+msgid "A file %s already exists."
+msgstr "Sertifikatet eksisterer allerede."
+
+#: lib/ephy-gui.c:100
+msgid "If you choose to overwrite this file, the contents will be lost."
 msgstr ""
-"Filen %s vil bli overskrevet.\n"
-"Hvis du svarer ja vil innholdet gå tapt.\n"
-"\n"
-"Vil du fortsette?"
 
-#: lib/ephy-gui.c:121
+#: lib/ephy-gui.c:103
+msgid "Overwrite File"
+msgstr ""
+
+#: lib/ephy-gui.c:108
+msgid "_Overwrite"
+msgstr ""
+
+#: lib/ephy-gui.c:153
 #, c-format
 msgid "Could not display help: %s"
 msgstr "Kunne ikke vise hjelp: %s"
@@ -2091,22 +1896,48 @@ msgstr "Thailandsk"
 msgid "Traditional Chinese"
 msgstr "Tradisjonell kinesisk"
 
-#: lib/ephy-langs.c:45
+#: lib/ephy-langs.c:44
 msgid "Traditional Chinese (Hong Kong)"
 msgstr "Tradisjonell kinesisk (Hong Kong)"
 
-#: lib/ephy-langs.c:47 src/prefs-dialog.c:158
+#: lib/ephy-langs.c:45 src/prefs-dialog.c:158
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: lib/ephy-langs.c:48
+#: lib/ephy-langs.c:46
 msgid "Unicode"
 msgstr "Unicode"
 
-#: lib/ephy-langs.c:49
+#: lib/ephy-langs.c:47
 msgid "Western"
 msgstr "Vestlig"
 
+#: lib/ephy-stock-icons.c:54
+#, fuzzy
+msgid "Secure"
+msgstr "Sikker:"
+
+#: lib/ephy-stock-icons.c:55 src/ephy-window.c:1207
+msgid "Insecure"
+msgstr "Usikker"
+
+#: lib/ephy-stock-icons.c:56 src/ephy-history-window.c:1192
+msgid "History"
+msgstr "Historie"
+
+#: lib/ephy-stock-icons.c:57 src/bookmarks/ephy-bookmarks-editor.c:1394
+#: src/bookmarks/ephy-topic-action.c:597 src/ephy-window.c:1025
+msgid "Bookmarks"
+msgstr "Bokmerker"
+
+#: lib/ephy-stock-icons.c:58 src/toolbar.c:411
+msgid "Address Entry"
+msgstr "Adressefelt"
+
+#: lib/ephy-stock-icons.c:59
+msgid "_Download"
+msgstr "Last ne_d"
+
 #: lib/ephy-zoom.h:41
 msgid "50%"
 msgstr "50%"
@@ -2143,28 +1974,38 @@ msgstr "300%"
 msgid "400%"
 msgstr "400%"
 
-#: lib/widgets/ephy-cell-renderer-progress.c:98
+#. Translator hint: this is a label on progress bars inside a tree view.
+#.
+#: lib/widgets/ephy-cell-renderer-progress.c:242
 msgid "Failed"
 msgstr "Feilet"
 
-#: src/bookmarks/ephy-bookmark-action.c:221
+#. Translator hint: this is the default label on progress bars
+#. * inside a tree view. %d will be replaced by the percentage
+#.
+#: lib/widgets/ephy-cell-renderer-progress.c:251
+#, fuzzy, c-format
+msgid "%d %%"
+msgstr "%a %b %d %Y"
+
+#: src/bookmarks/ephy-bookmark-action.c:248
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
 # (ugh)
-#: src/bookmarks/ephy-bookmark-properties.c:229
+#: src/bookmarks/ephy-bookmark-properties.c:230
 #, c-format
 msgid "%s Properties"
 msgstr "Egenskaper for %s"
 
 #: src/bookmarks/ephy-bookmark-properties.c:352
-#: src/bookmarks/ephy-new-bookmark.c:215
+#: src/bookmarks/ephy-new-bookmark.c:216
 msgid "_Title:"
 msgstr "_Tittel:"
 
 #: src/bookmarks/ephy-bookmark-properties.c:394
-#: src/bookmarks/ephy-new-bookmark.c:238
+#: src/bookmarks/ephy-new-bookmark.c:239
 msgid "To_pics:"
 msgstr "Em_ner:"
 
@@ -2172,13 +2013,24 @@ msgstr "Em_ner:"
 msgid "_Show in bookmarks bar"
 msgstr "Vi_s i bokmerkelinjen"
 
+#. Toplevel
+#: src/bookmarks/ephy-bookmarks-editor.c:161 src/ephy-history-window.c:151
+#: src/ephy-window.c:83
+msgid "_File"
+msgstr "_Fil"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:162 src/ephy-history-window.c:152
+#: src/ephy-window.c:84
+msgid "_Edit"
+msgstr "R_ediger"
+
 #: src/bookmarks/ephy-bookmarks-editor.c:163 src/ephy-history-window.c:153
-#: src/ephy-window.c:78
+#: src/ephy-window.c:85
 msgid "_View"
 msgstr "_Vis"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:164 src/ephy-history-window.c:154
-#: src/ephy-window.c:83
+#: src/ephy-window.c:90
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -2193,7 +2045,7 @@ msgstr "Opprett et nytt emne"
 
 #. File Menu
 #: src/bookmarks/ephy-bookmarks-editor.c:171
-#: src/bookmarks/ephy-bookmarks-editor.c:977 src/ephy-history-window.c:158
+#: src/bookmarks/ephy-bookmarks-editor.c:1017 src/ephy-history-window.c:158
 #: src/ephy-history-window.c:738
 msgid "_Open in New Window"
 msgstr "_Åpne i nytt vindu"
@@ -2203,7 +2055,7 @@ msgid "Open the selected bookmark in a new window"
 msgstr "Åpne valgte bokmerker i et nytt vindu"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:174
-#: src/bookmarks/ephy-bookmarks-editor.c:978 src/ephy-history-window.c:161
+#: src/bookmarks/ephy-bookmarks-editor.c:1018 src/ephy-history-window.c:161
 #: src/ephy-history-window.c:739
 msgid "Open in New _Tab"
 msgstr "Åpne i ny _fane"
@@ -2246,7 +2098,7 @@ msgid "Import bookmarks from another browser or a bookmarks file"
 msgstr "Importer bokmerker fra en annen nettleser eller en bokmerkefil"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:188 src/ephy-history-window.c:170
-#: src/ephy-window.c:111
+#: src/ephy-window.c:121
 msgid "_Close"
 msgstr "L_ukk"
 
@@ -2256,28 +2108,28 @@ msgstr "Lukk bokmerkevinduet"
 
 #. Edit Menu
 #: src/bookmarks/ephy-bookmarks-editor.c:193 src/ephy-history-window.c:175
-#: src/ephy-window.c:122
+#: src/ephy-window.c:132
 msgid "Cu_t"
 msgstr "Klipp u_t"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:194 src/ephy-history-window.c:176
-#: src/ephy-window.c:123
+#: src/ephy-window.c:133
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:196
-#: src/bookmarks/ephy-bookmarks-editor.c:987 src/ephy-history-window.c:178
-#: src/ephy-history-window.c:748 src/ephy-window.c:125
+#: src/bookmarks/ephy-bookmarks-editor.c:1027 src/ephy-history-window.c:178
+#: src/ephy-history-window.c:748 src/ephy-window.c:135
 msgid "_Copy"
 msgstr "_Kopier"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:197 src/ephy-history-window.c:179
-#: src/ephy-window.c:126
+#: src/ephy-window.c:136
 msgid "Copy the selection"
 msgstr "Kopier utvalget"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:199 src/ephy-history-window.c:181
-#: src/ephy-window.c:128
+#: src/ephy-window.c:138
 msgid "_Paste"
 msgstr "Li_m inn"
 
@@ -2286,7 +2138,7 @@ msgid "Paste the clipboard"
 msgstr "Lim inn utklippstavlen"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:202 src/ephy-history-window.c:184
-#: src/ephy-window.c:131
+#: src/ephy-window.c:141
 msgid "Select _All"
 msgstr "Velg _alt"
 
@@ -2295,9 +2147,8 @@ msgid "Select all bookmarks or text"
 msgstr "Velg alle bokmerker eller all tekst"
 
 #. Help Menu
-#. Help menu
 #: src/bookmarks/ephy-bookmarks-editor.c:207 src/ephy-history-window.c:192
-#: src/ephy-window.c:222
+#: src/ephy-window.c:232
 msgid "_Contents"
 msgstr "_Innhold"
 
@@ -2306,12 +2157,12 @@ msgid "Display bookmarks help"
 msgstr "Vis hjelp for bokmerker"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:210 src/ephy-history-window.c:195
-#: src/ephy-window.c:225
+#: src/ephy-window.c:235
 msgid "_About"
 msgstr "_Om"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:211 src/ephy-history-window.c:196
-#: src/ephy-window.c:226
+#: src/ephy-window.c:236
 msgid "Display credits for the web browser creators"
 msgstr "Vis kreditering for skaperene av nettleseren"
 
@@ -2345,68 +2196,87 @@ msgstr "Vis både tittel- og adressekolonnene"
 msgid "Type a topic"
 msgstr "Skriv et emne"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:547
+#: src/bookmarks/ephy-bookmarks-editor.c:559
 msgid "Import bookmarks from file"
 msgstr "Importer bokmerker fra fil"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:580
+#: src/bookmarks/ephy-bookmarks-editor.c:566
+#, fuzzy
+msgid "Firefox/Firebird/Mozilla bookmarks"
+msgstr "Bokmerker fra Firebird"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:570
+#, fuzzy
+msgid "Galeon/Konqueror bookmarks"
+msgstr "Konqueror-bokmerker"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:574
+#, fuzzy
+msgid "Epiphany bookmarks"
+msgstr "Galeon-bokmerker"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:613
 msgid "Import Bookmarks"
 msgstr "Importer bokmerker"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:600
-msgid "Choose the bookmarks source:"
-msgstr "Velg kilde for bokmerker:"
+#: src/bookmarks/ephy-bookmarks-editor.c:619
+#, fuzzy
+msgid "I_mport"
+msgstr "Sport"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:618
-msgid "Mozilla bookmarks"
-msgstr "Mozilla-bokmerker"
+#: src/bookmarks/ephy-bookmarks-editor.c:633
+#, fuzzy
+msgid "Import bookmarks from:"
+msgstr "Importer bokmerker fra fil"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:620
-msgid "Firebird bookmarks"
+#: src/bookmarks/ephy-bookmarks-editor.c:656
+#, fuzzy
+msgid "Firebird"
 msgstr "Bokmerker fra Firebird"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:622
-msgid "Galeon bookmarks"
-msgstr "Galeon-bokmerker"
+#: src/bookmarks/ephy-bookmarks-editor.c:658
+msgid "Firefox"
+msgstr ""
+
+#: src/bookmarks/ephy-bookmarks-editor.c:660
+#, fuzzy
+msgid "Galeon"
+msgstr "Walloon"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:624
-msgid "Konqueror bookmarks"
+#: src/bookmarks/ephy-bookmarks-editor.c:662
+#, fuzzy
+msgid "Konqueror"
 msgstr "Konqueror-bokmerker"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:628
-msgid "Import from a file"
-msgstr "Importer fra en fil"
+#: src/bookmarks/ephy-bookmarks-editor.c:664
+msgid "Mozilla"
+msgstr ""
 
-#: src/bookmarks/ephy-bookmarks-editor.c:972 src/ephy-history-window.c:733
+#: src/bookmarks/ephy-bookmarks-editor.c:1012 src/ephy-history-window.c:733
 msgid "_Open in New Windows"
 msgstr "_Åpne i nye vinduer"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:973 src/ephy-history-window.c:734
+#: src/bookmarks/ephy-bookmarks-editor.c:1013 src/ephy-history-window.c:734
 msgid "Open in New _Tabs"
 msgstr "_Åpne i nye _faner"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:983 src/ephy-history-window.c:744
+#: src/bookmarks/ephy-bookmarks-editor.c:1023 src/ephy-history-window.c:744
 msgid "_Copy Address"
 msgstr "_Kopier adresse"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1224 src/ephy-history-window.c:1038
+#: src/bookmarks/ephy-bookmarks-editor.c:1264 src/ephy-history-window.c:1038
 msgid "_Search:"
 msgstr "_Søk:"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1357
-#: src/bookmarks/ephy-topic-action.c:597 src/ephy-window.c:953
-msgid "Bookmarks"
-msgstr "Bokmerker"
-
-#: src/bookmarks/ephy-bookmarks-editor.c:1440
+#: src/bookmarks/ephy-bookmarks-editor.c:1477
 msgid "Topics"
 msgstr "Emner"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1502 src/ephy-history-window.c:1318
+#: src/bookmarks/ephy-bookmarks-editor.c:1539 src/ephy-history-window.c:1318
 msgid "Title"
 msgstr "Tittel"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1509 src/ephy-history-window.c:1324
+#: src/bookmarks/ephy-bookmarks-editor.c:1546 src/ephy-history-window.c:1324
 msgid "Address"
 msgstr "Adresse"
 
@@ -2447,15 +2317,15 @@ msgstr "Reiser"
 msgid "Work"
 msgstr "Arbeid"
 
-#: src/bookmarks/ephy-bookmarks.c:647
+#: src/bookmarks/ephy-bookmarks.c:677
 msgid "Most Visited"
 msgstr "Mest besøkt"
 
-#: src/bookmarks/ephy-bookmarks.c:664
+#: src/bookmarks/ephy-bookmarks.c:693
 msgid "Not Categorized"
 msgstr "Ikke kategorisert"
 
-#: src/bookmarks/ephy-new-bookmark.c:261
+#: src/bookmarks/ephy-new-bookmark.c:262
 msgid "Add Bookmark"
 msgstr "Legg til bokmerke"
 
@@ -2463,11 +2333,11 @@ msgstr "Legg til bokmerke"
 #. * but it doesn't support markup of text yet
 #. * so we build our own. See bug 65501.
 #.
-#: src/bookmarks/ephy-new-bookmark.c:306
+#: src/bookmarks/ephy-new-bookmark.c:307
 msgid "Duplicated Bookmark"
 msgstr "Duplisert bokmerke"
 
-#: src/bookmarks/ephy-new-bookmark.c:336
+#: src/bookmarks/ephy-new-bookmark.c:337
 #, c-format
 msgid "A bookmark titled %s already exists for this page."
 msgstr "Det finnes et bokmerke med navn %s for denne siden allerede."
@@ -2477,23 +2347,23 @@ msgstr "Det finnes et bokmerke med navn %s for denne siden allerede."
 msgid "Empty"
 msgstr "Tom"
 
-#: src/ephy-encoding-dialog.c:330
+#: src/ephy-encoding-dialog.c:315
 msgid "Encodings"
 msgstr "Kodinger"
 
-#: src/ephy-encoding-menu.c:379
+#: src/ephy-encoding-menu.c:359
 msgid "_Other..."
 msgstr "_Andre..."
 
-#: src/ephy-encoding-menu.c:380
+#: src/ephy-encoding-menu.c:360
 msgid "Other encodings"
 msgstr "Andre kodinger"
 
-#: src/ephy-encoding-menu.c:387
+#: src/ephy-encoding-menu.c:367
 msgid "_Automatic"
 msgstr "_Automatisk"
 
-#: src/ephy-go-action.c:73 src/toolbar.c:409
+#: src/ephy-go-action.c:73 src/toolbar.c:445
 msgid "Go"
 msgstr "Gå til"
 
@@ -2549,15 +2419,15 @@ msgstr "Vis kun adressekolonnen"
 msgid "Clear History"
 msgstr "Tøm historikk"
 
-#: src/ephy-history-window.c:278
+#: src/ephy-history-window.c:276
 msgid "C_lear"
 msgstr "_Tøm"
 
-#: src/ephy-history-window.c:301
+#: src/ephy-history-window.c:300
 msgid "Clear browsing history?"
 msgstr "Tøm nettleserens historikk?"
 
-#: src/ephy-history-window.c:308
+#: src/ephy-history-window.c:307
 msgid ""
 "Clearing the browsing history will cause all history links to be permanently "
 "deleted."
@@ -2576,81 +2446,77 @@ msgid_plural "Last %d days"
 msgstr[0] "Siste %d dag"
 msgstr[1] "Siste %d dager"
 
-#: src/ephy-history-window.c:1192
-msgid "History"
-msgstr "Historie"
-
 #: src/ephy-history-window.c:1264
 msgid "Sites"
 msgstr "Nettsteder"
 
-#: src/ephy-main.c:55
+#: src/ephy-main.c:56
 msgid "Open a new tab in an existing Epiphany window"
 msgstr "Åpne en ny fane i eksisterende Epiphany-vindu"
 
-#: src/ephy-main.c:58
+#: src/ephy-main.c:59
 msgid "Run Epiphany in full screen mode"
 msgstr "Kjør Epiphany i fullskjermmodus"
 
-#: src/ephy-main.c:61
+#: src/ephy-main.c:62
 msgid "Load the given session file"
 msgstr "Last oppgitt sesjonsfil"
 
-#: src/ephy-main.c:62 src/ephy-main.c:68
+#: src/ephy-main.c:63 src/ephy-main.c:69
 msgid "FILE"
 msgstr "FIL"
 
-#: src/ephy-main.c:64
+#: src/ephy-main.c:65
 msgid "Add a bookmark (don't open any window)"
 msgstr "Legg til bokmerke (ikke åpne noen vinduer)"
 
-#: src/ephy-main.c:65
+#: src/ephy-main.c:66
 msgid "URL"
 msgstr "Adresse"
 
-#: src/ephy-main.c:67
+#: src/ephy-main.c:68
 msgid "Import bookmarks from the given file"
 msgstr "Importer bokmerker fra gitt fil"
 
-#: src/ephy-main.c:70
+#: src/ephy-main.c:71
 msgid "Launch the bookmarks editor"
 msgstr "Start redigering av bokmerker"
 
-#: src/ephy-main.c:73
+#: src/ephy-main.c:74
 msgid "Used internally by the bonobo interface"
 msgstr "Brukes internt av bonobo-grensesnittet"
 
-#: src/ephy-main.c:108
+#: src/ephy-main.c:109
 msgid "Epiphany Web Browser"
 msgstr "Epiphany nettleser"
 
-#: src/ephy-main.c:112
+#: src/ephy-main.c:113
 msgid "Ephy"
 msgstr "Epiphany"
 
-#: src/ephy-session.c:299
+#: src/ephy-session.c:367
 msgid "Crash Recovery"
 msgstr "Krasjsikring"
 
-#: src/ephy-session.c:301
+#: src/ephy-session.c:369
 msgid "_Don't Recover"
 msgstr "Ikke _gjenopprett"
 
-#: src/ephy-session.c:302
+#: src/ephy-session.c:370
 msgid "_Recover"
 msgstr "_Gjenopprett"
 
-#: src/ephy-session.c:332
+#: src/ephy-session.c:401
 msgid ""
 "Epiphany appears to have crashed or been killed the last time it was run."
 msgstr ""
 "Epiphany ser ut til å ha krasjet eller blitt terminert ved forrige kjøring."
 
-#: src/ephy-session.c:338
+#: src/ephy-session.c:407
 msgid "You can recover the opened tabs and windows."
 msgstr "Du kan gjenopprette de åpne fanene og vinduene."
 
-#: src/ephy-shell.c:357
+#: src/ephy-shell.c:345
 msgid ""
 "Bonobo couldn't locate the GNOME_Epiphany_Automation.server file. You can "
 "use bonobo-activation-sysconf to configure the search path for bonobo server "
@@ -2659,7 +2525,7 @@ msgstr ""
 "Bonobo kunne ikke finne filen GNOME_Epiphany_Automation.server. Du kan bruke "
 "bonobo-activation-sysconf for å konfigurere søkestien for bonobo-serverfiler."
 
-#: src/ephy-shell.c:364
+#: src/ephy-shell.c:352
 msgid ""
 "Epiphany can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the automation server"
@@ -2667,7 +2533,7 @@ msgstr ""
 "Epiphany kan ikke brukes nå pga en uvetet feil fra Bonobo ved forsøk på å "
 "registrere automasjonstjeneren"
 
-#: src/ephy-shell.c:387
+#: src/ephy-shell.c:375
 msgid ""
 "Epiphany can't be used now, due to an unexpected error from Bonobo when "
 "attempting to locate the automation object."
@@ -2675,510 +2541,499 @@ msgstr ""
 "Epiphany kan ikke brukes nå pga en uventet feil fra Bonobo ved forsøk på å "
 "laste automasjonsobjektet."
 
-#: src/ephy-tab.c:327 src/ephy-tab.c:1164 src/ephy-tab.c:1346
+#: src/ephy-tab.c:358 src/ephy-tab.c:1243 src/ephy-tab.c:1452
 msgid "Blank page"
 msgstr "Tom side"
 
-#: src/ephy-tab.c:740
+#: src/ephy-tab.c:798
 msgid "site"
 msgstr "nettsted"
 
-#: src/ephy-tab.c:764
+#: src/ephy-tab.c:822
 #, c-format
 msgid "Redirecting to %s..."
 msgstr "Omdirigerer til %s..."
 
-#: src/ephy-tab.c:768
+#: src/ephy-tab.c:826
 #, c-format
 msgid "Transferring data from %s..."
 msgstr "Overfører data fra %s..."
 
-#: src/ephy-tab.c:772
+#: src/ephy-tab.c:830
 #, c-format
 msgid "Waiting for authorization from %s..."
 msgstr "Venter på godkjenning fra %s..."
 
-#: src/ephy-tab.c:780
+#: src/ephy-tab.c:838
 #, c-format
 msgid "Loading %s..."
 msgstr "Laster %s..."
 
-#: src/ephy-window.c:79
+#: src/ephy-window.c:86
 msgid "_Bookmarks"
 msgstr "_Bokmerker"
 
-#: src/ephy-window.c:80
+#: src/ephy-window.c:87
 msgid "_Go"
 msgstr "_Gå til"
 
-#: src/ephy-window.c:81
+#: src/ephy-window.c:88
 msgid "T_ools"
 msgstr "Verk_tøy"
 
-#: src/ephy-window.c:82
+#: src/ephy-window.c:89
 msgid "_Tabs"
 msgstr "F_aner"
 
 #. File menu
-#: src/ephy-window.c:87
+#: src/ephy-window.c:94
 msgid "_New Window"
 msgstr "_Nytt vindu"
 
-#: src/ephy-window.c:88
+#: src/ephy-window.c:95
 msgid "Open a new window"
 msgstr "Åpne et nytt vindu"
 
-#: src/ephy-window.c:90
+#: src/ephy-window.c:97
 msgid "New _Tab"
 msgstr "Ny _fane"
 
-#: src/ephy-window.c:91
+#: src/ephy-window.c:98
 msgid "Open a new tab"
 msgstr "Åpne en ny fane"
 
-#: src/ephy-window.c:93
+#: src/ephy-window.c:100
 msgid "_Open..."
 msgstr "_Åpne..."
 
-#: src/ephy-window.c:94
+#: src/ephy-window.c:101
 msgid "Open a file"
 msgstr "Åpne en fil"
 
-#: src/ephy-window.c:96
+#: src/ephy-window.c:103 src/ephy-window.c:106
 msgid "Save _As..."
 msgstr "L_agre som..."
 
-#: src/ephy-window.c:97
+#: src/ephy-window.c:104 src/ephy-window.c:107
 msgid "Save the current page"
 msgstr "Lagre denne siden"
 
-#: src/ephy-window.c:99
+#: src/ephy-window.c:109
 msgid "Print Set_up..."
 msgstr "Utskrifts_oppsett..."
 
-#: src/ephy-window.c:100
+#: src/ephy-window.c:110
 msgid "Setup the page settings for printing"
 msgstr "Sett innstillinger for utskrift"
 
-#: src/ephy-window.c:102
+#: src/ephy-window.c:112
 msgid "Print Pre_view"
 msgstr "Forhånds_visning av utskrift"
 
-#: src/ephy-window.c:103
+#: src/ephy-window.c:113
 msgid "Print preview"
 msgstr "Forhåndsvisning av utskrift"
 
-#: src/ephy-window.c:106
+#: src/ephy-window.c:115
+msgid "_Print..."
+msgstr "_Skriv ut..."
+
+#: src/ephy-window.c:116
 msgid "Print the current page"
 msgstr "Skriv ut denne siden"
 
-#: src/ephy-window.c:108
+#: src/ephy-window.c:118
 msgid "S_end To..."
 msgstr "S_end til..."
 
-#: src/ephy-window.c:109
+#: src/ephy-window.c:119
 msgid "Send a link of the current page"
 msgstr "Send en lenke til denne siden"
 
-#: src/ephy-window.c:112
+#: src/ephy-window.c:122
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
 #. Edit menu
-#: src/ephy-window.c:116
+#: src/ephy-window.c:126
 msgid "_Undo"
 msgstr "_Angre"
 
-#: src/ephy-window.c:117
+#: src/ephy-window.c:127
 msgid "Undo the last action"
 msgstr "Angre siste handling"
 
-#: src/ephy-window.c:119
+#: src/ephy-window.c:129
 msgid "Re_do"
 msgstr "G_jør om"
 
-#: src/ephy-window.c:120
+#: src/ephy-window.c:130
 msgid "Redo the last undone action"
 msgstr "Gjør om sist angrede handling"
 
-#: src/ephy-window.c:129
+#: src/ephy-window.c:139
 msgid "Paste clipboard"
 msgstr "Lim inn utklippstavlen"
 
-#: src/ephy-window.c:132
+#: src/ephy-window.c:142
 msgid "Select the entire page"
 msgstr "Merk hele siden"
 
-#: src/ephy-window.c:135
+#: src/ephy-window.c:144
+msgid "_Find..."
+msgstr "_Finn..."
+
+#: src/ephy-window.c:145
 msgid "Find a word or phrase in the page"
 msgstr "Finn et ord eller en frase på siden"
 
-#: src/ephy-window.c:137
+#: src/ephy-window.c:147
 msgid "Find Ne_xt"
 msgstr "Finn _neste"
 
-#: src/ephy-window.c:138
+#: src/ephy-window.c:148
 msgid "Find next occurrence of the word or phrase"
 msgstr "Finn neste oppføring av ordet eller frasen"
 
-#: src/ephy-window.c:140
+#: src/ephy-window.c:150
 msgid "Find Pre_vious"
 msgstr "Finn forri_ge"
 
-#: src/ephy-window.c:141
+#: src/ephy-window.c:151
 msgid "Find previous occurrence of the word or phrase"
 msgstr "Finn forrige oppføring av ordet eller frasen"
 
-#: src/ephy-window.c:143
+#: src/ephy-window.c:153
 msgid "P_ersonal Data"
 msgstr "P_ersonlige data"
 
-#: src/ephy-window.c:144
+#: src/ephy-window.c:154
 msgid "View and remove cookies and passwords"
 msgstr "Vis og fjern informasjonskapsler og passord"
 
-#: src/ephy-window.c:146
+#: src/ephy-window.c:156
 msgid "T_oolbars"
 msgstr "_Verktøylinjer"
 
-#: src/ephy-window.c:147
+#: src/ephy-window.c:157
 msgid "Customize toolbars"
 msgstr "Tilpass verktøylinjer"
 
-#: src/ephy-window.c:149
+#: src/ephy-window.c:159
 msgid "P_references"
 msgstr "B_rukervalg"
 
-#: src/ephy-window.c:150
+#: src/ephy-window.c:160
 msgid "Configure the web browser"
 msgstr "Konfigurer nettleseren"
 
 #. View menu
-#: src/ephy-window.c:154
+#: src/ephy-window.c:164
 msgid "_Stop"
 msgstr "_Stopp"
 
-#: src/ephy-window.c:155
+#: src/ephy-window.c:165
 msgid "Stop current data transfer"
 msgstr "Stopp aktiv dataoverføring"
 
-#: src/ephy-window.c:157
+#: src/ephy-window.c:167
 msgid "_Reload"
 msgstr "_Last om"
 
-#: src/ephy-window.c:158
+#: src/ephy-window.c:168
 msgid "Display the latest content of the current page"
 msgstr "Vis nyeste innhold i aktiv side"
 
-#: src/ephy-window.c:160
+#: src/ephy-window.c:170
 msgid "Zoom _In"
 msgstr "Zoom _inn"
 
-#: src/ephy-window.c:161
+#: src/ephy-window.c:171
 msgid "Increase the text size"
 msgstr "Øk tekststørrelsen"
 
-#: src/ephy-window.c:163
+#: src/ephy-window.c:173
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
 
-#: src/ephy-window.c:164
+#: src/ephy-window.c:174
 msgid "Decrease the text size"
 msgstr "Minsk tekststørrelsen"
 
-#: src/ephy-window.c:166
+#: src/ephy-window.c:176
 msgid "_Normal Size"
 msgstr "_Normal størrelse"
 
-#: src/ephy-window.c:167
+#: src/ephy-window.c:177
 msgid "Use the normal text size"
 msgstr "Bruk normal tekststørrelse"
 
-#: src/ephy-window.c:169
+#: src/ephy-window.c:179
 msgid "Text _Encoding"
 msgstr "T_ekstkoding"
 
-#: src/ephy-window.c:170
+#: src/ephy-window.c:180
 msgid "Change the text encoding"
 msgstr "Endre tekstkoding"
 
-#: src/ephy-window.c:172
+#: src/ephy-window.c:182
 msgid "_Page Source"
 msgstr "_Sidens kildekode"
 
-#: src/ephy-window.c:173
+#: src/ephy-window.c:183
 msgid "View the source code of the page"
 msgstr "Vis kildekoden for siden"
 
 #. Bookmarks menu
-#: src/ephy-window.c:177
+#: src/ephy-window.c:187
 msgid "_Add Bookmark..."
 msgstr "_Legg til bokmerke..."
 
-#: src/ephy-window.c:178 src/ephy-window.c:257
+#: src/ephy-window.c:188 src/ephy-window.c:267
 msgid "Add a bookmark for the current page"
 msgstr "Legg til et bokmerke for denne siden"
 
-#: src/ephy-window.c:180
+#: src/ephy-window.c:190
 msgid "_Edit Bookmarks"
 msgstr "R_ediger bokmerker"
 
-#: src/ephy-window.c:181
+#: src/ephy-window.c:191
 msgid "Open the bookmarks window"
 msgstr "Åpne bokmerkevinduet"
 
 #. Go menu
-#: src/ephy-window.c:185
+#: src/ephy-window.c:195
 msgid "_Back"
 msgstr "Til_bake"
 
-#: src/ephy-window.c:186
+#: src/ephy-window.c:196
 msgid "Go to the previous visited page"
 msgstr "Gå til forrige side"
 
-#: src/ephy-window.c:188
+#: src/ephy-window.c:198
 msgid "_Forward"
 msgstr "_Fremover"
 
-#: src/ephy-window.c:189
+#: src/ephy-window.c:199
 msgid "Go to the next visited page"
 msgstr "Gå til neste besøkte side"
 
-#: src/ephy-window.c:192
+#: src/ephy-window.c:202
 msgid "Go up one level"
 msgstr "Gå opp ett nivå"
 
-#: src/ephy-window.c:194
+#: src/ephy-window.c:204
 msgid "_Home"
 msgstr "_Hjem"
 
-#: src/ephy-window.c:195
+#: src/ephy-window.c:205
 msgid "Go to the home page"
 msgstr "Gå til startsiden"
 
-#: src/ephy-window.c:197
+#: src/ephy-window.c:207
 msgid "_Location..."
 msgstr "_Lokasjon..."
 
-#: src/ephy-window.c:198
+#: src/ephy-window.c:208
 msgid "Go to a specified location"
 msgstr "Gå til en spesifisert lokasjon"
 
-#: src/ephy-window.c:200
+#: src/ephy-window.c:210
 msgid "H_istory"
 msgstr "H_istorikk"
 
-#: src/ephy-window.c:201
+#: src/ephy-window.c:211
 msgid "Open the history window"
 msgstr "Åpne historikkvinduet"
 
 #. Tabs menu
-#: src/ephy-window.c:205
+#: src/ephy-window.c:215
 msgid "_Previous Tab"
 msgstr "_Forrige fane"
 
-#: src/ephy-window.c:206
+#: src/ephy-window.c:216
 msgid "Activate previous tab"
 msgstr "Aktiver forrige fane"
 
-#: src/ephy-window.c:208
+#: src/ephy-window.c:218
 msgid "_Next Tab"
 msgstr "_Neste fane"
 
-#: src/ephy-window.c:209
+#: src/ephy-window.c:219
 msgid "Activate next tab"
 msgstr "Aktiver neste fane"
 
-#: src/ephy-window.c:211
+#: src/ephy-window.c:221
 msgid "Move Tab _Left"
 msgstr "F_lytt fane til venstre"
 
-#: src/ephy-window.c:212
+#: src/ephy-window.c:222
 msgid "Move current tab to left"
 msgstr "Flytt denne fanen til venstre"
 
-#: src/ephy-window.c:214
+#: src/ephy-window.c:224
 msgid "Move Tab _Right"
 msgstr "Flytt fane til høy_re"
 
-#: src/ephy-window.c:215
+#: src/ephy-window.c:225
 msgid "Move current tab to right"
 msgstr "Flytt denne fanen til høyre"
 
-#: src/ephy-window.c:217
+#: src/ephy-window.c:227
 msgid "_Detach Tab"
 msgstr "_Løsne fane"
 
-#: src/ephy-window.c:218
+#: src/ephy-window.c:228
 msgid "Detach current tab"
 msgstr "Løsne denne fanen"
 
-#: src/ephy-window.c:223
+#: src/ephy-window.c:233
 msgid "Display web browser help"
 msgstr "Vis hjelp for nettleser"
 
 #. View Menu
-#: src/ephy-window.c:234
+#: src/ephy-window.c:244
 msgid "_Toolbar"
 msgstr "Verk_tøylinje"
 
-#: src/ephy-window.c:235
+#: src/ephy-window.c:245
 msgid "Show or hide toolbar"
 msgstr "Vis/skjul verktøylinje"
 
-#: src/ephy-window.c:237
+#: src/ephy-window.c:247
 msgid "_Bookmarks Bar"
 msgstr "_Bokmerkelinje"
 
-#: src/ephy-window.c:238
+#: src/ephy-window.c:248
 msgid "Show or hide bookmarks bar"
 msgstr "Vis eller skjul bokmerkelinje"
 
-#: src/ephy-window.c:240
+#: src/ephy-window.c:250
 msgid "St_atusbar"
 msgstr "St_atuslinje"
 
-#: src/ephy-window.c:241
+#: src/ephy-window.c:251
 msgid "Show or hide statusbar"
 msgstr "Vis/skjul statuslinje"
 
-#: src/ephy-window.c:243
+#: src/ephy-window.c:253
 msgid "_Fullscreen"
 msgstr "_Fullskjerm"
 
-#: src/ephy-window.c:244
+#: src/ephy-window.c:254
 msgid "Browse at full screen"
 msgstr "Bruk fullskjermmodus"
 
-#: src/ephy-window.c:246
+#: src/ephy-window.c:256
 msgid "Selection Caret"
 msgstr "Utvalgsmarkør"
 
 #. Document
-#: src/ephy-window.c:254
+#: src/ephy-window.c:264
 msgid "_Save Background As..."
 msgstr "_Lagre bakgrunn som..."
 
-#: src/ephy-window.c:256
+#: src/ephy-window.c:266
 msgid "Add Boo_kmark..."
 msgstr "Legg til bo_kmerke..."
 
 #. Framed document
-#: src/ephy-window.c:261
+#: src/ephy-window.c:271
 msgid "_Open Frame"
 msgstr "_Åpne ramme"
 
-#: src/ephy-window.c:263
-msgid "Open Frame in _New Window"
-msgstr "Åpne ramme i _nytt vindu"
-
-#: src/ephy-window.c:265
-msgid "Open Frame in New _Tab"
-msgstr "Åpne ramme i ny _fane"
-
 #. Links
-#: src/ephy-window.c:269
+#: src/ephy-window.c:275
 msgid "_Open Link"
 msgstr "_Åpne lenke"
 
-#: src/ephy-window.c:271
+#: src/ephy-window.c:277
 msgid "Open Link in _New Window"
 msgstr "Åpne lenke i _nytt vindu"
 
-#: src/ephy-window.c:273
+#: src/ephy-window.c:279
 msgid "Open Link in New _Tab"
 msgstr "Åpne lenke i ny _fane"
 
-#: src/ephy-window.c:275
+#: src/ephy-window.c:281
 msgid "_Download Link"
 msgstr "Last ne_d lenke"
 
-#: src/ephy-window.c:277
+#: src/ephy-window.c:283
 msgid "_Save Link As..."
 msgstr "Lagre lenke _som..."
 
-#: src/ephy-window.c:279
+#: src/ephy-window.c:285
 msgid "_Bookmark Link..."
 msgstr "_Lag bokmerke av lenke..."
 
-#: src/ephy-window.c:281
+#: src/ephy-window.c:287
 msgid "_Copy Link Address"
 msgstr "_Kopier lenkens adresse"
 
 #. Images
-#: src/ephy-window.c:285
+#: src/ephy-window.c:291
 msgid "Open _Image"
 msgstr "Åpne b_ilde"
 
-#: src/ephy-window.c:287
-msgid "Open Image in New _Window"
-msgstr "Åpne bilde i nytt _vindu"
-
-#: src/ephy-window.c:289
-msgid "Open Image in New T_ab"
-msgstr "Åpne bilde i ny f_ane"
-
-#: src/ephy-window.c:291
+#: src/ephy-window.c:293
 msgid "_Save Image As..."
 msgstr "_Lagre bilde som..."
 
-#: src/ephy-window.c:293
+#: src/ephy-window.c:295
 msgid "_Use Image As Background"
 msgstr "Br_uk bilde som bakgrunn"
 
-#: src/ephy-window.c:295
+#: src/ephy-window.c:297
 msgid "Copy I_mage Address"
 msgstr "Ko_pier adressen til bildet"
 
-#: src/ephy-window.c:584
+#: src/ephy-window.c:542
 msgid "Exit Fullscreen"
 msgstr "Avslutt fullskjerm"
 
-#: src/ephy-window.c:658
-msgid "_Close document"
+#: src/ephy-window.c:616
+#, fuzzy
+msgid "Close _Document"
 msgstr "_Lukk dokument"
 
-#: src/ephy-window.c:685
+#: src/ephy-window.c:644
 msgid "There are unsubmitted changes to form elements."
 msgstr "Det finnes endringer i skjemaet som ikke er sendt."
 
-#: src/ephy-window.c:686
+#: src/ephy-window.c:645
 msgid "If you close the document anyway, you will lose that information."
 msgstr "Hvis du lukker dokumentet likevel vil du miste denne informasjonen."
 
-#: src/ephy-window.c:943 src/window-commands.c:392
+#: src/ephy-window.c:1015 src/window-commands.c:396
 msgid "Open"
 msgstr "Åpne"
 
-#: src/ephy-window.c:945 src/window-commands.c:417
+#: src/ephy-window.c:1017 src/window-commands.c:422
 msgid "Save As"
 msgstr "Lagre som"
 
-#: src/ephy-window.c:949
+#: src/ephy-window.c:1021
 msgid "Bookmark"
 msgstr "Bokmerke"
 
-#: src/ephy-window.c:1135
-msgid "Insecure"
-msgstr "Usikker"
-
-#: src/ephy-window.c:1138
+#: src/ephy-window.c:1210
 msgid "Broken"
 msgstr "Ødelagt"
 
-#: src/ephy-window.c:1141
+#: src/ephy-window.c:1213
 msgid "Medium"
 msgstr "Middels"
 
-#: src/ephy-window.c:1145
+#: src/ephy-window.c:1217
 msgid "Low"
 msgstr "Lav"
 
-#: src/ephy-window.c:1149
+#: src/ephy-window.c:1221
 msgid "High"
 msgstr "Høy"
 
-#: src/ephy-window.c:1159
+#: src/ephy-window.c:1231
 #, c-format
 msgid ""
 "Security level: %s\n"
@@ -3187,7 +3042,7 @@ msgstr ""
 "Sikkerhetsnivå: %s\n"
 "%s"
 
-#: src/ephy-window.c:1165
+#: src/ephy-window.c:1237
 #, c-format
 msgid "Security level: %s"
 msgstr "Sikkerhetsnivå: %s"
@@ -3222,16 +3077,17 @@ msgid "Path:"
 msgstr "Sti:"
 
 #: src/pdm-dialog.c:914
-msgid "Secure:"
-msgstr "Sikker:"
+#, fuzzy
+msgid "Send for:"
+msgstr "S_end til..."
 
 #: src/pdm-dialog.c:923
-msgid "Yes"
-msgstr "Ja"
+msgid "Encrypted connections only"
+msgstr ""
 
 #: src/pdm-dialog.c:923
-msgid "No"
-msgstr "Nei"
+msgid "Any type of connection"
+msgstr ""
 
 #: src/pdm-dialog.c:929
 msgid "Expires:"
@@ -3241,22 +3097,46 @@ msgstr "Utgår:"
 msgid "End of current session"
 msgstr "Slutten på siste sesjon"
 
-#: src/popup-commands.c:329 src/popup-commands.c:337
+#: src/popup-commands.c:245 src/popup-commands.c:253
 msgid "Download link"
 msgstr "Last ned lenke"
 
+#: src/popup-commands.c:260
+msgid "Save Image As"
+msgstr "Lagre bilde som"
+
+#: src/popup-commands.c:350
+msgid "Save Background As"
+msgstr "Lagre bakgrunn som"
+
+#: src/ppview-toolbar.c:92
+msgid "First"
+msgstr "Første"
+
 #: src/ppview-toolbar.c:93
 msgid "Go to the first page"
 msgstr "Gå til den første siden"
 
+#: src/ppview-toolbar.c:96
+msgid "Last"
+msgstr "Siste"
+
 #: src/ppview-toolbar.c:97
 msgid "Go to the last page"
 msgstr "Gå til den siste siden"
 
+#: src/ppview-toolbar.c:100
+msgid "Previous"
+msgstr "Forrige"
+
 #: src/ppview-toolbar.c:101
 msgid "Go to the previous page"
 msgstr "Gå til forrige side"
 
+#: src/ppview-toolbar.c:104
+msgid "Next"
+msgstr "Neste"
+
 #: src/ppview-toolbar.c:105
 msgid "Go to next page"
 msgstr "Gå til neste side"
@@ -3456,7 +3336,7 @@ msgstr "Vietnamesisk"
 msgid "Walloon"
 msgstr "Walloon"
 
-#: src/prefs-dialog.c:1057
+#: src/prefs-dialog.c:1058
 #, c-format
 msgid "Custom [%s]"
 msgstr "Egendefinert [%s]"
@@ -3465,85 +3345,246 @@ msgstr "Egendefinert [%s]"
 #. * user's home folder. It should be translated by the same
 #. * term as GTK+'s "Home" string to be consistent with the
 #. * filechooser
-#: src/prefs-dialog.c:1102
+#: src/prefs-dialog.c:1103
 msgid "Home"
 msgstr "Hjem"
 
-#: src/prefs-dialog.c:1111
+#: src/prefs-dialog.c:1112
 msgid "Desktop"
 msgstr "Skrivebord"
 
-#: src/prefs-dialog.c:1322
+#: src/prefs-dialog.c:1321
 msgid "Select a directory"
 msgstr "Velg en katalog"
 
-#: src/toolbar.c:332
+#: src/toolbar.c:368
 msgid "Back"
 msgstr "Tilbake"
 
-#: src/toolbar.c:334
+#: src/toolbar.c:370
 msgid "Go back"
 msgstr "Gå tilbake"
 
-#: src/toolbar.c:346
+#: src/toolbar.c:382
 msgid "Forward"
 msgstr "Fremover"
 
-#: src/toolbar.c:348
+#: src/toolbar.c:384
 msgid "Go forward"
 msgstr "Gå fremover"
 
-#: src/toolbar.c:359
+#: src/toolbar.c:395
 msgid "Up"
 msgstr "Opp"
 
-#: src/toolbar.c:361
+#: src/toolbar.c:397
 msgid "Go up"
 msgstr "Gå opp"
 
-#: src/toolbar.c:375
-msgid "Address Entry"
-msgstr "Adressefelt"
-
-#: src/toolbar.c:377
+#: src/toolbar.c:413
 msgid "Enter a web address to open, or a phrase to search for on the web"
 msgstr ""
 "Skriv inn en nettadresse som skal åpnes, eller en frase du vil søke etter på "
 "nettet"
 
-#: src/toolbar.c:389
+#: src/toolbar.c:425
 msgid "Zoom"
 msgstr "Zoom"
 
-#: src/toolbar.c:391
+#: src/toolbar.c:427
 msgid "Adjust the text size"
 msgstr "Juster tekststørrelsen"
 
-#: src/toolbar.c:401
+#: src/toolbar.c:437
 msgid "Favicon"
 msgstr "Favorittikon"
 
-#: src/toolbar.c:411
+#: src/toolbar.c:447
 msgid "Go to the address entered in the address entry"
 msgstr "Gå til adressen som er oppgitt i adressefeltet"
 
-#: src/window-commands.c:168
+#: src/window-commands.c:169
 msgid "Check this out!"
 msgstr "Sjekk ut dette!"
 
-#: src/window-commands.c:878
+#: src/window-commands.c:855
 msgid "Toolbar Editor"
 msgstr "Redigering av verktøylinjer"
 
-#: src/window-commands.c:900
+#: src/window-commands.c:877
 msgid "_Add a New Toolbar"
 msgstr "_Legg til en ny verktøylinje"
 
 #. Translator credits
-#: src/window-commands.c:952
+#: src/window-commands.c:928
 msgid "translator-credits"
 msgstr "Kjartan Maraas <kmaraas@gnome.org>"
 
-#: src/window-commands.c:982
+#: src/window-commands.c:958
 msgid "A GNOME browser based on Mozilla"
 msgstr "En nettleser for GNOME, basert på Mozilla"
+
+#~ msgid "Epiphany Nautilus view"
+#~ msgstr "Epiphany Nautilus-visning"
+
+#~ msgid "Epiphany content view component"
+#~ msgstr "Epiphany innholdsvisningskomponent"
+
+#~ msgid "View as Web Page"
+#~ msgstr "Vis som nettside"
+
+#~ msgid "Web Page Viewer"
+#~ msgstr "Visning av nettside"
+
+#~ msgid "Add Bookmark for Frame"
+#~ msgstr "Legg til bokmerke for ramme"
+
+#~ msgid "Copy"
+#~ msgstr "Kopier"
+
+#~ msgid "Copy Email Address"
+#~ msgstr "Kopier e-postadresse"
+
+#~ msgid "Copy Image Address"
+#~ msgstr "Kopier adressen til bildet"
+
+#~ msgid "Copy Link Address"
+#~ msgstr "Kopier adressen til lenken"
+
+#~ msgid "Copy Page Address"
+#~ msgstr "Kopier adressen til siden"
+
+#~ msgid "Copy the Selection"
+#~ msgstr "Kopier utvalget"
+
+#~ msgid "Cut"
+#~ msgstr "Klipp ut"
+
+#~ msgid "Cut the Selection"
+#~ msgstr "Klipp ut utvalget"
+
+#~ msgid "Download Link"
+#~ msgstr "Last ned lenke"
+
+#~ msgid "Open Frame"
+#~ msgstr "Åpne ramme"
+
+#~ msgid "Open Frame in New Window"
+#~ msgstr "Åpne ramme i nytt vindu"
+
+#~ msgid "Open Image"
+#~ msgstr "Åpne bilde"
+
+#~ msgid "Open Image in New Window"
+#~ msgstr "Åpne bilde i nytt vindu"
+
+#~ msgid "Open in New Window"
+#~ msgstr "Åpne i nytt vindu"
+
+#~ msgid "Paste"
+#~ msgstr "Lim inn"
+
+#~ msgid "Paste the Clipboard"
+#~ msgstr "Lim inn utklippstavlen"
+
+#~ msgid "Print the Current File"
+#~ msgstr "Skriv ut denne filen"
+
+#~ msgid "Save Background As..."
+#~ msgstr "Lagre bakgrunn som..."
+
+#~ msgid "Save Image As..."
+#~ msgstr "Lagre bilde som..."
+
+#~ msgid "Save Page As..."
+#~ msgstr "Lagre siden som..."
+
+#~ msgid "Search for a String"
+#~ msgstr "Søk etter en streng"
+
+#~ msgid "Select All"
+#~ msgstr "Velg alt"
+
+#~ msgid "Select the Entire Document"
+#~ msgstr "Marker hele dokumentet"
+
+#~ msgid "Text _Encoding..."
+#~ msgstr "T_ekstkoding..."
+
+#~ msgid "Use Image As Background"
+#~ msgstr "Bruk bilde som bakgrunn"
+
+#~ msgid "Save Page As"
+#~ msgstr "Lagre siden som"
+
+#~ msgid "_Open"
+#~ msgstr "_Åpne"
+
+#~ msgid ""
+#~ "Epiphany cannot handle this protocol,\n"
+#~ "and no GNOME default handler is set"
+#~ msgstr ""
+#~ "Epiphany forstår ikke denne protokollen,\n"
+#~ "og ingen forvalgt håndterer er satt opp i GNOME"
+
+#~ msgid ""
+#~ "The protocol specified is not recognised.\n"
+#~ "\n"
+#~ "Would you like to try the GNOME default?"
+#~ msgstr ""
+#~ "Galeon forstår ikke denne protokollen.\n"
+#~ "\n"
+#~ "Vil du forsøke å bruke GNOME-håndtereren?"
+
+#~ msgid "HTML files"
+#~ msgstr "HTML-filer"
+
+#~ msgid ""
+#~ "GConf error:\n"
+#~ "  %s\n"
+#~ "All further errors shown only on terminal"
+#~ msgstr ""
+#~ "GConf-feil:\n"
+#~ "  %s\n"
+#~ "Alle senere feil vises kun på terminalen"
+
+#~ msgid "GConf Error"
+#~ msgstr "GConf-feil"
+
+#~ msgid ""
+#~ "File %s will be overwritten.\n"
+#~ "If you choose yes, the contents will be lost.\n"
+#~ "\n"
+#~ "Do you want to continue?"
+#~ msgstr ""
+#~ "Filen %s vil bli overskrevet.\n"
+#~ "Hvis du svarer ja vil innholdet gå tapt.\n"
+#~ "\n"
+#~ "Vil du fortsette?"
+
+#~ msgid "Choose the bookmarks source:"
+#~ msgstr "Velg kilde for bokmerker:"
+
+#~ msgid "Mozilla bookmarks"
+#~ msgstr "Mozilla-bokmerker"
+
+#~ msgid "Import from a file"
+#~ msgstr "Importer fra en fil"
+
+#~ msgid "Open Frame in _New Window"
+#~ msgstr "Åpne ramme i _nytt vindu"
+
+#~ msgid "Open Frame in New _Tab"
+#~ msgstr "Åpne ramme i ny _fane"
+
+#~ msgid "Open Image in New _Window"
+#~ msgstr "Åpne bilde i nytt _vindu"
+
+#~ msgid "Open Image in New T_ab"
+#~ msgstr "Åpne bilde i ny f_ane"
+
+#~ msgid "Yes"
+#~ msgstr "Ja"
+
+#~ msgid "No"
+#~ msgstr "Nei"