aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2006-01-19 21:22:56 +0800
committerKjartan Maraas <kmaraas@src.gnome.org>2006-01-19 21:22:56 +0800
commit12d4758310de58f192e4b3b48d32413e6a35e728 (patch)
treef54cda2c7b6cf4ae0eca36d6280abb0575cd827c
parent249fce60f59693cb94f63e20886790cbc394a8b2 (diff)
downloadgsoc2013-epiphany-12d4758310de58f192e4b3b48d32413e6a35e728.tar
gsoc2013-epiphany-12d4758310de58f192e4b3b48d32413e6a35e728.tar.gz
gsoc2013-epiphany-12d4758310de58f192e4b3b48d32413e6a35e728.tar.bz2
gsoc2013-epiphany-12d4758310de58f192e4b3b48d32413e6a35e728.tar.lz
gsoc2013-epiphany-12d4758310de58f192e4b3b48d32413e6a35e728.tar.xz
gsoc2013-epiphany-12d4758310de58f192e4b3b48d32413e6a35e728.tar.zst
gsoc2013-epiphany-12d4758310de58f192e4b3b48d32413e6a35e728.zip
Updated Norwegian bokmål translation. Same.
2006-01-19 Kjartan Maraas <kmaraas@gnome.org> * nb.po: Updated Norwegian bokmål translation. * no.po: Same.
-rw-r--r--po/ChangeLog5
-rw-r--r--po/nb.po774
-rw-r--r--po/no.po774
3 files changed, 919 insertions, 634 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 7d9a65a7e..159b8d6f1 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-19 Kjartan Maraas <kmaraas@gnome.org>
+
+ * nb.po: Updated Norwegian bokmål translation.
+ * no.po: Same.
+
2006-01-19 Ignacio Casal Quinteiro <nacho.resa@gmail.com>
* gl.po: Updated Galician Translation.
diff --git a/po/nb.po b/po/nb.po
index c9ac07b84..0923ae541 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,15 +1,15 @@
# Norwegian bokmål translation of Epiphany
# Copyright (C) 2000-2003, 2005 Free Software Foundation, Inc.
# Ola Sverre Bauge <osb@plover.net>, 2000.
-# Kjartan Maraas <kmaraas@gnome.org>, 2000-2005.
+# Kjartan Maraas <kmaraas@gnome.org>, 2000-2006.
# Roy-Magne Mo <rmo@sunnmore.net>, 2001.
# Terance Edward Sola <terance@lyse.net>, 2005.
msgid ""
msgstr ""
-"Project-Id-Version: epiphany 1.8.x\n"
+"Project-Id-Version: epiphany 1.9.x\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-02 00:39+0100\n"
-"PO-Revision-Date: 2006-01-02 00:40+0100\n"
+"POT-Creation-Date: 2006-01-19 14:09+0100\n"
+"PO-Revision-Date: 2006-01-19 14:14+0100\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
"Content-Transfer-Encoding: 8Bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../data/GNOME_Epiphany_Automation.server.in.h:1
-msgid "Epiphany automation"
-msgstr "Epiphany automatisering"
-
#: ../data/epiphany-lockdown.schemas.in.h:1
msgid ""
"A list of protocols to be considered safe in addition to the default, when "
@@ -136,8 +132,8 @@ msgid "Epiphany Web Browser"
msgstr "Epiphany nettleser"
#. sets the name to appear in the window list applet when grouping windows
-#: ../data/epiphany.desktop.in.in.h:3 ../src/ephy-main.c:222
-#: ../src/ephy-main.c:233
+#: ../data/epiphany.desktop.in.in.h:3 ../src/ephy-main.c:223
+#: ../src/ephy-main.c:234
msgid "Web Browser"
msgstr "Nettleser"
@@ -252,28 +248,38 @@ msgid "Home page"
msgstr "Hjemmeside"
#: ../data/epiphany.schemas.in.h:19
+msgid ""
+"How to present animated images. Possible values are \"normal\", \"once\" and "
+"\"disabled\"."
+msgstr "Presentasjon av animerte bilder. Mulige verdier er «normal», «once», og «disabled»."
+
+#: ../data/epiphany.schemas.in.h:20
msgid "ISO-8859-1"
msgstr "ISO-8859-1"
-#: ../data/epiphany.schemas.in.h:20
+#: ../data/epiphany.schemas.in.h:21
+msgid "Image animation mode"
+msgstr "Modus for animasjon av bilder"
+
+#: ../data/epiphany.schemas.in.h:22
msgid "Languages"
msgstr "Språk"
-#: ../data/epiphany.schemas.in.h:21
+#: ../data/epiphany.schemas.in.h:23
msgid "Lists the active extensions."
msgstr "Viser aktive utvidelser."
-#: ../data/epiphany.schemas.in.h:22
+#: ../data/epiphany.schemas.in.h:24
msgid "Match case for find in page"
msgstr "Skill mellom store og små bokstaver for søk på siden"
-#: ../data/epiphany.schemas.in.h:23
+#: ../data/epiphany.schemas.in.h:25
msgid ""
"Middle click to open the web page pointed to by the currently selected text"
msgstr ""
"Klikk på midterste knapp for å åpne nettsiden som pekes til av valgt tekst"
-#: ../data/epiphany.schemas.in.h:24
+#: ../data/epiphany.schemas.in.h:26
msgid ""
"Middle clicking on the main view pane will open the web page pointed to by "
"the currently selected text."
@@ -281,19 +287,23 @@ msgstr ""
"Klikk på midterste knapp i hovedvisningsområdet vil åpne nettsiden som pekes "
"til av valgt tekst."
-#: ../data/epiphany.schemas.in.h:25
+#: ../data/epiphany.schemas.in.h:27
+msgid "Minimum font size"
+msgstr "Minste skriftstørrelse"
+
+#: ../data/epiphany.schemas.in.h:28
msgid "Preferred languages, two letter codes."
msgstr "Foretrukne språk. Tobokstavskoder."
-#: ../data/epiphany.schemas.in.h:26
+#: ../data/epiphany.schemas.in.h:29
msgid "Show bookmarks bar by default"
msgstr "Vis bokmerkelinje som forvalg"
-#: ../data/epiphany.schemas.in.h:27
+#: ../data/epiphany.schemas.in.h:30
msgid "Show statusbar by default"
msgstr "Vis statuslinje som forvalg"
-#: ../data/epiphany.schemas.in.h:28
+#: ../data/epiphany.schemas.in.h:31
msgid ""
"Show the history pages visited \"ever\", \"last_two_days\", \"last_three_days"
"\", \"today\"."
@@ -301,27 +311,27 @@ msgstr ""
"Vis historikk for sider besøkt, «ever», «last_two_days», «last_three_days», "
"«today»."
-#: ../data/epiphany.schemas.in.h:29
+#: ../data/epiphany.schemas.in.h:32
msgid "Show the tab bar also when there is only one tab open."
msgstr "Vis fanelinjen også når kun en fane er åpen."
-#: ../data/epiphany.schemas.in.h:30
+#: ../data/epiphany.schemas.in.h:33
msgid "Show toolbars by default"
msgstr "Vis verktøylinjer som forvalg"
-#: ../data/epiphany.schemas.in.h:31
+#: ../data/epiphany.schemas.in.h:34
msgid "Size of disk cache"
msgstr "Størrelse på diskbuffer"
-#: ../data/epiphany.schemas.in.h:32
+#: ../data/epiphany.schemas.in.h:35
msgid "Size of disk cache, in MB."
msgstr "Størrelse på diskbuffer i MB."
-#: ../data/epiphany.schemas.in.h:33
+#: ../data/epiphany.schemas.in.h:36
msgid "The bookmark information shown in the editor view"
msgstr "Bokmerkeinformasjon som vises i redigeringsvisning"
-#: ../data/epiphany.schemas.in.h:34
+#: ../data/epiphany.schemas.in.h:37
msgid ""
"The bookmark information shown in the editor view. Valid values in the list "
"are \"address\" and \"title\"."
@@ -329,11 +339,11 @@ msgstr ""
"Bokmerkeinformasjon som vises i redigeringsvisning. Gyldige verdier i listen "
"er «address» og «title»."
-#: ../data/epiphany.schemas.in.h:35
+#: ../data/epiphany.schemas.in.h:38
msgid "The currently selected fonts language"
msgstr "Valgt skriftspråk"
-#: ../data/epiphany.schemas.in.h:36
+#: ../data/epiphany.schemas.in.h:39
msgid ""
"The currently selected fonts language. Valid values are \"ar\" (arabic), \"x-"
"baltic\" (baltic languages), \"x-central-euro\" (central european "
@@ -352,15 +362,15 @@ msgstr ""
"western» (språk som skrives med de latinske alfabet), «x-tamil» (tamil) og "
"«x-devangari» (devangari»."
-#: ../data/epiphany.schemas.in.h:37
+#: ../data/epiphany.schemas.in.h:40
msgid "The downloads folder"
msgstr "Nedlastingsmappe"
-#: ../data/epiphany.schemas.in.h:38
+#: ../data/epiphany.schemas.in.h:41
msgid "The encoding autodetector. Empty string means autodetect is off"
msgstr "Automatisk gjenkjenning av tegnsett. Av når strengen er tom"
-#: ../data/epiphany.schemas.in.h:39
+#: ../data/epiphany.schemas.in.h:42
msgid ""
"The encoding autodetector. Valid entries are \"\" (autodetectors off), "
"\"cjk_parallel_state_machine\" (autodetect east asian encodings), "
@@ -382,11 +392,11 @@ msgstr ""
"kinesisk), «universal_charset_detector» (automatisk gjenkjenning av de "
"fleste kodinger)."
-#: ../data/epiphany.schemas.in.h:40
+#: ../data/epiphany.schemas.in.h:43
msgid "The page information shown in the history view"
msgstr "Sideinformasjon som vises i historikkvisning"
-#: ../data/epiphany.schemas.in.h:41
+#: ../data/epiphany.schemas.in.h:44
msgid ""
"The page information shown in the history view. Valid values in the list are "
"\"address\", \"title\"."
@@ -394,7 +404,7 @@ msgstr ""
"Sideinformasjon som vises i historikkvisning. Gyldige verdier i listen er "
"«address» og «title»."
-#: ../data/epiphany.schemas.in.h:42
+#: ../data/epiphany.schemas.in.h:45
msgid ""
"The path of the folder where to download files to; or \"Downloads\" to use "
"the default downloads folder, or \"Desktop\" to use the desktop folder."
@@ -403,11 +413,11 @@ msgstr ""
"å bruke den forvalgte nedlastningsmappen, eller «Desktop» for å bruke "
"skrivebordsmappen."
-#: ../data/epiphany.schemas.in.h:43
+#: ../data/epiphany.schemas.in.h:46
msgid "Toolbar style"
msgstr "Stil for verktøylinje"
-#: ../data/epiphany.schemas.in.h:44
+#: ../data/epiphany.schemas.in.h:47
msgid ""
"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both"
"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and "
@@ -416,23 +426,23 @@ msgstr ""
"Stil for verktøylinje. Tillatte verdier er «» (bruk forvalg), «both» (tekst "
"og ikoner), «both-horiz» (tekst ved siden av ikoner), «icons» og «text»."
-#: ../data/epiphany.schemas.in.h:45
+#: ../data/epiphany.schemas.in.h:48
msgid "Use own colors"
msgstr "Bruk egne farger"
-#: ../data/epiphany.schemas.in.h:46
+#: ../data/epiphany.schemas.in.h:49
msgid "Use own fonts"
msgstr "Bruk egne skrifter"
-#: ../data/epiphany.schemas.in.h:47
+#: ../data/epiphany.schemas.in.h:50
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:48
+#: ../data/epiphany.schemas.in.h:51
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:49
+#: ../data/epiphany.schemas.in.h:52
msgid ""
"When files cannot be opened by the browser they are automatically downloaded "
"to the download folder and opened with the appropriate application."
@@ -440,7 +450,7 @@ msgstr ""
"Når filer ikke kan åpnes av nettleseren lastes de ned til nedlastingsmappen "
"og åpnes med riktig applikasjon automatisk."
-#: ../data/epiphany.schemas.in.h:50
+#: ../data/epiphany.schemas.in.h:53
msgid ""
"Where to accept cookies from. Possible values are \"anywhere\", \"current "
"site\" and \"nowhere\"."
@@ -448,23 +458,23 @@ msgstr ""
"Hvor informasjonskapsler skal godtas fra. Mulige verdier er «anywhere», "
"«current» og «nowhere»."
-#: ../data/epiphany.schemas.in.h:51
+#: ../data/epiphany.schemas.in.h:54
msgid "Whether to print the date in the footer"
msgstr "Om dato skal skrives ut i bunnteksten"
-#: ../data/epiphany.schemas.in.h:52
+#: ../data/epiphany.schemas.in.h:55
msgid "Whether to print the page address in the header"
msgstr "Om sidens adresse skal skrives ut i toppteksten"
-#: ../data/epiphany.schemas.in.h:53
+#: ../data/epiphany.schemas.in.h:56
msgid "Whether to print the page numbers (x of total) in the footer"
msgstr "Om sidenummer (x av total) skal skrives ut i bunnteksten"
-#: ../data/epiphany.schemas.in.h:54
+#: ../data/epiphany.schemas.in.h:57
msgid "Whether to print the page title in the header"
msgstr "Om sidens tittel skal skrives ut i toppteksten"
-#: ../data/epiphany.schemas.in.h:55
+#: ../data/epiphany.schemas.in.h:58
msgid "x-western"
msgstr "x-western"
@@ -513,7 +523,7 @@ msgid "Field _Value"
msgstr "Felt_verdi"
#: ../data/glade/certificate-dialogs.glade.h:12
-#: ../data/glade/prefs-dialog.glade.h:23
+#: ../data/glade/prefs-dialog.glade.h:20
msgid "General"
msgstr "Generell"
@@ -555,7 +565,7 @@ msgid "Cookies"
msgstr "Informasjonskapsler"
#. The name of the default downloads folder
-#: ../data/glade/epiphany.glade.h:4 ../lib/ephy-file-helpers.c:99
+#: ../data/glade/epiphany.glade.h:4 ../lib/ephy-file-helpers.c:101
msgid "Downloads"
msgstr "Nedlastinger"
@@ -579,67 +589,51 @@ msgstr "Bruk koding som spesifisert av dokumentet"
msgid "_Show password"
msgstr "Vi_s passord"
-#: ../data/glade/prefs-dialog.glade.h:1 ../data/glade/print.glade.h:1
-msgid "<b>Colors</b>"
-msgstr "<b>Farger</b>"
-
-#: ../data/glade/prefs-dialog.glade.h:2
+#: ../data/glade/prefs-dialog.glade.h:1
msgid "<b>Cookies</b>"
msgstr "<b>Informasjonskapsler</b>"
-#: ../data/glade/prefs-dialog.glade.h:3
+#: ../data/glade/prefs-dialog.glade.h:2
msgid "<b>Downloads</b>"
msgstr "<b>Nedlastinger</b>"
-#: ../data/glade/prefs-dialog.glade.h:4
+#: ../data/glade/prefs-dialog.glade.h:3
msgid "<b>Encodings</b>"
msgstr "<b>Kodinger</b>"
-#: ../data/glade/prefs-dialog.glade.h:5
-msgid "<b>Fonts</b>"
-msgstr "<b>Skrifter</b>"
-
-#: ../data/glade/prefs-dialog.glade.h:6
+#: ../data/glade/prefs-dialog.glade.h:4
msgid "<b>Home page</b>"
msgstr "<b>Hjemmeside</b>"
-#: ../data/glade/prefs-dialog.glade.h:7
+#: ../data/glade/prefs-dialog.glade.h:5
msgid "<b>Languages</b>"
msgstr "<b>Språk</b>"
-#: ../data/glade/prefs-dialog.glade.h:8
+#: ../data/glade/prefs-dialog.glade.h:6
msgid "<b>Temporary Files</b>"
msgstr "<b>Midlertidige filer</b>"
-#: ../data/glade/prefs-dialog.glade.h:9
+#: ../data/glade/prefs-dialog.glade.h:7
msgid "<b>Web Content</b>"
msgstr "<b>Nettinnhold</b>"
-#: ../data/glade/prefs-dialog.glade.h:10
+#: ../data/glade/prefs-dialog.glade.h:8
msgid "A_utomatically download and open files"
msgstr "Last ned og åpne filer a_utomatisk"
-#: ../data/glade/prefs-dialog.glade.h:11
+#: ../data/glade/prefs-dialog.glade.h:9
msgid "Add Language"
msgstr "Legg til språk"
-#: ../data/glade/prefs-dialog.glade.h:12
-msgid "Al_ways use the desktop theme colors"
-msgstr "All_tid bruk farger fra skrivebordstema"
-
-#: ../data/glade/prefs-dialog.glade.h:13
+#: ../data/glade/prefs-dialog.glade.h:10
msgid "Allow popup _windows"
msgstr "Tillat sprettopp_vinduer"
-#: ../data/glade/prefs-dialog.glade.h:14
-msgid "Always use _these fonts"
-msgstr "Alltid bruk _disse skriftene"
-
-#: ../data/glade/prefs-dialog.glade.h:15
+#: ../data/glade/prefs-dialog.glade.h:11
msgid "Au_todetect:"
msgstr "Gjenkjenn au_tomatisk:"
-#: ../data/glade/prefs-dialog.glade.h:16
+#: ../data/glade/prefs-dialog.glade.h:12
msgid "Choose a l_anguage:"
msgstr "V_elg et språk:"
@@ -647,61 +641,77 @@ msgstr "V_elg et språk:"
#. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
#. * Select All, Input Methods and Insert Unicode control character.)
#.
-#: ../data/glade/prefs-dialog.glade.h:17
+#: ../data/glade/prefs-dialog.glade.h:13
#: ../lib/widgets/ephy-location-entry.c:580 ../src/ephy-history-window.c:261
msgid "Cl_ear"
msgstr "Tø_m"
-#: ../data/glade/prefs-dialog.glade.h:18
+#: ../data/glade/prefs-dialog.glade.h:14
msgid "De_fault:"
msgstr "_Forvalgt:"
-#: ../data/glade/prefs-dialog.glade.h:19
+#: ../data/glade/prefs-dialog.glade.h:15
msgid "Enable Java_Script"
msgstr "Aktiver Java_Script"
-#: ../data/glade/prefs-dialog.glade.h:20
+#: ../data/glade/prefs-dialog.glade.h:16
msgid "Enable _Java"
msgstr "Aktiver _Java"
-#: ../data/glade/prefs-dialog.glade.h:21
-msgid "Fonts and Colors"
-msgstr "Skrifter og farger"
+#: ../data/glade/prefs-dialog.glade.h:17
+msgid "Fonts"
+msgstr "Skrifter"
-#: ../data/glade/prefs-dialog.glade.h:22
+#: ../data/glade/prefs-dialog.glade.h:18
+msgid "Fonts & Style"
+msgstr "Skrifter og stil"
+
+#: ../data/glade/prefs-dialog.glade.h:19
msgid "For l_anguage:"
msgstr "For spr_åk:"
-#: ../data/glade/prefs-dialog.glade.h:24 ../src/prefs-dialog.c:1037
+#: ../data/glade/prefs-dialog.glade.h:21 ../src/prefs-dialog.c:1301
msgid "Language"
msgstr "Språk"
-#: ../data/glade/prefs-dialog.glade.h:25
+#: ../data/glade/prefs-dialog.glade.h:22
+msgid "Let web pages specify their own _colors"
+msgstr "La nettsider oppgi egne _farger"
+
+#: ../data/glade/prefs-dialog.glade.h:23
+msgid "Let web pages specify their own _fonts"
+msgstr "La nettsider oppgi egne _skrifter"
+
+#: ../data/glade/prefs-dialog.glade.h:24
msgid "MB"
msgstr "MB"
-#: ../data/glade/prefs-dialog.glade.h:26
+#: ../data/glade/prefs-dialog.glade.h:25
msgid "Only _from sites you visit"
msgstr "Kun _fra steder du besøker"
-#: ../data/glade/prefs-dialog.glade.h:27
+#: ../data/glade/prefs-dialog.glade.h:26
msgid "Preferences"
msgstr "Brukervalg..."
-#: ../data/glade/prefs-dialog.glade.h:28
+#: ../data/glade/prefs-dialog.glade.h:27
msgid "Privacy"
msgstr "Personvern"
-#: ../data/glade/prefs-dialog.glade.h:29
+#: ../data/glade/prefs-dialog.glade.h:28
msgid "Set to Current _Page"
msgstr "Sett til denne _siden"
-#: ../data/glade/prefs-dialog.glade.h:30
+#: ../data/glade/prefs-dialog.glade.h:29
msgid "Set to _Blank Page"
msgstr "Sett til _tom side"
+#: ../data/glade/prefs-dialog.glade.h:30
+msgid "Use custom _stylesheet"
+msgstr "Bruk egendefinert _stilark"
+
#: ../data/glade/prefs-dialog.glade.h:31
-#: ../src/bookmarks/ephy-bookmark-properties.c:340
+#: ../src/bookmarks/ephy-bookmark-properties.c:596
msgid "_Address:"
msgstr "_Adresse:"
@@ -710,29 +720,41 @@ msgid "_Always accept"
msgstr "_Alltid godta"
#: ../data/glade/prefs-dialog.glade.h:33
+msgid "_Detailed Font Settings..."
+msgstr "_Detaljerte innstillinger for skrifter..."
+
+#: ../data/glade/prefs-dialog.glade.h:34
msgid "_Disk space:"
msgstr "_Diskplass:"
-#: ../data/glade/prefs-dialog.glade.h:34
+#: ../data/glade/prefs-dialog.glade.h:35
msgid "_Download folder:"
msgstr "Ne_dlastingsmappe:"
-#: ../data/glade/prefs-dialog.glade.h:35
+#: ../data/glade/prefs-dialog.glade.h:36
+msgid "_Edit Stylesheet..."
+msgstr "R_ediger stilark..."
+
+#: ../data/glade/prefs-dialog.glade.h:37
msgid "_Fixed width:"
msgstr "_Fast bredde:"
-#: ../data/glade/prefs-dialog.glade.h:36
+#: ../data/glade/prefs-dialog.glade.h:38
msgid "_Minimum size:"
msgstr "_Minste størrelse:"
-#: ../data/glade/prefs-dialog.glade.h:37
+#: ../data/glade/prefs-dialog.glade.h:39
msgid "_Never accept"
msgstr "_Aldri godta"
-#: ../data/glade/prefs-dialog.glade.h:38
+#: ../data/glade/prefs-dialog.glade.h:40
msgid "_Variable width:"
msgstr "_Variabel bredde:"
+#: ../data/glade/print.glade.h:1
+msgid "<b>Colors</b>"
+msgstr "<b>Farger</b>"
+
#: ../data/glade/print.glade.h:2
msgid "<b>Footers</b>"
msgstr "<b>Bunntekst</b>"
@@ -803,7 +825,7 @@ msgstr ""
"%s av %s"
#: ../embed/downloader-view.c:431 ../embed/downloader-view.c:436
-#: ../src/ephy-window.c:1454
+#: ../src/ephy-window.c:1469
msgid "Unknown"
msgstr "Ukjent"
@@ -838,6 +860,10 @@ msgstr "%"
msgid "Remaining"
msgstr "Gjenstår"
+#: ../embed/ephy-embed-shell.c:235
+msgid "Epiphany can't be used now. Mozilla initialization failed."
+msgstr "Epiphany kan ikke brukes nå. Initiering av Mozilla feilet."
+
#: ../embed/ephy-encodings.c:60
msgid "Arabic (_IBM-864)"
msgstr "Arabisk (_IBM-864)"
@@ -1221,7 +1247,7 @@ msgstr "Ukrainsk"
msgid "Unknown (%s)"
msgstr "Ukjent (%s)"
-#: ../embed/ephy-history.c:550
+#: ../embed/ephy-history.c:550 ../src/bookmarks/ephy-bookmark-properties.c:613
msgid "All"
msgstr "Alle"
@@ -1551,10 +1577,29 @@ msgstr "i the Internet Archive"
#: ../embed/mozilla/EphyHeaderSniffer.cpp:364
#: ../src/bookmarks/ephy-bookmarks-import.c:245
-#: ../src/bookmarks/ephy-bookmarks-ui.c:481 ../src/ephy-session.c:775
+#: ../src/bookmarks/ephy-bookmarks.c:1111 ../src/ephy-session.c:775
msgid "Untitled"
msgstr "Uten tittel"
+#: ../embed/mozilla/EphyPromptService.cpp:193
+msgid "_Abort Script"
+msgstr "_Avbryt skript"
+
+#: ../embed/mozilla/EphyPromptService.cpp:261
+msgid "Don't Save"
+msgstr "Ikke lagre"
+
+#: ../embed/mozilla/EphyPromptService.cpp:742
+msgid "_User:"
+msgstr "Br_uker:"
+
+#: ../embed/mozilla/EphyPromptService.cpp:743
+#: ../embed/mozilla/EphyPromptService.cpp:770
+#: ../embed/mozilla/GtkNSSDialogs.cpp:795
+#: ../embed/mozilla/GtkNSSDialogs.cpp:905
+msgid "_Password:"
+msgstr "_Passord:"
+
#: ../embed/mozilla/FilePicker.cpp:152 ../embed/mozilla/FilePicker.cpp:445
#: ../lib/ephy-file-chooser.c:371 ../src/bookmarks/ephy-bookmarks-editor.c:642
msgid "All files"
@@ -1745,11 +1790,6 @@ msgstr "Velg passord."
msgid "Select a password to protect this certificate."
msgstr "Velg et passord for å beskytte dette sertifikatet."
-#: ../embed/mozilla/GtkNSSDialogs.cpp:795
-#: ../embed/mozilla/GtkNSSDialogs.cpp:905
-msgid "_Password:"
-msgstr "_Passord:"
-
#: ../embed/mozilla/GtkNSSDialogs.cpp:809
msgid "Con_firm password:"
msgstr "Bekre_ft passord:"
@@ -1928,14 +1968,10 @@ msgstr "Filer"
#. * in url-escaped UTF-8; that means that if you're choosing google,
#. * the 'q=' part needs to come last.
#.
-#: ../embed/mozilla/mozilla-embed-single.cpp:263
+#: ../embed/mozilla/mozilla-embed-single.cpp:293
msgid "http://www.google.com/search?ie=UTF-8&oe=UTF-8&q="
msgstr "http://www.google.com/search?ie=UTF-8&oe=UTF-8&q="
-#: ../embed/mozilla/mozilla-embed-single.cpp:595
-msgid "Epiphany can't be used now. Mozilla initialization failed."
-msgstr "Epiphany kan ikke brukes nå. Initiering av Mozilla feilet."
-
#: ../embed/print-dialog.c:258
msgid "Generating PDF is not supported"
msgstr "Oppretting av PDF er ikke støttet"
@@ -1953,27 +1989,27 @@ msgstr ""
"Du prøvde å skrive ut til en skriver med driver «%s». Dette programmet "
"krever en PostScript skriverdriver."
-#: ../embed/print-dialog.c:365
+#: ../embed/print-dialog.c:364
msgid "_From:"
msgstr "_Fra:"
-#: ../embed/print-dialog.c:378
+#: ../embed/print-dialog.c:377
msgid "Sets the start of the range of pages to be printed"
msgstr "Start på sideområdet som skal skrives ut"
-#: ../embed/print-dialog.c:380
+#: ../embed/print-dialog.c:379
msgid "_To:"
msgstr "_Til:"
-#: ../embed/print-dialog.c:393
+#: ../embed/print-dialog.c:392
msgid "Sets the end of the range of pages to be printed"
msgstr "Slutten på sideområdet som skal skrives ut"
-#: ../embed/print-dialog.c:408 ../src/ephy-window.c:1280
+#: ../embed/print-dialog.c:407 ../src/ephy-window.c:1289
msgid "Print"
msgstr "Skriv ut"
-#: ../embed/print-dialog.c:416
+#: ../embed/print-dialog.c:415
msgid "Pages"
msgstr "Sider"
@@ -1986,18 +2022,30 @@ msgstr ""
"GConf feil:\n"
" %s"
-#: ../lib/egg/egg-editable-toolbar.c:487
+#: ../lib/egg/egg-editable-toolbar.c:1060
msgid "_Move on Toolbar"
msgstr "_Flytt på verktøylinje"
-#: ../lib/egg/egg-editable-toolbar.c:495
+#: ../lib/egg/egg-editable-toolbar.c:1061
+msgid "Move the selected item on the toolbar"
+msgstr "Flytt valgt oppføring på verktøylinjen"
+
+#: ../lib/egg/egg-editable-toolbar.c:1062
msgid "_Remove from Toolbar"
msgstr "Fje_rn verktøylinje"
-#: ../lib/egg/egg-editable-toolbar.c:524
+#: ../lib/egg/egg-editable-toolbar.c:1063
+msgid "Remove the selected item from the toolbar"
+msgstr "Fjern valgt oppføring fra verktøylinjen"
+
+#: ../lib/egg/egg-editable-toolbar.c:1064
msgid "_Remove Toolbar"
msgstr "Fje_rn verktøylinje"
+#: ../lib/egg/egg-editable-toolbar.c:1065
+msgid "Remove the selected toolbar"
+msgstr "Fjern valgt verktøylinje"
+
#: ../lib/egg/egg-toolbar-editor.c:439
msgid "Separator"
msgstr "Skillelinje"
@@ -2006,12 +2054,12 @@ msgstr "Skillelinje"
msgid "All supported types"
msgstr "Alle støttede typer"
-#: ../lib/ephy-file-helpers.c:328
+#: ../lib/ephy-file-helpers.c:330
#, c-format
msgid "\"%s\" exists, please move it out of the way."
msgstr "«%s» eksisterer. Vennligst flytt den."
-#: ../lib/ephy-file-helpers.c:334
+#: ../lib/ephy-file-helpers.c:336
#, c-format
msgid "Failed to create directory \"%s\"."
msgstr "Kunne ikke opprette katalog «%s»."
@@ -2038,7 +2086,9 @@ msgstr "Kan ikke overskrive eksisterende fil «%s»"
msgid ""
"A file with this name already exists and you don't have permission to "
"overwrite it."
-msgstr "En fil med dette navnet eksisterer allerede og du har ikke rettigheter til å overskrive den."
+msgstr ""
+"En fil med dette navnet eksisterer allerede og du har ikke rettigheter til å "
+"overskrive den."
#: ../lib/ephy-gui.c:372
msgid "Cannot Overwrite File"
@@ -2205,21 +2255,17 @@ msgstr "Vestlig"
msgid "select fonts for|Other Scripts"
msgstr "Andre"
-#: ../lib/ephy-stock-icons.c:54
-msgid "Close Tab"
-msgstr "Lukk fane"
-
#: ../lib/ephy-stock-icons.c:55
msgid "Popup Windows"
msgstr "Sprettoppvinduer"
-#: ../lib/ephy-stock-icons.c:56 ../src/ephy-history-window.c:1191
+#: ../lib/ephy-stock-icons.c:56 ../src/ephy-history-window.c:1179
msgid "History"
msgstr "Historie"
#: ../lib/ephy-stock-icons.c:57 ../src/bookmarks/ephy-bookmarks-editor.c:684
#: ../src/bookmarks/ephy-bookmarks-editor.c:1535
-#: ../src/bookmarks/ephy-topic-action.c:344 ../src/ephy-window.c:1286
+#: ../src/bookmarks/ephy-topic-action.c:402 ../src/ephy-window.c:1295
msgid "Bookmarks"
msgstr "Bokmerker"
@@ -2302,239 +2348,261 @@ msgstr ""
"Dette tillegget håndterer «.desktop» filer som inneholder lenker til "
"nettsteder."
-#: ../src/bookmarks/ephy-bookmark-action.c:284
+#: ../src/bookmarks/ephy-bookmark-action.c:287
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../src/bookmarks/ephy-bookmark-action.c:395
-#: ../src/bookmarks/ephy-bookmarks-editor.c:176
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1162
-#: ../src/ephy-history-window.c:173 ../src/ephy-history-window.c:711
-msgid "Open in New _Tab"
-msgid_plural "Open in New _Tabs"
-msgstr[0] "Åpne i ny _fane"
-msgstr[1] "Åpne i nye _faner"
-
-#. File Menu
-#: ../src/bookmarks/ephy-bookmark-action.c:401
-#: ../src/bookmarks/ephy-bookmarks-editor.c:173
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1159
-#: ../src/ephy-history-window.c:170 ../src/ephy-history-window.c:708
-msgid "Open in New _Window"
-msgid_plural "Open in New _Windows"
-msgstr[0] "Åpne i nytt _vindu"
-msgstr[1] "Åpne i nye _vinduer"
-
# (ugh)
-#: ../src/bookmarks/ephy-bookmark-properties.c:225
+#: ../src/bookmarks/ephy-bookmark-properties.c:294
#, c-format
msgid "“%s” Properties"
msgstr "Egenskaper for «%s»"
-#: ../src/bookmarks/ephy-bookmark-properties.c:321
-#: ../src/bookmarks/ephy-new-bookmark.c:231
+#: ../src/bookmarks/ephy-bookmark-properties.c:433
+msgid "Open Icon"
+msgstr "Åpne ikon"
+
+#: ../src/bookmarks/ephy-bookmark-properties.c:506
+msgid "From file..."
+msgstr "Fra fil..."
+
+#: ../src/bookmarks/ephy-bookmark-properties.c:508
+msgid "None"
+msgstr "Ingen"
+
+#: ../src/bookmarks/ephy-bookmark-properties.c:509 ../src/prefs-dialog.c:412
+msgid "Default"
+msgstr "Forvalgt"
+
+#: ../src/bookmarks/ephy-bookmark-properties.c:581
msgid "_Title:"
msgstr "_Tittel:"
-#: ../src/bookmarks/ephy-bookmark-properties.c:363
-#: ../src/bookmarks/ephy-new-bookmark.c:254
-msgid "To_pics:"
+#: ../src/bookmarks/ephy-bookmark-properties.c:604
+msgid "I_con:"
+msgstr "I_kon:"
+
+#: ../src/bookmarks/ephy-bookmark-properties.c:614
+#: ../src/bookmarks/ephy-topics-palette.c:274
+msgid "Subtopics"
+msgstr "Underemner"
+
+#: ../src/bookmarks/ephy-bookmark-properties.c:615
+msgid "T_opics:"
msgstr "Em_ner:"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:134
+#. File Menu
+#: ../src/bookmarks/ephy-bookmark-properties.c:650
+#: ../src/bookmarks/ephy-bookmarks-editor.c:171
+msgid "_New Topic"
+msgstr "_Nytt emne"
+
+#: ../src/bookmarks/ephy-bookmarks-editor.c:135
msgid "Remove from this topic"
msgstr "Fjern fra dette emnet"
#. Toplevel
-#: ../src/bookmarks/ephy-bookmarks-editor.c:163
+#: ../src/bookmarks/ephy-bookmarks-editor.c:164
#: ../src/ephy-history-window.c:163 ../src/ephy-window.c:115
msgid "_File"
msgstr "_Fil"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:164
+#: ../src/bookmarks/ephy-bookmarks-editor.c:165
#: ../src/ephy-history-window.c:164 ../src/ephy-window.c:116
msgid "_Edit"
msgstr "R_ediger"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:165
+#: ../src/bookmarks/ephy-bookmarks-editor.c:166
#: ../src/ephy-history-window.c:165 ../src/ephy-window.c:117
msgid "_View"
msgstr "_Vis"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:166
+#: ../src/bookmarks/ephy-bookmarks-editor.c:167
#: ../src/ephy-history-window.c:166 ../src/ephy-window.c:122
msgid "_Help"
msgstr "_Hjelp"
-#. File Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:170
-#: ../src/bookmarks/ephy-new-bookmark.c:294
-msgid "_New Topic"
-msgstr "_Nytt emne"
-
-#: ../src/bookmarks/ephy-bookmarks-editor.c:171
+#: ../src/bookmarks/ephy-bookmarks-editor.c:172
msgid "Create a new topic"
msgstr "Opprett et nytt emne"
+#. File Menu
#: ../src/bookmarks/ephy-bookmarks-editor.c:174
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1159
+#: ../src/bookmarks/ephy-bookmarks-ui.c:268 ../src/ephy-history-window.c:170
+#: ../src/ephy-history-window.c:696
+msgid "Open in New _Window"
+msgid_plural "Open in New _Windows"
+msgstr[0] "Åpne i nytt _vindu"
+msgstr[1] "Åpne i nye _vinduer"
+
+#: ../src/bookmarks/ephy-bookmarks-editor.c:175
msgid "Open the selected bookmark in a new window"
msgstr "Åpne valgte bokmerker i et nytt vindu"
#: ../src/bookmarks/ephy-bookmarks-editor.c:177
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1162
+#: ../src/bookmarks/ephy-bookmarks-ui.c:257 ../src/ephy-history-window.c:173
+#: ../src/ephy-history-window.c:699
+msgid "Open in New _Tab"
+msgid_plural "Open in New _Tabs"
+msgstr[0] "Åpne i ny _fane"
+msgstr[1] "Åpne i nye _faner"
+
+#: ../src/bookmarks/ephy-bookmarks-editor.c:178
msgid "Open the selected bookmark in a new tab"
msgstr "Åpne valgte bokmerker i en ny fane"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:179
+#: ../src/bookmarks/ephy-bookmarks-editor.c:180
msgid "_Rename..."
msgstr "End_re navn..."
-#: ../src/bookmarks/ephy-bookmarks-editor.c:180
+#: ../src/bookmarks/ephy-bookmarks-editor.c:181
msgid "Rename the selected bookmark or topic"
msgstr "Endre navn på valgt bokmerke eller emne"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:181
+#: ../src/bookmarks/ephy-bookmarks-editor.c:182
#: ../src/ephy-history-window.c:176
msgid "_Delete"
msgstr "_Slett"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:182
+#: ../src/bookmarks/ephy-bookmarks-editor.c:183
msgid "Delete the selected bookmark or topic"
msgstr "Slett valgt bokmerke eller emne"
# (ugh)
-#: ../src/bookmarks/ephy-bookmarks-editor.c:184
+#: ../src/bookmarks/ephy-bookmarks-editor.c:185
msgid "_Properties"
msgstr "Egenska_per"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:185
+#: ../src/bookmarks/ephy-bookmarks-editor.c:186
msgid "View or modify the properties of the selected bookmark"
msgstr "Vis eller endre egenskaper for valgt bokmerke"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:187
+#: ../src/bookmarks/ephy-bookmarks-editor.c:188
msgid "_Import Bookmarks..."
msgstr "_Importer bokmerker..."
-#: ../src/bookmarks/ephy-bookmarks-editor.c:188
+#: ../src/bookmarks/ephy-bookmarks-editor.c:189
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:190
+#: ../src/bookmarks/ephy-bookmarks-editor.c:191
msgid "_Export Bookmarks..."
msgstr "_Eksporter bokmerker..."
-#: ../src/bookmarks/ephy-bookmarks-editor.c:191
+#: ../src/bookmarks/ephy-bookmarks-editor.c:192
msgid "Export bookmarks to a file"
msgstr "Eksporter bokmerker til en fil"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:193
+#: ../src/bookmarks/ephy-bookmarks-editor.c:194
#: ../src/ephy-history-window.c:182 ../src/ephy-window.c:152
msgid "_Close"
msgstr "L_ukk"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:194
+#: ../src/bookmarks/ephy-bookmarks-editor.c:195
msgid "Close the bookmarks window"
msgstr "Lukk bokmerkevinduet"
#. Edit Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:198
+#: ../src/bookmarks/ephy-bookmarks-editor.c:199
#: ../src/ephy-history-window.c:187 ../src/ephy-window.c:164
msgid "Cu_t"
msgstr "Klipp u_t"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:199
+#: ../src/bookmarks/ephy-bookmarks-editor.c:200
#: ../src/ephy-history-window.c:188 ../src/ephy-window.c:165
msgid "Cut the selection"
msgstr "Klipp ut utvalget"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:201
+#: ../src/bookmarks/ephy-bookmarks-editor.c:202
#: ../src/bookmarks/ephy-bookmarks-editor.c:1172
-#: ../src/ephy-history-window.c:190 ../src/ephy-history-window.c:721
+#: ../src/ephy-history-window.c:190 ../src/ephy-history-window.c:709
#: ../src/ephy-window.c:167
msgid "_Copy"
msgstr "_Kopier"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:202
+#: ../src/bookmarks/ephy-bookmarks-editor.c:203
#: ../src/ephy-history-window.c:191 ../src/ephy-window.c:168
msgid "Copy the selection"
msgstr "Kopier utvalget"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:204
+#: ../src/bookmarks/ephy-bookmarks-editor.c:205
#: ../src/ephy-history-window.c:193 ../src/ephy-window.c:170
msgid "_Paste"
msgstr "Li_m inn"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:205
+#: ../src/bookmarks/ephy-bookmarks-editor.c:206
#: ../src/ephy-history-window.c:194
msgid "Paste the clipboard"
msgstr "Lim inn utklippstavlen"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:207
+#: ../src/bookmarks/ephy-bookmarks-editor.c:208
#: ../src/ephy-history-window.c:196 ../src/ephy-window.c:173
msgid "Select _All"
msgstr "Velg _alt"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:208
+#: ../src/bookmarks/ephy-bookmarks-editor.c:209
msgid "Select all bookmarks or text"
msgstr "Velg alle bokmerker eller all tekst"
#. Help Menu
#. Help menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:212
+#: ../src/bookmarks/ephy-bookmarks-editor.c:213
#: ../src/ephy-history-window.c:204 ../src/ephy-window.c:264
msgid "_Contents"
msgstr "_Innhold"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:213
+#: ../src/bookmarks/ephy-bookmarks-editor.c:214
msgid "Display bookmarks help"
msgstr "Vis hjelp for bokmerker"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:215
+#: ../src/bookmarks/ephy-bookmarks-editor.c:216
#: ../src/ephy-history-window.c:207 ../src/ephy-window.c:267
msgid "_About"
msgstr "_Om"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:216
+#: ../src/bookmarks/ephy-bookmarks-editor.c:217
#: ../src/ephy-history-window.c:208 ../src/ephy-window.c:268
msgid "Display credits for the web browser creators"
msgstr "Vis kreditering for skaperene av nettleseren"
#. View Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:229
+#: ../src/bookmarks/ephy-bookmarks-editor.c:230
#: ../src/ephy-history-window.c:222
msgid "_Title"
msgstr "_Tittel"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:230
+#: ../src/bookmarks/ephy-bookmarks-editor.c:231
#: ../src/ephy-history-window.c:223
msgid "Show only the title column"
msgstr "Vis kun tittelkolonnen"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:231
+#: ../src/bookmarks/ephy-bookmarks-editor.c:232
#: ../src/ephy-history-window.c:226
msgid "T_itle and Address"
msgstr "T_ittel og adresse"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:232
+#: ../src/bookmarks/ephy-bookmarks-editor.c:233
#: ../src/ephy-history-window.c:227
msgid "Show both the title and address columns"
msgstr "Vis både tittel- og adressekolonnene"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:273
-#: ../src/bookmarks/ephy-topics-selector.c:319
+#: ../src/bookmarks/ephy-bookmarks-editor.c:274
msgid "Type a topic"
msgstr "Skriv et emne"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:391
+#: ../src/bookmarks/ephy-bookmarks-editor.c:392
#, c-format
msgid "Delete topic “%s”?"
msgstr "Slett emne «%s»?"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:394
+#: ../src/bookmarks/ephy-bookmarks-editor.c:395
msgid "Delete this topic?"
msgstr "Slett dette emnet?"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:396
+#: ../src/bookmarks/ephy-bookmarks-editor.c:397
msgid ""
"Deleting this topic will cause all its bookmarks to become uncategorized, "
"unless they also belong to other topics. The bookmarks will not be deleted."
@@ -2543,7 +2611,7 @@ msgstr ""
"kategorisering, med mindre de tilhører andre emner også. Bokmerkene vil ikke "
"bli slettet."
-#: ../src/bookmarks/ephy-bookmarks-editor.c:399
+#: ../src/bookmarks/ephy-bookmarks-editor.c:400
msgid "_Delete Topic"
msgstr "_Slett emne"
@@ -2633,27 +2701,26 @@ msgid "Import bookmarks from:"
msgstr "Importer bokmerker fra:"
#: ../src/bookmarks/ephy-bookmarks-editor.c:1168
-#: ../src/ephy-history-window.c:717
+#: ../src/ephy-history-window.c:705
msgid "_Copy Address"
msgstr "_Kopier adresse"
#: ../src/bookmarks/ephy-bookmarks-editor.c:1402
-#: ../src/ephy-history-window.c:1033
+#: ../src/ephy-history-window.c:1021
msgid "_Search:"
msgstr "_Søk:"
#: ../src/bookmarks/ephy-bookmarks-editor.c:1597
-#: ../src/bookmarks/ephy-topics-selector.c:198
msgid "Topics"
msgstr "Emner"
#: ../src/bookmarks/ephy-bookmarks-editor.c:1667
-#: ../src/ephy-history-window.c:1316
+#: ../src/ephy-history-window.c:1304
msgid "Title"
msgstr "Tittel"
#: ../src/bookmarks/ephy-bookmarks-editor.c:1673
-#: ../src/ephy-history-window.c:1322
+#: ../src/ephy-history-window.c:1310
msgid "Address"
msgstr "Adresse"
@@ -2661,81 +2728,81 @@ msgstr "Adresse"
#. * For instance in .nl these should be
#. * "http://www.google.nl" and "http://www.google.nl/search?q=%s"
#.
-#: ../src/bookmarks/ephy-bookmarks.c:96
+#: ../src/bookmarks/ephy-bookmarks.c:95
msgid "Search the web"
msgstr "Søk på nettet"
-#: ../src/bookmarks/ephy-bookmarks.c:96
+#: ../src/bookmarks/ephy-bookmarks.c:95
#, c-format
msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8"
msgstr "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8"
-#: ../src/bookmarks/ephy-bookmarks.c:101
+#: ../src/bookmarks/ephy-bookmarks.c:100
msgid "Entertainment"
msgstr "Underholdning"
-#: ../src/bookmarks/ephy-bookmarks.c:102
+#: ../src/bookmarks/ephy-bookmarks.c:101
msgid "News"
msgstr "Nyheter"
-#: ../src/bookmarks/ephy-bookmarks.c:103
+#: ../src/bookmarks/ephy-bookmarks.c:102
msgid "Shopping"
msgstr "Innkjøp"
-#: ../src/bookmarks/ephy-bookmarks.c:104
+#: ../src/bookmarks/ephy-bookmarks.c:103
msgid "Sports"
msgstr "Sport"
-#: ../src/bookmarks/ephy-bookmarks.c:105
+#: ../src/bookmarks/ephy-bookmarks.c:104
msgid "Travel"
msgstr "Reiser"
-#: ../src/bookmarks/ephy-bookmarks.c:106
+#: ../src/bookmarks/ephy-bookmarks.c:105
msgid "Work"
msgstr "Arbeid"
#. translators: the %s is the title of the bookmark
-#: ../src/bookmarks/ephy-bookmarks.c:471
+#: ../src/bookmarks/ephy-bookmarks.c:470
#, c-format
msgid "Update bookmark “%s”?"
msgstr "Oppdater bokmerke «%s»?"
#. translators: the %s is a URL
-#: ../src/bookmarks/ephy-bookmarks.c:476
+#: ../src/bookmarks/ephy-bookmarks.c:475
#, c-format
msgid "The bookmarked page has moved to “%s”."
msgstr "Siden bokmerket peker til er flyttet til «%s»."
-#: ../src/bookmarks/ephy-bookmarks.c:480
+#: ../src/bookmarks/ephy-bookmarks.c:479
msgid "_Don't Update"
msgstr "_Ikke oppdater"
-#: ../src/bookmarks/ephy-bookmarks.c:482
+#: ../src/bookmarks/ephy-bookmarks.c:481
msgid "_Update"
msgstr "_Oppdater"
-#: ../src/bookmarks/ephy-bookmarks.c:485
+#: ../src/bookmarks/ephy-bookmarks.c:484
msgid "Update Bookmark?"
msgstr "Oppdater bokmerke?"
#. Translators: The text before the "|" is context to help you decide on
#. * the correct translation. You MUST OMIT it in the translated string.
#. Translators: this topic contains all bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:873
+#: ../src/bookmarks/ephy-bookmarks.c:869
msgid "bookmarks|All"
msgstr "Alle"
#. Translators: The text before the "|" is context to help you decide on
#. * the correct translation. You MUST OMIT it in the translated string.
#. Translators: this topic contains the most used bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:909
+#: ../src/bookmarks/ephy-bookmarks.c:905
msgid "bookmarks|Most Visited"
msgstr "Oftest besøkt"
#. Translators: The text before the "|" is context to help you decide on
#. * the correct translation. You MUST OMIT it in the translated string.
#. Translators: this topic contains the not categorized bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:928
+#: ../src/bookmarks/ephy-bookmarks.c:924
msgid "bookmarks|Not Categorized"
msgstr "Ikke kategorisert"
@@ -2743,31 +2810,83 @@ msgstr "Ikke kategorisert"
#. * the correct translation. You MUST OMIT it in the translated string.
#. Translators: this is an automatic topic containing local websites bookmarks
#. * autodiscovered with zeroconf.
-#: ../src/bookmarks/ephy-bookmarks.c:953
+#: ../src/bookmarks/ephy-bookmarks.c:949
msgid "bookmarks|Local Sites"
msgstr "bokmerker"
-#: ../src/bookmarks/ephy-new-bookmark.c:275
-msgid "Add Bookmark"
-msgstr "Legg til bokmerke"
+#: ../src/bookmarks/ephy-bookmark-factory-action.c:316
+msgid "Quick Bookmark"
+msgstr "Hurtigbokmerke"
+
+# (ugh)
+#. Add popup menu actions that are specific to the bookmark widgets
+#: ../src/bookmarks/ephy-bookmarks-ui.c:246
+msgid "Properties"
+msgstr "Egenskaper"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:247
+msgid "Show properties for this bookmark"
+msgstr "Vis egenskaper for dette bokmerket"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:258
+msgid "Open this bookmark in a new tab"
+msgstr "Åpne dette bokmerket i en ny fane"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:269
+msgid "Open this bookmark in a new window"
+msgstr "Åpne dette bokmerket i et nytt vindu"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:453
+msgid "Bookmark exists"
+msgstr "Bokmerke eksisterer"
-#: ../src/bookmarks/ephy-new-bookmark.c:312
+#: ../src/bookmarks/ephy-bookmarks-ui.c:456
#, c-format
msgid "You already have a bookmark titled “%s” for this page."
msgstr "Du har allerede et bokmerke med tittel «%s» for denne siden."
+#: ../src/bookmarks/ephy-bookmarks-ui.c:466
+msgid "_Create New"
+msgstr "_Opprett nytt"
+
# (ugh)
-#: ../src/bookmarks/ephy-new-bookmark.c:324
+#: ../src/bookmarks/ephy-bookmarks-ui.c:472
msgid "_View Properties"
msgstr "_Vis egenskaper"
-#: ../src/bookmarks/ephy-new-bookmark.c:329
-msgid "Duplicated Bookmark"
-msgstr "Duplisert bokmerke"
+#: ../src/bookmarks/ephy-bookmarks-ui.c:481
+msgid "Bookmark Exists"
+msgstr "Bokmerke eksisterer"
-#: ../src/bookmarks/ephy-bookmark-factory-action.c:316
-msgid "Quick Bookmark"
-msgstr "Hurtigbokmerke"
+#: ../src/bookmarks/ephy-bookmarks-ui.c:569
+#, c-format
+msgid ""
+"You already have a topic named “%s”.\n"
+"Please use a new topic name."
+msgstr ""
+"Du har allerede et emne med navn «%s».\n"
+"Vennligst bruk et nytt emnenavn."
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:610
+#, c-format
+msgid "New topic for “%s”"
+msgstr "Nytt emne for «%s»"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:624
+msgid "New topic"
+msgstr "Nytt emne"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:628
+msgid "Enter a unique name for the topic."
+msgstr "Oppgi et unikt navn for emnet."
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:660
+msgid "Create"
+msgstr "Opprett"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:663
+msgid "New Topic"
+msgstr "Nytt emne"
#: ../src/bookmarks/ephy-open-tabs-action.c:64
msgid "Open in New _Tabs"
@@ -2781,6 +2900,30 @@ msgstr "Relatert"
msgid "Quick Topic"
msgstr "Hurtigemne"
+#: ../src/bookmarks/ephy-topics-palette.c:203
+msgid "No topics"
+msgstr "Ingen emner"
+
+#: ../src/bookmarks/ephy-topics-palette.c:273
+msgid "Selection"
+msgstr "Utvalg"
+
+#: ../src/bookmarks/ephy-topics-palette.c:273
+msgid "No selected topics"
+msgstr "Ingen emner valgt"
+
+#: ../src/bookmarks/ephy-topics-palette.c:274
+msgid "No more subtopics"
+msgstr "Ingen flere underemner"
+
+#: ../src/bookmarks/ephy-topics-palette.c:275
+msgid "Other"
+msgstr "Andre"
+
+#: ../src/bookmarks/ephy-topics-palette.c:275
+msgid "No other topics"
+msgstr "Ingen andre emner"
+
#: ../src/ephy-encoding-dialog.c:340
msgid "Encodings"
msgstr "Kodinger"
@@ -2805,23 +2948,27 @@ msgstr "Ikke funnet"
msgid "Wrapped"
msgstr "Brutt"
-#: ../src/ephy-find-toolbar.c:388
+#: ../src/ephy-find-toolbar.c:151
+msgid "Find links:"
+msgstr "Finn lenker:"
+
+#: ../src/ephy-find-toolbar.c:151
msgid "Find:"
msgstr "Finn:"
-#: ../src/ephy-find-toolbar.c:404 ../src/ephy-find-toolbar.c:405
+#: ../src/ephy-find-toolbar.c:399
msgid "Find Previous"
msgstr "Finn forrige"
-#: ../src/ephy-find-toolbar.c:408
+#: ../src/ephy-find-toolbar.c:402
msgid "Find previous occurrence of the search string"
msgstr "Finn forrige oppføring av søketeksten"
-#: ../src/ephy-find-toolbar.c:415 ../src/ephy-find-toolbar.c:416
+#: ../src/ephy-find-toolbar.c:409
msgid "Find Next"
msgstr "Finn neste"
-#: ../src/ephy-find-toolbar.c:419
+#: ../src/ephy-find-toolbar.c:412
msgid "Find next occurrence of the search string"
msgstr "Finn neste oppføring av søketeksten"
@@ -2896,60 +3043,60 @@ msgstr "Tømming av historikken vil fjerne alle lenker permanent."
msgid "Clear History"
msgstr "Tøm historikk"
-#: ../src/ephy-history-window.c:1042
+#: ../src/ephy-history-window.c:1030
msgid "Last 30 minutes"
msgstr "Siste 30 minutter"
-#: ../src/ephy-history-window.c:1043
+#: ../src/ephy-history-window.c:1031
msgid "Today"
msgstr "I dag"
#. keep this in sync with embed/ephy-history.c's HISTORY_PAGE_OBSOLETE_DAYS
-#: ../src/ephy-history-window.c:1044 ../src/ephy-history-window.c:1047
-#: ../src/ephy-history-window.c:1051
+#: ../src/ephy-history-window.c:1032 ../src/ephy-history-window.c:1035
+#: ../src/ephy-history-window.c:1039
#, c-format
msgid "Last %d day"
msgid_plural "Last %d days"
msgstr[0] "Siste %d dag"
msgstr[1] "Siste %d dager"
-#: ../src/ephy-history-window.c:1253
+#: ../src/ephy-history-window.c:1241
msgid "Sites"
msgstr "Nettsteder"
-#: ../src/ephy-main.c:59
+#: ../src/ephy-main.c:60
msgid "Open a new tab in an existing window"
msgstr "Åpne en ny fane i et eksisterende vindu"
-#: ../src/ephy-main.c:62
+#: ../src/ephy-main.c:63
msgid "Run in full screen mode"
msgstr "Kjør i fullskjermmodus"
-#: ../src/ephy-main.c:65
+#: ../src/ephy-main.c:66
msgid "Load the given session file"
msgstr "Last oppgitt sesjonsfil"
-#: ../src/ephy-main.c:66 ../src/ephy-main.c:72
+#: ../src/ephy-main.c:67 ../src/ephy-main.c:73
msgid "FILE"
msgstr "FIL"
-#: ../src/ephy-main.c:68
+#: ../src/ephy-main.c:69
msgid "Add a bookmark (don't open any window)"
msgstr "Legg til bokmerke (ikke åpne noen vinduer)"
-#: ../src/ephy-main.c:69
+#: ../src/ephy-main.c:70
msgid "URL"
msgstr "Adresse"
-#: ../src/ephy-main.c:71
+#: ../src/ephy-main.c:72
msgid "Import bookmarks from the given file"
msgstr "Importer bokmerker fra gitt fil"
-#: ../src/ephy-main.c:74
+#: ../src/ephy-main.c:75
msgid "Launch the bookmarks editor"
msgstr "Start redigering av bokmerker"
-#: ../src/ephy-notebook.c:1086
+#: ../src/ephy-notebook.c:1092
msgid "Close tab"
msgstr "Lukk fane"
@@ -2977,43 +3124,18 @@ msgstr "_Gjenopprett"
msgid "Crash Recovery"
msgstr "Krasjsikring"
-#: ../src/ephy-shell.c:217
+#: ../src/ephy-shell.c:216
msgid "Sidebar extension required"
msgstr "Sidelinjetillegg krevves"
-#: ../src/ephy-shell.c:219
+#: ../src/ephy-shell.c:218
msgid "Sidebar Extension Required"
msgstr "Sidelinjetillegg kreves"
-#: ../src/ephy-shell.c:223
+#: ../src/ephy-shell.c:222
msgid "The link you clicked needs the sidebar extension to be installed."
msgstr "Lenken du klikket på krever at sidelinjetillegget er installert."
-#: ../src/ephy-shell.c:453
-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 "
-"files."
-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:460
-msgid ""
-"Epiphany can't be used now, due to an unexpected error from Bonobo when "
-"attempting to register the automation server"
-msgstr ""
-"Epiphany kan ikke brukes nå pga en uvetet feil fra Bonobo ved forsøk på å "
-"registrere automasjonstjeneren"
-
-#: ../src/ephy-shell.c:477
-msgid ""
-"Epiphany can't be used now, due to an unexpected error from Bonobo when "
-"attempting to locate the automation object."
-msgstr ""
-"Epiphany kan ikke brukes nå pga en uventet feil fra Bonobo ved forsøk på å "
-"laste automasjonsobjektet."
-
#: ../src/ephy-tab.c:481 ../src/ephy-tab.c:2264 ../src/ephy-tab.c:2299
msgid "Blank page"
msgstr "Tom side"
@@ -3570,103 +3692,121 @@ msgstr "Br_uk bilde som bakgrunn"
msgid "Copy I_mage Address"
msgstr "Ko_pier adressen til bildet"
-#: ../src/ephy-window.c:701
+#: ../src/ephy-window.c:351
+msgid "St_art Animation"
+msgstr "St_art animasjon"
+
+#: ../src/ephy-window.c:353
+msgid "St_op Animation"
+msgstr "St_opp animasjon"
+
+#: ../src/ephy-window.c:707
msgid "There are unsubmitted changes to form elements"
msgstr "Det finnes endringer i skjemaet som ikke er sendt"
-#: ../src/ephy-window.c:705
+#: ../src/ephy-window.c:711
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:709
+#: ../src/ephy-window.c:715
msgid "Close _Document"
msgstr "Lukk _dokument"
-#: ../src/ephy-window.c:1276 ../src/window-commands.c:295
+#: ../src/ephy-window.c:1285 ../src/window-commands.c:279
msgid "Open"
msgstr "Åpne"
-#: ../src/ephy-window.c:1278 ../src/window-commands.c:321
+#: ../src/ephy-window.c:1287 ../src/window-commands.c:305
msgid "Save As"
msgstr "Lagre som"
-#: ../src/ephy-window.c:1282
+#: ../src/ephy-window.c:1291
msgid "Bookmark"
msgstr "Bokmerke"
-#: ../src/ephy-window.c:1284
+#: ../src/ephy-window.c:1293
msgid "Find"
msgstr "Finn"
-#: ../src/ephy-window.c:1457
+#. Translators: This refers to text size
+#: ../src/ephy-window.c:1306
+msgid "Larger"
+msgstr "Større"
+
+#. Translators: This refers to text size
+#: ../src/ephy-window.c:1309
+msgid "Smaller"
+msgstr "Mindre"
+
+#: ../src/ephy-window.c:1472
msgid "Insecure"
msgstr "Usikker"
-#: ../src/ephy-window.c:1462
+#: ../src/ephy-window.c:1477
msgid "Broken"
msgstr "Ødelagt"
-#: ../src/ephy-window.c:1475
+#: ../src/ephy-window.c:1490
msgid "Low"
msgstr "Lav"
-#: ../src/ephy-window.c:1482
+#: ../src/ephy-window.c:1497
msgid "High"
msgstr "Høy"
-#: ../src/ephy-window.c:1492
+#: ../src/ephy-window.c:1507
#, c-format
msgid "Security level: %s"
msgstr "Sikkerhetsnivå: %s"
-#: ../src/ephy-window.c:1532
+#: ../src/ephy-window.c:1547
#, c-format
msgid "%d hidden popup window"
msgid_plural "%d hidden popup windows"
msgstr[0] "%d skjult sprettoppvindu"
msgstr[1] "%d skjulte sprettoppvinduer"
-#: ../src/ephy-window.c:1827
+#: ../src/ephy-window.c:1842
#, c-format
msgid "Open image “%s”"
msgstr "Åpne bilde «%s»"
-#: ../src/ephy-window.c:1832
+#: ../src/ephy-window.c:1847
#, c-format
msgid "Use as desktop background “%s”"
msgstr "Bruk som bakgrunn på skrivebordet «%s»"
-#: ../src/ephy-window.c:1837
+#: ../src/ephy-window.c:1852
#, c-format
msgid "Save image “%s”"
msgstr "Lagre bilde «%s»"
-#: ../src/ephy-window.c:1842
+#: ../src/ephy-window.c:1857
#, c-format
msgid "Copy image address “%s”"
msgstr "Kopier adressen til bildet «%s»"
-#: ../src/ephy-window.c:1855
+#: ../src/ephy-window.c:1870
#, c-format
msgid "Send email to address “%s”"
msgstr "Send e-post til adresse «%s»"
-#: ../src/ephy-window.c:1861
+#: ../src/ephy-window.c:1876
#, c-format
msgid "Copy email address “%s”"
msgstr "Kopier e-postadresse «%s»"
-#: ../src/ephy-window.c:1873
+#: ../src/ephy-window.c:1888
#, c-format
msgid "Save link “%s”"
msgstr "Lagre lenke «%s»"
-#: ../src/ephy-window.c:1879
+#: ../src/ephy-window.c:1894
#, c-format
msgid "Bookmark link “%s”"
msgstr "Lag bokmerke av lenke «%s»"
-#: ../src/ephy-window.c:1885
+#: ../src/ephy-window.c:1900
#, c-format
msgid "Copy link's address “%s”"
msgstr "Kopier lenkens adresse «%s»"
@@ -3724,15 +3864,15 @@ msgstr "Brukernavn"
msgid "User Password"
msgstr "Brukerpassord"
-#: ../src/popup-commands.c:239
+#: ../src/popup-commands.c:232
msgid "Download Link"
msgstr "Last ned lenke"
-#: ../src/popup-commands.c:247
+#: ../src/popup-commands.c:240
msgid "Save Link As"
msgstr "Lagre lenke som"
-#: ../src/popup-commands.c:254
+#: ../src/popup-commands.c:247
msgid "Save Image As"
msgstr "Lagre bilde som"
@@ -3784,7 +3924,7 @@ msgstr "Lukk forhåndsvisning av utskrift"
#.
#. Translators: The text before the "|" is context to help you decide on
#. * the correct translation. You MUST OMIT it in the translated string.
-#: ../src/prefs-dialog.c:729 ../src/prefs-dialog.c:737
+#: ../src/prefs-dialog.c:993 ../src/prefs-dialog.c:1001
#, c-format
msgid "language|%s (%s)"
msgstr "%s (%s)"
@@ -3794,39 +3934,39 @@ msgstr "%s (%s)"
#. * Translators: this refers to a user-define language code
#. * (one which isn't in our built-in list).
#.
-#: ../src/prefs-dialog.c:748
+#: ../src/prefs-dialog.c:1012
#, c-format
msgid "language|User defined (%s)"
msgstr "Brukerdefinert (%s)"
-#: ../src/prefs-dialog.c:770
+#: ../src/prefs-dialog.c:1034
#, c-format
msgid "System language (%s)"
msgid_plural "System languages (%s)"
msgstr[0] "Systemspråk [%s]"
msgstr[1] "Systemspråk [%s]"
-#: ../src/prefs-dialog.c:1157
+#: ../src/prefs-dialog.c:1421
msgid "Select a Directory"
msgstr "Velg en katalog"
-#: ../src/window-commands.c:726 ../src/window-commands.c:743
+#: ../src/window-commands.c:710 ../src/window-commands.c:727
msgid "Contact us at:"
msgstr "Kontakt oss her:"
-#: ../src/window-commands.c:729
+#: ../src/window-commands.c:713
msgid "Contributors:"
msgstr "Bidragsytere:"
-#: ../src/window-commands.c:734
+#: ../src/window-commands.c:718
msgid "Past developers:"
msgstr "Tidligere utviklere:"
-#: ../src/window-commands.c:744
+#: ../src/window-commands.c:728
msgid "<epiphany-list@gnome.org> or <gnome-doc-list@gnome.org>"
msgstr "<epiphany-list@gnome.org> eller <gnome-doc-list@gnome.org>"
-#: ../src/window-commands.c:749
+#: ../src/window-commands.c:733
msgid "GNOME Web Browser"
msgstr "GNOME Nettleser"
@@ -3838,10 +3978,10 @@ msgstr "GNOME Nettleser"
#. * this translation; in that case, please write each of them on a separate
#. * line seperated by newlines (\n).
#.
-#: ../src/window-commands.c:763
+#: ../src/window-commands.c:747
msgid "translator-credits"
msgstr "Kjartan Maraas <kmaraas@gnome.org>"
-#: ../src/window-commands.c:766
+#: ../src/window-commands.c:750
msgid "GNOME Web Browser Website"
msgstr "Nettsted for GNOME Nettleser"
diff --git a/po/no.po b/po/no.po
index c9ac07b84..0923ae541 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,15 +1,15 @@
# Norwegian bokmål translation of Epiphany
# Copyright (C) 2000-2003, 2005 Free Software Foundation, Inc.
# Ola Sverre Bauge <osb@plover.net>, 2000.
-# Kjartan Maraas <kmaraas@gnome.org>, 2000-2005.
+# Kjartan Maraas <kmaraas@gnome.org>, 2000-2006.
# Roy-Magne Mo <rmo@sunnmore.net>, 2001.
# Terance Edward Sola <terance@lyse.net>, 2005.
msgid ""
msgstr ""
-"Project-Id-Version: epiphany 1.8.x\n"
+"Project-Id-Version: epiphany 1.9.x\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-02 00:39+0100\n"
-"PO-Revision-Date: 2006-01-02 00:40+0100\n"
+"POT-Creation-Date: 2006-01-19 14:09+0100\n"
+"PO-Revision-Date: 2006-01-19 14:14+0100\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,6 @@ msgstr ""
"Content-Transfer-Encoding: 8Bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../data/GNOME_Epiphany_Automation.server.in.h:1
-msgid "Epiphany automation"
-msgstr "Epiphany automatisering"
-
#: ../data/epiphany-lockdown.schemas.in.h:1
msgid ""
"A list of protocols to be considered safe in addition to the default, when "
@@ -136,8 +132,8 @@ msgid "Epiphany Web Browser"
msgstr "Epiphany nettleser"
#. sets the name to appear in the window list applet when grouping windows
-#: ../data/epiphany.desktop.in.in.h:3 ../src/ephy-main.c:222
-#: ../src/ephy-main.c:233
+#: ../data/epiphany.desktop.in.in.h:3 ../src/ephy-main.c:223
+#: ../src/ephy-main.c:234
msgid "Web Browser"
msgstr "Nettleser"
@@ -252,28 +248,38 @@ msgid "Home page"
msgstr "Hjemmeside"
#: ../data/epiphany.schemas.in.h:19
+msgid ""
+"How to present animated images. Possible values are \"normal\", \"once\" and "
+"\"disabled\"."
+msgstr "Presentasjon av animerte bilder. Mulige verdier er «normal», «once», og «disabled»."
+
+#: ../data/epiphany.schemas.in.h:20
msgid "ISO-8859-1"
msgstr "ISO-8859-1"
-#: ../data/epiphany.schemas.in.h:20
+#: ../data/epiphany.schemas.in.h:21
+msgid "Image animation mode"
+msgstr "Modus for animasjon av bilder"
+
+#: ../data/epiphany.schemas.in.h:22
msgid "Languages"
msgstr "Språk"
-#: ../data/epiphany.schemas.in.h:21
+#: ../data/epiphany.schemas.in.h:23
msgid "Lists the active extensions."
msgstr "Viser aktive utvidelser."
-#: ../data/epiphany.schemas.in.h:22
+#: ../data/epiphany.schemas.in.h:24
msgid "Match case for find in page"
msgstr "Skill mellom store og små bokstaver for søk på siden"
-#: ../data/epiphany.schemas.in.h:23
+#: ../data/epiphany.schemas.in.h:25
msgid ""
"Middle click to open the web page pointed to by the currently selected text"
msgstr ""
"Klikk på midterste knapp for å åpne nettsiden som pekes til av valgt tekst"
-#: ../data/epiphany.schemas.in.h:24
+#: ../data/epiphany.schemas.in.h:26
msgid ""
"Middle clicking on the main view pane will open the web page pointed to by "
"the currently selected text."
@@ -281,19 +287,23 @@ msgstr ""
"Klikk på midterste knapp i hovedvisningsområdet vil åpne nettsiden som pekes "
"til av valgt tekst."
-#: ../data/epiphany.schemas.in.h:25
+#: ../data/epiphany.schemas.in.h:27
+msgid "Minimum font size"
+msgstr "Minste skriftstørrelse"
+
+#: ../data/epiphany.schemas.in.h:28
msgid "Preferred languages, two letter codes."
msgstr "Foretrukne språk. Tobokstavskoder."
-#: ../data/epiphany.schemas.in.h:26
+#: ../data/epiphany.schemas.in.h:29
msgid "Show bookmarks bar by default"
msgstr "Vis bokmerkelinje som forvalg"
-#: ../data/epiphany.schemas.in.h:27
+#: ../data/epiphany.schemas.in.h:30
msgid "Show statusbar by default"
msgstr "Vis statuslinje som forvalg"
-#: ../data/epiphany.schemas.in.h:28
+#: ../data/epiphany.schemas.in.h:31
msgid ""
"Show the history pages visited \"ever\", \"last_two_days\", \"last_three_days"
"\", \"today\"."
@@ -301,27 +311,27 @@ msgstr ""
"Vis historikk for sider besøkt, «ever», «last_two_days», «last_three_days», "
"«today»."
-#: ../data/epiphany.schemas.in.h:29
+#: ../data/epiphany.schemas.in.h:32
msgid "Show the tab bar also when there is only one tab open."
msgstr "Vis fanelinjen også når kun en fane er åpen."
-#: ../data/epiphany.schemas.in.h:30
+#: ../data/epiphany.schemas.in.h:33
msgid "Show toolbars by default"
msgstr "Vis verktøylinjer som forvalg"
-#: ../data/epiphany.schemas.in.h:31
+#: ../data/epiphany.schemas.in.h:34
msgid "Size of disk cache"
msgstr "Størrelse på diskbuffer"
-#: ../data/epiphany.schemas.in.h:32
+#: ../data/epiphany.schemas.in.h:35
msgid "Size of disk cache, in MB."
msgstr "Størrelse på diskbuffer i MB."
-#: ../data/epiphany.schemas.in.h:33
+#: ../data/epiphany.schemas.in.h:36
msgid "The bookmark information shown in the editor view"
msgstr "Bokmerkeinformasjon som vises i redigeringsvisning"
-#: ../data/epiphany.schemas.in.h:34
+#: ../data/epiphany.schemas.in.h:37
msgid ""
"The bookmark information shown in the editor view. Valid values in the list "
"are \"address\" and \"title\"."
@@ -329,11 +339,11 @@ msgstr ""
"Bokmerkeinformasjon som vises i redigeringsvisning. Gyldige verdier i listen "
"er «address» og «title»."
-#: ../data/epiphany.schemas.in.h:35
+#: ../data/epiphany.schemas.in.h:38
msgid "The currently selected fonts language"
msgstr "Valgt skriftspråk"
-#: ../data/epiphany.schemas.in.h:36
+#: ../data/epiphany.schemas.in.h:39
msgid ""
"The currently selected fonts language. Valid values are \"ar\" (arabic), \"x-"
"baltic\" (baltic languages), \"x-central-euro\" (central european "
@@ -352,15 +362,15 @@ msgstr ""
"western» (språk som skrives med de latinske alfabet), «x-tamil» (tamil) og "
"«x-devangari» (devangari»."
-#: ../data/epiphany.schemas.in.h:37
+#: ../data/epiphany.schemas.in.h:40
msgid "The downloads folder"
msgstr "Nedlastingsmappe"
-#: ../data/epiphany.schemas.in.h:38
+#: ../data/epiphany.schemas.in.h:41
msgid "The encoding autodetector. Empty string means autodetect is off"
msgstr "Automatisk gjenkjenning av tegnsett. Av når strengen er tom"
-#: ../data/epiphany.schemas.in.h:39
+#: ../data/epiphany.schemas.in.h:42
msgid ""
"The encoding autodetector. Valid entries are \"\" (autodetectors off), "
"\"cjk_parallel_state_machine\" (autodetect east asian encodings), "
@@ -382,11 +392,11 @@ msgstr ""
"kinesisk), «universal_charset_detector» (automatisk gjenkjenning av de "
"fleste kodinger)."
-#: ../data/epiphany.schemas.in.h:40
+#: ../data/epiphany.schemas.in.h:43
msgid "The page information shown in the history view"
msgstr "Sideinformasjon som vises i historikkvisning"
-#: ../data/epiphany.schemas.in.h:41
+#: ../data/epiphany.schemas.in.h:44
msgid ""
"The page information shown in the history view. Valid values in the list are "
"\"address\", \"title\"."
@@ -394,7 +404,7 @@ msgstr ""
"Sideinformasjon som vises i historikkvisning. Gyldige verdier i listen er "
"«address» og «title»."
-#: ../data/epiphany.schemas.in.h:42
+#: ../data/epiphany.schemas.in.h:45
msgid ""
"The path of the folder where to download files to; or \"Downloads\" to use "
"the default downloads folder, or \"Desktop\" to use the desktop folder."
@@ -403,11 +413,11 @@ msgstr ""
"å bruke den forvalgte nedlastningsmappen, eller «Desktop» for å bruke "
"skrivebordsmappen."
-#: ../data/epiphany.schemas.in.h:43
+#: ../data/epiphany.schemas.in.h:46
msgid "Toolbar style"
msgstr "Stil for verktøylinje"
-#: ../data/epiphany.schemas.in.h:44
+#: ../data/epiphany.schemas.in.h:47
msgid ""
"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both"
"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and "
@@ -416,23 +426,23 @@ msgstr ""
"Stil for verktøylinje. Tillatte verdier er «» (bruk forvalg), «both» (tekst "
"og ikoner), «both-horiz» (tekst ved siden av ikoner), «icons» og «text»."
-#: ../data/epiphany.schemas.in.h:45
+#: ../data/epiphany.schemas.in.h:48
msgid "Use own colors"
msgstr "Bruk egne farger"
-#: ../data/epiphany.schemas.in.h:46
+#: ../data/epiphany.schemas.in.h:49
msgid "Use own fonts"
msgstr "Bruk egne skrifter"
-#: ../data/epiphany.schemas.in.h:47
+#: ../data/epiphany.schemas.in.h:50
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:48
+#: ../data/epiphany.schemas.in.h:51
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:49
+#: ../data/epiphany.schemas.in.h:52
msgid ""
"When files cannot be opened by the browser they are automatically downloaded "
"to the download folder and opened with the appropriate application."
@@ -440,7 +450,7 @@ msgstr ""
"Når filer ikke kan åpnes av nettleseren lastes de ned til nedlastingsmappen "
"og åpnes med riktig applikasjon automatisk."
-#: ../data/epiphany.schemas.in.h:50
+#: ../data/epiphany.schemas.in.h:53
msgid ""
"Where to accept cookies from. Possible values are \"anywhere\", \"current "
"site\" and \"nowhere\"."
@@ -448,23 +458,23 @@ msgstr ""
"Hvor informasjonskapsler skal godtas fra. Mulige verdier er «anywhere», "
"«current» og «nowhere»."
-#: ../data/epiphany.schemas.in.h:51
+#: ../data/epiphany.schemas.in.h:54
msgid "Whether to print the date in the footer"
msgstr "Om dato skal skrives ut i bunnteksten"
-#: ../data/epiphany.schemas.in.h:52
+#: ../data/epiphany.schemas.in.h:55
msgid "Whether to print the page address in the header"
msgstr "Om sidens adresse skal skrives ut i toppteksten"
-#: ../data/epiphany.schemas.in.h:53
+#: ../data/epiphany.schemas.in.h:56
msgid "Whether to print the page numbers (x of total) in the footer"
msgstr "Om sidenummer (x av total) skal skrives ut i bunnteksten"
-#: ../data/epiphany.schemas.in.h:54
+#: ../data/epiphany.schemas.in.h:57
msgid "Whether to print the page title in the header"
msgstr "Om sidens tittel skal skrives ut i toppteksten"
-#: ../data/epiphany.schemas.in.h:55
+#: ../data/epiphany.schemas.in.h:58
msgid "x-western"
msgstr "x-western"
@@ -513,7 +523,7 @@ msgid "Field _Value"
msgstr "Felt_verdi"
#: ../data/glade/certificate-dialogs.glade.h:12
-#: ../data/glade/prefs-dialog.glade.h:23
+#: ../data/glade/prefs-dialog.glade.h:20
msgid "General"
msgstr "Generell"
@@ -555,7 +565,7 @@ msgid "Cookies"
msgstr "Informasjonskapsler"
#. The name of the default downloads folder
-#: ../data/glade/epiphany.glade.h:4 ../lib/ephy-file-helpers.c:99
+#: ../data/glade/epiphany.glade.h:4 ../lib/ephy-file-helpers.c:101
msgid "Downloads"
msgstr "Nedlastinger"
@@ -579,67 +589,51 @@ msgstr "Bruk koding som spesifisert av dokumentet"
msgid "_Show password"
msgstr "Vi_s passord"
-#: ../data/glade/prefs-dialog.glade.h:1 ../data/glade/print.glade.h:1
-msgid "<b>Colors</b>"
-msgstr "<b>Farger</b>"
-
-#: ../data/glade/prefs-dialog.glade.h:2
+#: ../data/glade/prefs-dialog.glade.h:1
msgid "<b>Cookies</b>"
msgstr "<b>Informasjonskapsler</b>"
-#: ../data/glade/prefs-dialog.glade.h:3
+#: ../data/glade/prefs-dialog.glade.h:2
msgid "<b>Downloads</b>"
msgstr "<b>Nedlastinger</b>"
-#: ../data/glade/prefs-dialog.glade.h:4
+#: ../data/glade/prefs-dialog.glade.h:3
msgid "<b>Encodings</b>"
msgstr "<b>Kodinger</b>"
-#: ../data/glade/prefs-dialog.glade.h:5
-msgid "<b>Fonts</b>"
-msgstr "<b>Skrifter</b>"
-
-#: ../data/glade/prefs-dialog.glade.h:6
+#: ../data/glade/prefs-dialog.glade.h:4
msgid "<b>Home page</b>"
msgstr "<b>Hjemmeside</b>"
-#: ../data/glade/prefs-dialog.glade.h:7
+#: ../data/glade/prefs-dialog.glade.h:5
msgid "<b>Languages</b>"
msgstr "<b>Språk</b>"
-#: ../data/glade/prefs-dialog.glade.h:8
+#: ../data/glade/prefs-dialog.glade.h:6
msgid "<b>Temporary Files</b>"
msgstr "<b>Midlertidige filer</b>"
-#: ../data/glade/prefs-dialog.glade.h:9
+#: ../data/glade/prefs-dialog.glade.h:7
msgid "<b>Web Content</b>"
msgstr "<b>Nettinnhold</b>"
-#: ../data/glade/prefs-dialog.glade.h:10
+#: ../data/glade/prefs-dialog.glade.h:8
msgid "A_utomatically download and open files"
msgstr "Last ned og åpne filer a_utomatisk"
-#: ../data/glade/prefs-dialog.glade.h:11
+#: ../data/glade/prefs-dialog.glade.h:9
msgid "Add Language"
msgstr "Legg til språk"
-#: ../data/glade/prefs-dialog.glade.h:12
-msgid "Al_ways use the desktop theme colors"
-msgstr "All_tid bruk farger fra skrivebordstema"
-
-#: ../data/glade/prefs-dialog.glade.h:13
+#: ../data/glade/prefs-dialog.glade.h:10
msgid "Allow popup _windows"
msgstr "Tillat sprettopp_vinduer"
-#: ../data/glade/prefs-dialog.glade.h:14
-msgid "Always use _these fonts"
-msgstr "Alltid bruk _disse skriftene"
-
-#: ../data/glade/prefs-dialog.glade.h:15
+#: ../data/glade/prefs-dialog.glade.h:11
msgid "Au_todetect:"
msgstr "Gjenkjenn au_tomatisk:"
-#: ../data/glade/prefs-dialog.glade.h:16
+#: ../data/glade/prefs-dialog.glade.h:12
msgid "Choose a l_anguage:"
msgstr "V_elg et språk:"
@@ -647,61 +641,77 @@ msgstr "V_elg et språk:"
#. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
#. * Select All, Input Methods and Insert Unicode control character.)
#.
-#: ../data/glade/prefs-dialog.glade.h:17
+#: ../data/glade/prefs-dialog.glade.h:13
#: ../lib/widgets/ephy-location-entry.c:580 ../src/ephy-history-window.c:261
msgid "Cl_ear"
msgstr "Tø_m"
-#: ../data/glade/prefs-dialog.glade.h:18
+#: ../data/glade/prefs-dialog.glade.h:14
msgid "De_fault:"
msgstr "_Forvalgt:"
-#: ../data/glade/prefs-dialog.glade.h:19
+#: ../data/glade/prefs-dialog.glade.h:15
msgid "Enable Java_Script"
msgstr "Aktiver Java_Script"
-#: ../data/glade/prefs-dialog.glade.h:20
+#: ../data/glade/prefs-dialog.glade.h:16
msgid "Enable _Java"
msgstr "Aktiver _Java"
-#: ../data/glade/prefs-dialog.glade.h:21
-msgid "Fonts and Colors"
-msgstr "Skrifter og farger"
+#: ../data/glade/prefs-dialog.glade.h:17
+msgid "Fonts"
+msgstr "Skrifter"
-#: ../data/glade/prefs-dialog.glade.h:22
+#: ../data/glade/prefs-dialog.glade.h:18
+msgid "Fonts & Style"
+msgstr "Skrifter og stil"
+
+#: ../data/glade/prefs-dialog.glade.h:19
msgid "For l_anguage:"
msgstr "For spr_åk:"
-#: ../data/glade/prefs-dialog.glade.h:24 ../src/prefs-dialog.c:1037
+#: ../data/glade/prefs-dialog.glade.h:21 ../src/prefs-dialog.c:1301
msgid "Language"
msgstr "Språk"
-#: ../data/glade/prefs-dialog.glade.h:25
+#: ../data/glade/prefs-dialog.glade.h:22
+msgid "Let web pages specify their own _colors"
+msgstr "La nettsider oppgi egne _farger"
+
+#: ../data/glade/prefs-dialog.glade.h:23
+msgid "Let web pages specify their own _fonts"
+msgstr "La nettsider oppgi egne _skrifter"
+
+#: ../data/glade/prefs-dialog.glade.h:24
msgid "MB"
msgstr "MB"
-#: ../data/glade/prefs-dialog.glade.h:26
+#: ../data/glade/prefs-dialog.glade.h:25
msgid "Only _from sites you visit"
msgstr "Kun _fra steder du besøker"
-#: ../data/glade/prefs-dialog.glade.h:27
+#: ../data/glade/prefs-dialog.glade.h:26
msgid "Preferences"
msgstr "Brukervalg..."
-#: ../data/glade/prefs-dialog.glade.h:28
+#: ../data/glade/prefs-dialog.glade.h:27
msgid "Privacy"
msgstr "Personvern"
-#: ../data/glade/prefs-dialog.glade.h:29
+#: ../data/glade/prefs-dialog.glade.h:28
msgid "Set to Current _Page"
msgstr "Sett til denne _siden"
-#: ../data/glade/prefs-dialog.glade.h:30
+#: ../data/glade/prefs-dialog.glade.h:29
msgid "Set to _Blank Page"
msgstr "Sett til _tom side"
+#: ../data/glade/prefs-dialog.glade.h:30
+msgid "Use custom _stylesheet"
+msgstr "Bruk egendefinert _stilark"
+
#: ../data/glade/prefs-dialog.glade.h:31
-#: ../src/bookmarks/ephy-bookmark-properties.c:340
+#: ../src/bookmarks/ephy-bookmark-properties.c:596
msgid "_Address:"
msgstr "_Adresse:"
@@ -710,29 +720,41 @@ msgid "_Always accept"
msgstr "_Alltid godta"
#: ../data/glade/prefs-dialog.glade.h:33
+msgid "_Detailed Font Settings..."
+msgstr "_Detaljerte innstillinger for skrifter..."
+
+#: ../data/glade/prefs-dialog.glade.h:34
msgid "_Disk space:"
msgstr "_Diskplass:"
-#: ../data/glade/prefs-dialog.glade.h:34
+#: ../data/glade/prefs-dialog.glade.h:35
msgid "_Download folder:"
msgstr "Ne_dlastingsmappe:"
-#: ../data/glade/prefs-dialog.glade.h:35
+#: ../data/glade/prefs-dialog.glade.h:36
+msgid "_Edit Stylesheet..."
+msgstr "R_ediger stilark..."
+
+#: ../data/glade/prefs-dialog.glade.h:37
msgid "_Fixed width:"
msgstr "_Fast bredde:"
-#: ../data/glade/prefs-dialog.glade.h:36
+#: ../data/glade/prefs-dialog.glade.h:38
msgid "_Minimum size:"
msgstr "_Minste størrelse:"
-#: ../data/glade/prefs-dialog.glade.h:37
+#: ../data/glade/prefs-dialog.glade.h:39
msgid "_Never accept"
msgstr "_Aldri godta"
-#: ../data/glade/prefs-dialog.glade.h:38
+#: ../data/glade/prefs-dialog.glade.h:40
msgid "_Variable width:"
msgstr "_Variabel bredde:"
+#: ../data/glade/print.glade.h:1
+msgid "<b>Colors</b>"
+msgstr "<b>Farger</b>"
+
#: ../data/glade/print.glade.h:2
msgid "<b>Footers</b>"
msgstr "<b>Bunntekst</b>"
@@ -803,7 +825,7 @@ msgstr ""
"%s av %s"
#: ../embed/downloader-view.c:431 ../embed/downloader-view.c:436
-#: ../src/ephy-window.c:1454
+#: ../src/ephy-window.c:1469
msgid "Unknown"
msgstr "Ukjent"
@@ -838,6 +860,10 @@ msgstr "%"
msgid "Remaining"
msgstr "Gjenstår"
+#: ../embed/ephy-embed-shell.c:235
+msgid "Epiphany can't be used now. Mozilla initialization failed."
+msgstr "Epiphany kan ikke brukes nå. Initiering av Mozilla feilet."
+
#: ../embed/ephy-encodings.c:60
msgid "Arabic (_IBM-864)"
msgstr "Arabisk (_IBM-864)"
@@ -1221,7 +1247,7 @@ msgstr "Ukrainsk"
msgid "Unknown (%s)"
msgstr "Ukjent (%s)"
-#: ../embed/ephy-history.c:550
+#: ../embed/ephy-history.c:550 ../src/bookmarks/ephy-bookmark-properties.c:613
msgid "All"
msgstr "Alle"
@@ -1551,10 +1577,29 @@ msgstr "i the Internet Archive"
#: ../embed/mozilla/EphyHeaderSniffer.cpp:364
#: ../src/bookmarks/ephy-bookmarks-import.c:245
-#: ../src/bookmarks/ephy-bookmarks-ui.c:481 ../src/ephy-session.c:775
+#: ../src/bookmarks/ephy-bookmarks.c:1111 ../src/ephy-session.c:775
msgid "Untitled"
msgstr "Uten tittel"
+#: ../embed/mozilla/EphyPromptService.cpp:193
+msgid "_Abort Script"
+msgstr "_Avbryt skript"
+
+#: ../embed/mozilla/EphyPromptService.cpp:261
+msgid "Don't Save"
+msgstr "Ikke lagre"
+
+#: ../embed/mozilla/EphyPromptService.cpp:742
+msgid "_User:"
+msgstr "Br_uker:"
+
+#: ../embed/mozilla/EphyPromptService.cpp:743
+#: ../embed/mozilla/EphyPromptService.cpp:770
+#: ../embed/mozilla/GtkNSSDialogs.cpp:795
+#: ../embed/mozilla/GtkNSSDialogs.cpp:905
+msgid "_Password:"
+msgstr "_Passord:"
+
#: ../embed/mozilla/FilePicker.cpp:152 ../embed/mozilla/FilePicker.cpp:445
#: ../lib/ephy-file-chooser.c:371 ../src/bookmarks/ephy-bookmarks-editor.c:642
msgid "All files"
@@ -1745,11 +1790,6 @@ msgstr "Velg passord."
msgid "Select a password to protect this certificate."
msgstr "Velg et passord for å beskytte dette sertifikatet."
-#: ../embed/mozilla/GtkNSSDialogs.cpp:795
-#: ../embed/mozilla/GtkNSSDialogs.cpp:905
-msgid "_Password:"
-msgstr "_Passord:"
-
#: ../embed/mozilla/GtkNSSDialogs.cpp:809
msgid "Con_firm password:"
msgstr "Bekre_ft passord:"
@@ -1928,14 +1968,10 @@ msgstr "Filer"
#. * in url-escaped UTF-8; that means that if you're choosing google,
#. * the 'q=' part needs to come last.
#.
-#: ../embed/mozilla/mozilla-embed-single.cpp:263
+#: ../embed/mozilla/mozilla-embed-single.cpp:293
msgid "http://www.google.com/search?ie=UTF-8&oe=UTF-8&q="
msgstr "http://www.google.com/search?ie=UTF-8&oe=UTF-8&q="
-#: ../embed/mozilla/mozilla-embed-single.cpp:595
-msgid "Epiphany can't be used now. Mozilla initialization failed."
-msgstr "Epiphany kan ikke brukes nå. Initiering av Mozilla feilet."
-
#: ../embed/print-dialog.c:258
msgid "Generating PDF is not supported"
msgstr "Oppretting av PDF er ikke støttet"
@@ -1953,27 +1989,27 @@ msgstr ""
"Du prøvde å skrive ut til en skriver med driver «%s». Dette programmet "
"krever en PostScript skriverdriver."
-#: ../embed/print-dialog.c:365
+#: ../embed/print-dialog.c:364
msgid "_From:"
msgstr "_Fra:"
-#: ../embed/print-dialog.c:378
+#: ../embed/print-dialog.c:377
msgid "Sets the start of the range of pages to be printed"
msgstr "Start på sideområdet som skal skrives ut"
-#: ../embed/print-dialog.c:380
+#: ../embed/print-dialog.c:379
msgid "_To:"
msgstr "_Til:"
-#: ../embed/print-dialog.c:393
+#: ../embed/print-dialog.c:392
msgid "Sets the end of the range of pages to be printed"
msgstr "Slutten på sideområdet som skal skrives ut"
-#: ../embed/print-dialog.c:408 ../src/ephy-window.c:1280
+#: ../embed/print-dialog.c:407 ../src/ephy-window.c:1289
msgid "Print"
msgstr "Skriv ut"
-#: ../embed/print-dialog.c:416
+#: ../embed/print-dialog.c:415
msgid "Pages"
msgstr "Sider"
@@ -1986,18 +2022,30 @@ msgstr ""
"GConf feil:\n"
" %s"
-#: ../lib/egg/egg-editable-toolbar.c:487
+#: ../lib/egg/egg-editable-toolbar.c:1060
msgid "_Move on Toolbar"
msgstr "_Flytt på verktøylinje"
-#: ../lib/egg/egg-editable-toolbar.c:495
+#: ../lib/egg/egg-editable-toolbar.c:1061
+msgid "Move the selected item on the toolbar"
+msgstr "Flytt valgt oppføring på verktøylinjen"
+
+#: ../lib/egg/egg-editable-toolbar.c:1062
msgid "_Remove from Toolbar"
msgstr "Fje_rn verktøylinje"
-#: ../lib/egg/egg-editable-toolbar.c:524
+#: ../lib/egg/egg-editable-toolbar.c:1063
+msgid "Remove the selected item from the toolbar"
+msgstr "Fjern valgt oppføring fra verktøylinjen"
+
+#: ../lib/egg/egg-editable-toolbar.c:1064
msgid "_Remove Toolbar"
msgstr "Fje_rn verktøylinje"
+#: ../lib/egg/egg-editable-toolbar.c:1065
+msgid "Remove the selected toolbar"
+msgstr "Fjern valgt verktøylinje"
+
#: ../lib/egg/egg-toolbar-editor.c:439
msgid "Separator"
msgstr "Skillelinje"
@@ -2006,12 +2054,12 @@ msgstr "Skillelinje"
msgid "All supported types"
msgstr "Alle støttede typer"
-#: ../lib/ephy-file-helpers.c:328
+#: ../lib/ephy-file-helpers.c:330
#, c-format
msgid "\"%s\" exists, please move it out of the way."
msgstr "«%s» eksisterer. Vennligst flytt den."
-#: ../lib/ephy-file-helpers.c:334
+#: ../lib/ephy-file-helpers.c:336
#, c-format
msgid "Failed to create directory \"%s\"."
msgstr "Kunne ikke opprette katalog «%s»."
@@ -2038,7 +2086,9 @@ msgstr "Kan ikke overskrive eksisterende fil «%s»"
msgid ""
"A file with this name already exists and you don't have permission to "
"overwrite it."
-msgstr "En fil med dette navnet eksisterer allerede og du har ikke rettigheter til å overskrive den."
+msgstr ""
+"En fil med dette navnet eksisterer allerede og du har ikke rettigheter til å "
+"overskrive den."
#: ../lib/ephy-gui.c:372
msgid "Cannot Overwrite File"
@@ -2205,21 +2255,17 @@ msgstr "Vestlig"
msgid "select fonts for|Other Scripts"
msgstr "Andre"
-#: ../lib/ephy-stock-icons.c:54
-msgid "Close Tab"
-msgstr "Lukk fane"
-
#: ../lib/ephy-stock-icons.c:55
msgid "Popup Windows"
msgstr "Sprettoppvinduer"
-#: ../lib/ephy-stock-icons.c:56 ../src/ephy-history-window.c:1191
+#: ../lib/ephy-stock-icons.c:56 ../src/ephy-history-window.c:1179
msgid "History"
msgstr "Historie"
#: ../lib/ephy-stock-icons.c:57 ../src/bookmarks/ephy-bookmarks-editor.c:684
#: ../src/bookmarks/ephy-bookmarks-editor.c:1535
-#: ../src/bookmarks/ephy-topic-action.c:344 ../src/ephy-window.c:1286
+#: ../src/bookmarks/ephy-topic-action.c:402 ../src/ephy-window.c:1295
msgid "Bookmarks"
msgstr "Bokmerker"
@@ -2302,239 +2348,261 @@ msgstr ""
"Dette tillegget håndterer «.desktop» filer som inneholder lenker til "
"nettsteder."
-#: ../src/bookmarks/ephy-bookmark-action.c:284
+#: ../src/bookmarks/ephy-bookmark-action.c:287
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../src/bookmarks/ephy-bookmark-action.c:395
-#: ../src/bookmarks/ephy-bookmarks-editor.c:176
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1162
-#: ../src/ephy-history-window.c:173 ../src/ephy-history-window.c:711
-msgid "Open in New _Tab"
-msgid_plural "Open in New _Tabs"
-msgstr[0] "Åpne i ny _fane"
-msgstr[1] "Åpne i nye _faner"
-
-#. File Menu
-#: ../src/bookmarks/ephy-bookmark-action.c:401
-#: ../src/bookmarks/ephy-bookmarks-editor.c:173
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1159
-#: ../src/ephy-history-window.c:170 ../src/ephy-history-window.c:708
-msgid "Open in New _Window"
-msgid_plural "Open in New _Windows"
-msgstr[0] "Åpne i nytt _vindu"
-msgstr[1] "Åpne i nye _vinduer"
-
# (ugh)
-#: ../src/bookmarks/ephy-bookmark-properties.c:225
+#: ../src/bookmarks/ephy-bookmark-properties.c:294
#, c-format
msgid "“%s” Properties"
msgstr "Egenskaper for «%s»"
-#: ../src/bookmarks/ephy-bookmark-properties.c:321
-#: ../src/bookmarks/ephy-new-bookmark.c:231
+#: ../src/bookmarks/ephy-bookmark-properties.c:433
+msgid "Open Icon"
+msgstr "Åpne ikon"
+
+#: ../src/bookmarks/ephy-bookmark-properties.c:506
+msgid "From file..."
+msgstr "Fra fil..."
+
+#: ../src/bookmarks/ephy-bookmark-properties.c:508
+msgid "None"
+msgstr "Ingen"
+
+#: ../src/bookmarks/ephy-bookmark-properties.c:509 ../src/prefs-dialog.c:412
+msgid "Default"
+msgstr "Forvalgt"
+
+#: ../src/bookmarks/ephy-bookmark-properties.c:581
msgid "_Title:"
msgstr "_Tittel:"
-#: ../src/bookmarks/ephy-bookmark-properties.c:363
-#: ../src/bookmarks/ephy-new-bookmark.c:254
-msgid "To_pics:"
+#: ../src/bookmarks/ephy-bookmark-properties.c:604
+msgid "I_con:"
+msgstr "I_kon:"
+
+#: ../src/bookmarks/ephy-bookmark-properties.c:614
+#: ../src/bookmarks/ephy-topics-palette.c:274
+msgid "Subtopics"
+msgstr "Underemner"
+
+#: ../src/bookmarks/ephy-bookmark-properties.c:615
+msgid "T_opics:"
msgstr "Em_ner:"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:134
+#. File Menu
+#: ../src/bookmarks/ephy-bookmark-properties.c:650
+#: ../src/bookmarks/ephy-bookmarks-editor.c:171
+msgid "_New Topic"
+msgstr "_Nytt emne"
+
+#: ../src/bookmarks/ephy-bookmarks-editor.c:135
msgid "Remove from this topic"
msgstr "Fjern fra dette emnet"
#. Toplevel
-#: ../src/bookmarks/ephy-bookmarks-editor.c:163
+#: ../src/bookmarks/ephy-bookmarks-editor.c:164
#: ../src/ephy-history-window.c:163 ../src/ephy-window.c:115
msgid "_File"
msgstr "_Fil"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:164
+#: ../src/bookmarks/ephy-bookmarks-editor.c:165
#: ../src/ephy-history-window.c:164 ../src/ephy-window.c:116
msgid "_Edit"
msgstr "R_ediger"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:165
+#: ../src/bookmarks/ephy-bookmarks-editor.c:166
#: ../src/ephy-history-window.c:165 ../src/ephy-window.c:117
msgid "_View"
msgstr "_Vis"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:166
+#: ../src/bookmarks/ephy-bookmarks-editor.c:167
#: ../src/ephy-history-window.c:166 ../src/ephy-window.c:122
msgid "_Help"
msgstr "_Hjelp"
-#. File Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:170
-#: ../src/bookmarks/ephy-new-bookmark.c:294
-msgid "_New Topic"
-msgstr "_Nytt emne"
-
-#: ../src/bookmarks/ephy-bookmarks-editor.c:171
+#: ../src/bookmarks/ephy-bookmarks-editor.c:172
msgid "Create a new topic"
msgstr "Opprett et nytt emne"
+#. File Menu
#: ../src/bookmarks/ephy-bookmarks-editor.c:174
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1159
+#: ../src/bookmarks/ephy-bookmarks-ui.c:268 ../src/ephy-history-window.c:170
+#: ../src/ephy-history-window.c:696
+msgid "Open in New _Window"
+msgid_plural "Open in New _Windows"
+msgstr[0] "Åpne i nytt _vindu"
+msgstr[1] "Åpne i nye _vinduer"
+
+#: ../src/bookmarks/ephy-bookmarks-editor.c:175
msgid "Open the selected bookmark in a new window"
msgstr "Åpne valgte bokmerker i et nytt vindu"
#: ../src/bookmarks/ephy-bookmarks-editor.c:177
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1162
+#: ../src/bookmarks/ephy-bookmarks-ui.c:257 ../src/ephy-history-window.c:173
+#: ../src/ephy-history-window.c:699
+msgid "Open in New _Tab"
+msgid_plural "Open in New _Tabs"
+msgstr[0] "Åpne i ny _fane"
+msgstr[1] "Åpne i nye _faner"
+
+#: ../src/bookmarks/ephy-bookmarks-editor.c:178
msgid "Open the selected bookmark in a new tab"
msgstr "Åpne valgte bokmerker i en ny fane"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:179
+#: ../src/bookmarks/ephy-bookmarks-editor.c:180
msgid "_Rename..."
msgstr "End_re navn..."
-#: ../src/bookmarks/ephy-bookmarks-editor.c:180
+#: ../src/bookmarks/ephy-bookmarks-editor.c:181
msgid "Rename the selected bookmark or topic"
msgstr "Endre navn på valgt bokmerke eller emne"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:181
+#: ../src/bookmarks/ephy-bookmarks-editor.c:182
#: ../src/ephy-history-window.c:176
msgid "_Delete"
msgstr "_Slett"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:182
+#: ../src/bookmarks/ephy-bookmarks-editor.c:183
msgid "Delete the selected bookmark or topic"
msgstr "Slett valgt bokmerke eller emne"
# (ugh)
-#: ../src/bookmarks/ephy-bookmarks-editor.c:184
+#: ../src/bookmarks/ephy-bookmarks-editor.c:185
msgid "_Properties"
msgstr "Egenska_per"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:185
+#: ../src/bookmarks/ephy-bookmarks-editor.c:186
msgid "View or modify the properties of the selected bookmark"
msgstr "Vis eller endre egenskaper for valgt bokmerke"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:187
+#: ../src/bookmarks/ephy-bookmarks-editor.c:188
msgid "_Import Bookmarks..."
msgstr "_Importer bokmerker..."
-#: ../src/bookmarks/ephy-bookmarks-editor.c:188
+#: ../src/bookmarks/ephy-bookmarks-editor.c:189
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:190
+#: ../src/bookmarks/ephy-bookmarks-editor.c:191
msgid "_Export Bookmarks..."
msgstr "_Eksporter bokmerker..."
-#: ../src/bookmarks/ephy-bookmarks-editor.c:191
+#: ../src/bookmarks/ephy-bookmarks-editor.c:192
msgid "Export bookmarks to a file"
msgstr "Eksporter bokmerker til en fil"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:193
+#: ../src/bookmarks/ephy-bookmarks-editor.c:194
#: ../src/ephy-history-window.c:182 ../src/ephy-window.c:152
msgid "_Close"
msgstr "L_ukk"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:194
+#: ../src/bookmarks/ephy-bookmarks-editor.c:195
msgid "Close the bookmarks window"
msgstr "Lukk bokmerkevinduet"
#. Edit Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:198
+#: ../src/bookmarks/ephy-bookmarks-editor.c:199
#: ../src/ephy-history-window.c:187 ../src/ephy-window.c:164
msgid "Cu_t"
msgstr "Klipp u_t"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:199
+#: ../src/bookmarks/ephy-bookmarks-editor.c:200
#: ../src/ephy-history-window.c:188 ../src/ephy-window.c:165
msgid "Cut the selection"
msgstr "Klipp ut utvalget"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:201
+#: ../src/bookmarks/ephy-bookmarks-editor.c:202
#: ../src/bookmarks/ephy-bookmarks-editor.c:1172
-#: ../src/ephy-history-window.c:190 ../src/ephy-history-window.c:721
+#: ../src/ephy-history-window.c:190 ../src/ephy-history-window.c:709
#: ../src/ephy-window.c:167
msgid "_Copy"
msgstr "_Kopier"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:202
+#: ../src/bookmarks/ephy-bookmarks-editor.c:203
#: ../src/ephy-history-window.c:191 ../src/ephy-window.c:168
msgid "Copy the selection"
msgstr "Kopier utvalget"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:204
+#: ../src/bookmarks/ephy-bookmarks-editor.c:205
#: ../src/ephy-history-window.c:193 ../src/ephy-window.c:170
msgid "_Paste"
msgstr "Li_m inn"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:205
+#: ../src/bookmarks/ephy-bookmarks-editor.c:206
#: ../src/ephy-history-window.c:194
msgid "Paste the clipboard"
msgstr "Lim inn utklippstavlen"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:207
+#: ../src/bookmarks/ephy-bookmarks-editor.c:208
#: ../src/ephy-history-window.c:196 ../src/ephy-window.c:173
msgid "Select _All"
msgstr "Velg _alt"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:208
+#: ../src/bookmarks/ephy-bookmarks-editor.c:209
msgid "Select all bookmarks or text"
msgstr "Velg alle bokmerker eller all tekst"
#. Help Menu
#. Help menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:212
+#: ../src/bookmarks/ephy-bookmarks-editor.c:213
#: ../src/ephy-history-window.c:204 ../src/ephy-window.c:264
msgid "_Contents"
msgstr "_Innhold"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:213
+#: ../src/bookmarks/ephy-bookmarks-editor.c:214
msgid "Display bookmarks help"
msgstr "Vis hjelp for bokmerker"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:215
+#: ../src/bookmarks/ephy-bookmarks-editor.c:216
#: ../src/ephy-history-window.c:207 ../src/ephy-window.c:267
msgid "_About"
msgstr "_Om"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:216
+#: ../src/bookmarks/ephy-bookmarks-editor.c:217
#: ../src/ephy-history-window.c:208 ../src/ephy-window.c:268
msgid "Display credits for the web browser creators"
msgstr "Vis kreditering for skaperene av nettleseren"
#. View Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:229
+#: ../src/bookmarks/ephy-bookmarks-editor.c:230
#: ../src/ephy-history-window.c:222
msgid "_Title"
msgstr "_Tittel"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:230
+#: ../src/bookmarks/ephy-bookmarks-editor.c:231
#: ../src/ephy-history-window.c:223
msgid "Show only the title column"
msgstr "Vis kun tittelkolonnen"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:231
+#: ../src/bookmarks/ephy-bookmarks-editor.c:232
#: ../src/ephy-history-window.c:226
msgid "T_itle and Address"
msgstr "T_ittel og adresse"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:232
+#: ../src/bookmarks/ephy-bookmarks-editor.c:233
#: ../src/ephy-history-window.c:227
msgid "Show both the title and address columns"
msgstr "Vis både tittel- og adressekolonnene"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:273
-#: ../src/bookmarks/ephy-topics-selector.c:319
+#: ../src/bookmarks/ephy-bookmarks-editor.c:274
msgid "Type a topic"
msgstr "Skriv et emne"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:391
+#: ../src/bookmarks/ephy-bookmarks-editor.c:392
#, c-format
msgid "Delete topic “%s”?"
msgstr "Slett emne «%s»?"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:394
+#: ../src/bookmarks/ephy-bookmarks-editor.c:395
msgid "Delete this topic?"
msgstr "Slett dette emnet?"
-#: ../src/bookmarks/ephy-bookmarks-editor.c:396
+#: ../src/bookmarks/ephy-bookmarks-editor.c:397
msgid ""
"Deleting this topic will cause all its bookmarks to become uncategorized, "
"unless they also belong to other topics. The bookmarks will not be deleted."
@@ -2543,7 +2611,7 @@ msgstr ""
"kategorisering, med mindre de tilhører andre emner også. Bokmerkene vil ikke "
"bli slettet."
-#: ../src/bookmarks/ephy-bookmarks-editor.c:399
+#: ../src/bookmarks/ephy-bookmarks-editor.c:400
msgid "_Delete Topic"
msgstr "_Slett emne"
@@ -2633,27 +2701,26 @@ msgid "Import bookmarks from:"
msgstr "Importer bokmerker fra:"
#: ../src/bookmarks/ephy-bookmarks-editor.c:1168
-#: ../src/ephy-history-window.c:717
+#: ../src/ephy-history-window.c:705
msgid "_Copy Address"
msgstr "_Kopier adresse"
#: ../src/bookmarks/ephy-bookmarks-editor.c:1402
-#: ../src/ephy-history-window.c:1033
+#: ../src/ephy-history-window.c:1021
msgid "_Search:"
msgstr "_Søk:"
#: ../src/bookmarks/ephy-bookmarks-editor.c:1597
-#: ../src/bookmarks/ephy-topics-selector.c:198
msgid "Topics"
msgstr "Emner"
#: ../src/bookmarks/ephy-bookmarks-editor.c:1667
-#: ../src/ephy-history-window.c:1316
+#: ../src/ephy-history-window.c:1304
msgid "Title"
msgstr "Tittel"
#: ../src/bookmarks/ephy-bookmarks-editor.c:1673
-#: ../src/ephy-history-window.c:1322
+#: ../src/ephy-history-window.c:1310
msgid "Address"
msgstr "Adresse"
@@ -2661,81 +2728,81 @@ msgstr "Adresse"
#. * For instance in .nl these should be
#. * "http://www.google.nl" and "http://www.google.nl/search?q=%s"
#.
-#: ../src/bookmarks/ephy-bookmarks.c:96
+#: ../src/bookmarks/ephy-bookmarks.c:95
msgid "Search the web"
msgstr "Søk på nettet"
-#: ../src/bookmarks/ephy-bookmarks.c:96
+#: ../src/bookmarks/ephy-bookmarks.c:95
#, c-format
msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8"
msgstr "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8"
-#: ../src/bookmarks/ephy-bookmarks.c:101
+#: ../src/bookmarks/ephy-bookmarks.c:100
msgid "Entertainment"
msgstr "Underholdning"
-#: ../src/bookmarks/ephy-bookmarks.c:102
+#: ../src/bookmarks/ephy-bookmarks.c:101
msgid "News"
msgstr "Nyheter"
-#: ../src/bookmarks/ephy-bookmarks.c:103
+#: ../src/bookmarks/ephy-bookmarks.c:102
msgid "Shopping"
msgstr "Innkjøp"
-#: ../src/bookmarks/ephy-bookmarks.c:104
+#: ../src/bookmarks/ephy-bookmarks.c:103
msgid "Sports"
msgstr "Sport"
-#: ../src/bookmarks/ephy-bookmarks.c:105
+#: ../src/bookmarks/ephy-bookmarks.c:104
msgid "Travel"
msgstr "Reiser"
-#: ../src/bookmarks/ephy-bookmarks.c:106
+#: ../src/bookmarks/ephy-bookmarks.c:105
msgid "Work"
msgstr "Arbeid"
#. translators: the %s is the title of the bookmark
-#: ../src/bookmarks/ephy-bookmarks.c:471
+#: ../src/bookmarks/ephy-bookmarks.c:470
#, c-format
msgid "Update bookmark “%s”?"
msgstr "Oppdater bokmerke «%s»?"
#. translators: the %s is a URL
-#: ../src/bookmarks/ephy-bookmarks.c:476
+#: ../src/bookmarks/ephy-bookmarks.c:475
#, c-format
msgid "The bookmarked page has moved to “%s”."
msgstr "Siden bokmerket peker til er flyttet til «%s»."
-#: ../src/bookmarks/ephy-bookmarks.c:480
+#: ../src/bookmarks/ephy-bookmarks.c:479
msgid "_Don't Update"
msgstr "_Ikke oppdater"
-#: ../src/bookmarks/ephy-bookmarks.c:482
+#: ../src/bookmarks/ephy-bookmarks.c:481
msgid "_Update"
msgstr "_Oppdater"
-#: ../src/bookmarks/ephy-bookmarks.c:485
+#: ../src/bookmarks/ephy-bookmarks.c:484
msgid "Update Bookmark?"
msgstr "Oppdater bokmerke?"
#. Translators: The text before the "|" is context to help you decide on
#. * the correct translation. You MUST OMIT it in the translated string.
#. Translators: this topic contains all bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:873
+#: ../src/bookmarks/ephy-bookmarks.c:869
msgid "bookmarks|All"
msgstr "Alle"
#. Translators: The text before the "|" is context to help you decide on
#. * the correct translation. You MUST OMIT it in the translated string.
#. Translators: this topic contains the most used bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:909
+#: ../src/bookmarks/ephy-bookmarks.c:905
msgid "bookmarks|Most Visited"
msgstr "Oftest besøkt"
#. Translators: The text before the "|" is context to help you decide on
#. * the correct translation. You MUST OMIT it in the translated string.
#. Translators: this topic contains the not categorized bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:928
+#: ../src/bookmarks/ephy-bookmarks.c:924
msgid "bookmarks|Not Categorized"
msgstr "Ikke kategorisert"
@@ -2743,31 +2810,83 @@ msgstr "Ikke kategorisert"
#. * the correct translation. You MUST OMIT it in the translated string.
#. Translators: this is an automatic topic containing local websites bookmarks
#. * autodiscovered with zeroconf.
-#: ../src/bookmarks/ephy-bookmarks.c:953
+#: ../src/bookmarks/ephy-bookmarks.c:949
msgid "bookmarks|Local Sites"
msgstr "bokmerker"
-#: ../src/bookmarks/ephy-new-bookmark.c:275
-msgid "Add Bookmark"
-msgstr "Legg til bokmerke"
+#: ../src/bookmarks/ephy-bookmark-factory-action.c:316
+msgid "Quick Bookmark"
+msgstr "Hurtigbokmerke"
+
+# (ugh)
+#. Add popup menu actions that are specific to the bookmark widgets
+#: ../src/bookmarks/ephy-bookmarks-ui.c:246
+msgid "Properties"
+msgstr "Egenskaper"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:247
+msgid "Show properties for this bookmark"
+msgstr "Vis egenskaper for dette bokmerket"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:258
+msgid "Open this bookmark in a new tab"
+msgstr "Åpne dette bokmerket i en ny fane"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:269
+msgid "Open this bookmark in a new window"
+msgstr "Åpne dette bokmerket i et nytt vindu"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:453
+msgid "Bookmark exists"
+msgstr "Bokmerke eksisterer"
-#: ../src/bookmarks/ephy-new-bookmark.c:312
+#: ../src/bookmarks/ephy-bookmarks-ui.c:456
#, c-format
msgid "You already have a bookmark titled “%s” for this page."
msgstr "Du har allerede et bokmerke med tittel «%s» for denne siden."
+#: ../src/bookmarks/ephy-bookmarks-ui.c:466
+msgid "_Create New"
+msgstr "_Opprett nytt"
+
# (ugh)
-#: ../src/bookmarks/ephy-new-bookmark.c:324
+#: ../src/bookmarks/ephy-bookmarks-ui.c:472
msgid "_View Properties"
msgstr "_Vis egenskaper"
-#: ../src/bookmarks/ephy-new-bookmark.c:329
-msgid "Duplicated Bookmark"
-msgstr "Duplisert bokmerke"
+#: ../src/bookmarks/ephy-bookmarks-ui.c:481
+msgid "Bookmark Exists"
+msgstr "Bokmerke eksisterer"
-#: ../src/bookmarks/ephy-bookmark-factory-action.c:316
-msgid "Quick Bookmark"
-msgstr "Hurtigbokmerke"
+#: ../src/bookmarks/ephy-bookmarks-ui.c:569
+#, c-format
+msgid ""
+"You already have a topic named “%s”.\n"
+"Please use a new topic name."
+msgstr ""
+"Du har allerede et emne med navn «%s».\n"
+"Vennligst bruk et nytt emnenavn."
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:610
+#, c-format
+msgid "New topic for “%s”"
+msgstr "Nytt emne for «%s»"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:624
+msgid "New topic"
+msgstr "Nytt emne"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:628
+msgid "Enter a unique name for the topic."
+msgstr "Oppgi et unikt navn for emnet."
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:660
+msgid "Create"
+msgstr "Opprett"
+
+#: ../src/bookmarks/ephy-bookmarks-ui.c:663
+msgid "New Topic"
+msgstr "Nytt emne"
#: ../src/bookmarks/ephy-open-tabs-action.c:64
msgid "Open in New _Tabs"
@@ -2781,6 +2900,30 @@ msgstr "Relatert"
msgid "Quick Topic"
msgstr "Hurtigemne"
+#: ../src/bookmarks/ephy-topics-palette.c:203
+msgid "No topics"
+msgstr "Ingen emner"
+
+#: ../src/bookmarks/ephy-topics-palette.c:273
+msgid "Selection"
+msgstr "Utvalg"
+
+#: ../src/bookmarks/ephy-topics-palette.c:273
+msgid "No selected topics"
+msgstr "Ingen emner valgt"
+
+#: ../src/bookmarks/ephy-topics-palette.c:274
+msgid "No more subtopics"
+msgstr "Ingen flere underemner"
+
+#: ../src/bookmarks/ephy-topics-palette.c:275
+msgid "Other"
+msgstr "Andre"
+
+#: ../src/bookmarks/ephy-topics-palette.c:275
+msgid "No other topics"
+msgstr "Ingen andre emner"
+
#: ../src/ephy-encoding-dialog.c:340
msgid "Encodings"
msgstr "Kodinger"
@@ -2805,23 +2948,27 @@ msgstr "Ikke funnet"
msgid "Wrapped"
msgstr "Brutt"
-#: ../src/ephy-find-toolbar.c:388
+#: ../src/ephy-find-toolbar.c:151
+msgid "Find links:"
+msgstr "Finn lenker:"
+
+#: ../src/ephy-find-toolbar.c:151
msgid "Find:"
msgstr "Finn:"
-#: ../src/ephy-find-toolbar.c:404 ../src/ephy-find-toolbar.c:405
+#: ../src/ephy-find-toolbar.c:399
msgid "Find Previous"
msgstr "Finn forrige"
-#: ../src/ephy-find-toolbar.c:408
+#: ../src/ephy-find-toolbar.c:402
msgid "Find previous occurrence of the search string"
msgstr "Finn forrige oppføring av søketeksten"
-#: ../src/ephy-find-toolbar.c:415 ../src/ephy-find-toolbar.c:416
+#: ../src/ephy-find-toolbar.c:409
msgid "Find Next"
msgstr "Finn neste"
-#: ../src/ephy-find-toolbar.c:419
+#: ../src/ephy-find-toolbar.c:412
msgid "Find next occurrence of the search string"
msgstr "Finn neste oppføring av søketeksten"
@@ -2896,60 +3043,60 @@ msgstr "Tømming av historikken vil fjerne alle lenker permanent."
msgid "Clear History"
msgstr "Tøm historikk"
-#: ../src/ephy-history-window.c:1042
+#: ../src/ephy-history-window.c:1030
msgid "Last 30 minutes"
msgstr "Siste 30 minutter"
-#: ../src/ephy-history-window.c:1043
+#: ../src/ephy-history-window.c:1031
msgid "Today"
msgstr "I dag"
#. keep this in sync with embed/ephy-history.c's HISTORY_PAGE_OBSOLETE_DAYS
-#: ../src/ephy-history-window.c:1044 ../src/ephy-history-window.c:1047
-#: ../src/ephy-history-window.c:1051
+#: ../src/ephy-history-window.c:1032 ../src/ephy-history-window.c:1035
+#: ../src/ephy-history-window.c:1039
#, c-format
msgid "Last %d day"
msgid_plural "Last %d days"
msgstr[0] "Siste %d dag"
msgstr[1] "Siste %d dager"
-#: ../src/ephy-history-window.c:1253
+#: ../src/ephy-history-window.c:1241
msgid "Sites"
msgstr "Nettsteder"
-#: ../src/ephy-main.c:59
+#: ../src/ephy-main.c:60
msgid "Open a new tab in an existing window"
msgstr "Åpne en ny fane i et eksisterende vindu"
-#: ../src/ephy-main.c:62
+#: ../src/ephy-main.c:63
msgid "Run in full screen mode"
msgstr "Kjør i fullskjermmodus"
-#: ../src/ephy-main.c:65
+#: ../src/ephy-main.c:66
msgid "Load the given session file"
msgstr "Last oppgitt sesjonsfil"
-#: ../src/ephy-main.c:66 ../src/ephy-main.c:72
+#: ../src/ephy-main.c:67 ../src/ephy-main.c:73
msgid "FILE"
msgstr "FIL"
-#: ../src/ephy-main.c:68
+#: ../src/ephy-main.c:69
msgid "Add a bookmark (don't open any window)"
msgstr "Legg til bokmerke (ikke åpne noen vinduer)"
-#: ../src/ephy-main.c:69
+#: ../src/ephy-main.c:70
msgid "URL"
msgstr "Adresse"
-#: ../src/ephy-main.c:71
+#: ../src/ephy-main.c:72
msgid "Import bookmarks from the given file"
msgstr "Importer bokmerker fra gitt fil"
-#: ../src/ephy-main.c:74
+#: ../src/ephy-main.c:75
msgid "Launch the bookmarks editor"
msgstr "Start redigering av bokmerker"
-#: ../src/ephy-notebook.c:1086
+#: ../src/ephy-notebook.c:1092
msgid "Close tab"
msgstr "Lukk fane"
@@ -2977,43 +3124,18 @@ msgstr "_Gjenopprett"
msgid "Crash Recovery"
msgstr "Krasjsikring"
-#: ../src/ephy-shell.c:217
+#: ../src/ephy-shell.c:216
msgid "Sidebar extension required"
msgstr "Sidelinjetillegg krevves"
-#: ../src/ephy-shell.c:219
+#: ../src/ephy-shell.c:218
msgid "Sidebar Extension Required"
msgstr "Sidelinjetillegg kreves"
-#: ../src/ephy-shell.c:223
+#: ../src/ephy-shell.c:222
msgid "The link you clicked needs the sidebar extension to be installed."
msgstr "Lenken du klikket på krever at sidelinjetillegget er installert."
-#: ../src/ephy-shell.c:453
-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 "
-"files."
-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:460
-msgid ""
-"Epiphany can't be used now, due to an unexpected error from Bonobo when "
-"attempting to register the automation server"
-msgstr ""
-"Epiphany kan ikke brukes nå pga en uvetet feil fra Bonobo ved forsøk på å "
-"registrere automasjonstjeneren"
-
-#: ../src/ephy-shell.c:477
-msgid ""
-"Epiphany can't be used now, due to an unexpected error from Bonobo when "
-"attempting to locate the automation object."
-msgstr ""
-"Epiphany kan ikke brukes nå pga en uventet feil fra Bonobo ved forsøk på å "
-"laste automasjonsobjektet."
-
#: ../src/ephy-tab.c:481 ../src/ephy-tab.c:2264 ../src/ephy-tab.c:2299
msgid "Blank page"
msgstr "Tom side"
@@ -3570,103 +3692,121 @@ msgstr "Br_uk bilde som bakgrunn"
msgid "Copy I_mage Address"
msgstr "Ko_pier adressen til bildet"
-#: ../src/ephy-window.c:701
+#: ../src/ephy-window.c:351
+msgid "St_art Animation"
+msgstr "St_art animasjon"
+
+#: ../src/ephy-window.c:353
+msgid "St_op Animation"
+msgstr "St_opp animasjon"
+
+#: ../src/ephy-window.c:707
msgid "There are unsubmitted changes to form elements"
msgstr "Det finnes endringer i skjemaet som ikke er sendt"
-#: ../src/ephy-window.c:705
+#: ../src/ephy-window.c:711
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:709
+#: ../src/ephy-window.c:715
msgid "Close _Document"
msgstr "Lukk _dokument"
-#: ../src/ephy-window.c:1276 ../src/window-commands.c:295
+#: ../src/ephy-window.c:1285 ../src/window-commands.c:279
msgid "Open"
msgstr "Åpne"
-#: ../src/ephy-window.c:1278 ../src/window-commands.c:321
+#: ../src/ephy-window.c:1287 ../src/window-commands.c:305
msgid "Save As"
msgstr "Lagre som"
-#: ../src/ephy-window.c:1282
+#: ../src/ephy-window.c:1291
msgid "Bookmark"
msgstr "Bokmerke"
-#: ../src/ephy-window.c:1284
+#: ../src/ephy-window.c:1293
msgid "Find"
msgstr "Finn"
-#: ../src/ephy-window.c:1457
+#. Translators: This refers to text size
+#: ../src/ephy-window.c:1306
+msgid "Larger"
+msgstr "Større"
+
+#. Translators: This refers to text size
+#: ../src/ephy-window.c:1309
+msgid "Smaller"
+msgstr "Mindre"
+
+#: ../src/ephy-window.c:1472
msgid "Insecure"
msgstr "Usikker"
-#: ../src/ephy-window.c:1462
+#: ../src/ephy-window.c:1477
msgid "Broken"
msgstr "Ødelagt"
-#: ../src/ephy-window.c:1475
+#: ../src/ephy-window.c:1490
msgid "Low"
msgstr "Lav"
-#: ../src/ephy-window.c:1482
+#: ../src/ephy-window.c:1497
msgid "High"
msgstr "Høy"
-#: ../src/ephy-window.c:1492
+#: ../src/ephy-window.c:1507
#, c-format
msgid "Security level: %s"
msgstr "Sikkerhetsnivå: %s"
-#: ../src/ephy-window.c:1532
+#: ../src/ephy-window.c:1547
#, c-format
msgid "%d hidden popup window"
msgid_plural "%d hidden popup windows"
msgstr[0] "%d skjult sprettoppvindu"
msgstr[1] "%d skjulte sprettoppvinduer"
-#: ../src/ephy-window.c:1827
+#: ../src/ephy-window.c:1842
#, c-format
msgid "Open image “%s”"
msgstr "Åpne bilde «%s»"
-#: ../src/ephy-window.c:1832
+#: ../src/ephy-window.c:1847
#, c-format
msgid "Use as desktop background “%s”"
msgstr "Bruk som bakgrunn på skrivebordet «%s»"
-#: ../src/ephy-window.c:1837
+#: ../src/ephy-window.c:1852
#, c-format
msgid "Save image “%s”"
msgstr "Lagre bilde «%s»"
-#: ../src/ephy-window.c:1842
+#: ../src/ephy-window.c:1857
#, c-format
msgid "Copy image address “%s”"
msgstr "Kopier adressen til bildet «%s»"
-#: ../src/ephy-window.c:1855
+#: ../src/ephy-window.c:1870
#, c-format
msgid "Send email to address “%s”"
msgstr "Send e-post til adresse «%s»"
-#: ../src/ephy-window.c:1861
+#: ../src/ephy-window.c:1876
#, c-format
msgid "Copy email address “%s”"
msgstr "Kopier e-postadresse «%s»"
-#: ../src/ephy-window.c:1873
+#: ../src/ephy-window.c:1888
#, c-format
msgid "Save link “%s”"
msgstr "Lagre lenke «%s»"
-#: ../src/ephy-window.c:1879
+#: ../src/ephy-window.c:1894
#, c-format
msgid "Bookmark link “%s”"
msgstr "Lag bokmerke av lenke «%s»"
-#: ../src/ephy-window.c:1885
+#: ../src/ephy-window.c:1900
#, c-format
msgid "Copy link's address “%s”"
msgstr "Kopier lenkens adresse «%s»"
@@ -3724,15 +3864,15 @@ msgstr "Brukernavn"
msgid "User Password"
msgstr "Brukerpassord"
-#: ../src/popup-commands.c:239
+#: ../src/popup-commands.c:232
msgid "Download Link"
msgstr "Last ned lenke"
-#: ../src/popup-commands.c:247
+#: ../src/popup-commands.c:240
msgid "Save Link As"
msgstr "Lagre lenke som"
-#: ../src/popup-commands.c:254
+#: ../src/popup-commands.c:247
msgid "Save Image As"
msgstr "Lagre bilde som"
@@ -3784,7 +3924,7 @@ msgstr "Lukk forhåndsvisning av utskrift"
#.
#. Translators: The text before the "|" is context to help you decide on
#. * the correct translation. You MUST OMIT it in the translated string.
-#: ../src/prefs-dialog.c:729 ../src/prefs-dialog.c:737
+#: ../src/prefs-dialog.c:993 ../src/prefs-dialog.c:1001
#, c-format
msgid "language|%s (%s)"
msgstr "%s (%s)"
@@ -3794,39 +3934,39 @@ msgstr "%s (%s)"
#. * Translators: this refers to a user-define language code
#. * (one which isn't in our built-in list).
#.
-#: ../src/prefs-dialog.c:748
+#: ../src/prefs-dialog.c:1012
#, c-format
msgid "language|User defined (%s)"
msgstr "Brukerdefinert (%s)"
-#: ../src/prefs-dialog.c:770
+#: ../src/prefs-dialog.c:1034
#, c-format
msgid "System language (%s)"
msgid_plural "System languages (%s)"
msgstr[0] "Systemspråk [%s]"
msgstr[1] "Systemspråk [%s]"
-#: ../src/prefs-dialog.c:1157
+#: ../src/prefs-dialog.c:1421
msgid "Select a Directory"
msgstr "Velg en katalog"
-#: ../src/window-commands.c:726 ../src/window-commands.c:743
+#: ../src/window-commands.c:710 ../src/window-commands.c:727
msgid "Contact us at:"
msgstr "Kontakt oss her:"
-#: ../src/window-commands.c:729
+#: ../src/window-commands.c:713
msgid "Contributors:"
msgstr "Bidragsytere:"
-#: ../src/window-commands.c:734
+#: ../src/window-commands.c:718
msgid "Past developers:"
msgstr "Tidligere utviklere:"
-#: ../src/window-commands.c:744
+#: ../src/window-commands.c:728
msgid "<epiphany-list@gnome.org> or <gnome-doc-list@gnome.org>"
msgstr "<epiphany-list@gnome.org> eller <gnome-doc-list@gnome.org>"
-#: ../src/window-commands.c:749
+#: ../src/window-commands.c:733
msgid "GNOME Web Browser"
msgstr "GNOME Nettleser"
@@ -3838,10 +3978,10 @@ msgstr "GNOME Nettleser"
#. * this translation; in that case, please write each of them on a separate
#. * line seperated by newlines (\n).
#.
-#: ../src/window-commands.c:763
+#: ../src/window-commands.c:747
msgid "translator-credits"
msgstr "Kjartan Maraas <kmaraas@gnome.org>"
-#: ../src/window-commands.c:766
+#: ../src/window-commands.c:750
msgid "GNOME Web Browser Website"
msgstr "Nettsted for GNOME Nettleser"