path: root/libre/epiphany-libre/git-fixes.patch

diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 1122eaf..ddaae74 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -123,6 +123,9 @@ ephy_embed_shell_find_web_extension (EphyEmbedShell *shell,
 
   l = g_list_find_custom (shell->priv->web_extensions, name_owner, (GCompareFunc)web_extension_compare);
 
+  if (!l)
+    g_warning ("Could not find extension with name owner `%s´.", name_owner);
+
   return l ? EPHY_WEB_EXTENSION_PROXY (l->data) : NULL;
 }
 
diff --git a/embed/uri-tester.c b/embed/uri-tester.c
index ab701c4..eebd7b6 100644
--- a/embed/uri-tester.c
+++ b/embed/uri-tester.c
@@ -50,6 +50,11 @@ struct _UriTesterPrivate
 
   GString *blockcss;
   GString *blockcssprivate;
+
+  GRegex *regex_third_party;
+  GRegex *regex_pattern;
+  GRegex *regex_subdocument;
+  GRegex *regex_frame_add;
 };
 
 enum
@@ -66,7 +71,7 @@ G_DEFINE_TYPE (UriTester, uri_tester, G_TYPE_OBJECT)
 static GString *
 uri_tester_fixup_regexp (const char *prefix, char *src);
 
-static gboolean
+static void
 uri_tester_parse_file_at_uri (UriTester *tester, const char *fileuri);
 
 static char *
@@ -303,8 +308,7 @@ uri_tester_check_rule (UriTester  *tester,
     return FALSE;
 
   opts = g_hash_table_lookup (tester->priv->optslist, patt);
-  if (opts && g_regex_match_simple (",third-party", opts,
-                                    G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY))
+  if (opts && g_regex_match (tester->priv->regex_third_party, opts, 0, NULL))
     {
       if (page_uri && g_regex_match_full (regex, page_uri, -1, 0, 0, NULL, NULL))
         return FALSE;
@@ -459,7 +463,7 @@ uri_tester_fixup_regexp (const char *prefix, char *src)
   return str;
 }
 
-static gboolean
+static void
 uri_tester_compile_regexp (UriTester *tester,
                            GString   *gpatt,
                            char      *opts)
@@ -470,7 +474,7 @@ uri_tester_compile_regexp (UriTester *tester,
   int len;
 
   if (!gpatt)
-    return FALSE;
+    return;
 
   patt = gpatt->str;
   len = gpatt->len;
@@ -482,10 +486,10 @@ uri_tester_compile_regexp (UriTester *tester,
     {
       g_warning ("%s: %s", G_STRFUNC, error->message);
       g_error_free (error);
-      return TRUE;
+      return;
     }
 
-  if (!g_regex_match_simple ("^/.*[\\^\\$\\*].*/$", patt, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY))
+  if (!g_regex_match (tester->priv->regex_pattern, patt, 0, NULL))
     {
       int signature_count = 0;
       int pos = 0;
@@ -493,7 +497,7 @@ uri_tester_compile_regexp (UriTester *tester,
 
       for (pos = len - SIGNATURE_SIZE; pos >= 0; pos--) {
         sig = g_strndup (patt + pos, SIGNATURE_SIZE);
-        if (!g_regex_match_simple ("[\\*]", sig, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY) &&
+        if (!strchr (sig, '*') &&
             !g_hash_table_lookup (tester->priv->keys, sig))
           {
             LOG ("sig: %s %s", sig, patt);
@@ -503,7 +507,7 @@ uri_tester_compile_regexp (UriTester *tester,
           }
         else
           {
-            if (g_regex_match_simple ("^\\*", sig, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY) &&
+            if (sig[0] == '*' &&
                 !g_hash_table_lookup (tester->priv->pattern, patt))
               {
                 LOG ("patt2: %s %s", sig, patt);
@@ -516,12 +520,7 @@ uri_tester_compile_regexp (UriTester *tester,
       g_regex_unref (regex);
 
       if (signature_count > 1 && g_hash_table_lookup (tester->priv->pattern, patt))
-        {
-          g_hash_table_steal (tester->priv->pattern, patt);
-          return TRUE;
-        }
-
-      return FALSE;
+        g_hash_table_steal (tester->priv->pattern, patt);
     }
   else
     {
@@ -529,11 +528,10 @@ uri_tester_compile_regexp (UriTester *tester,
       /* Pattern is a regexp chars */
       g_hash_table_insert (tester->priv->pattern, g_strdup (patt), regex);
       g_hash_table_insert (tester->priv->optslist, g_strdup (patt), g_strdup (opts));
-      return FALSE;
     }
 }
 
-static char*
+static void
 uri_tester_add_url_pattern (UriTester *tester,
                             char      *prefix,
                             char      *type,
@@ -543,13 +541,12 @@ uri_tester_add_url_pattern (UriTester *tester,
     char *patt;
     GString *format_patt;
     char *opts;
-    gboolean should_free;
 
     data = g_strsplit (line, "$", -1);
     if (!data || !data[0])
     {
         g_strfreev (data);
-        return NULL;
+        return;
     }
 
     if (data[1] && data[2])
@@ -568,21 +565,20 @@ uri_tester_add_url_pattern (UriTester *tester,
         opts = type;
     }
 
-    if (g_regex_match_simple ("subdocument", opts,
-                              G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY))
+    if (g_regex_match (tester->priv->regex_subdocument, opts, 0, NULL))
     {
         if (data[1] && data[2])
             g_free (patt);
         if (data[1])
             g_free (opts);
         g_strfreev (data);
-        return NULL;
+        return;
     }
 
     format_patt = uri_tester_fixup_regexp (prefix, patt);
 
     LOG ("got: %s opts %s", format_patt->str, opts);
-    should_free = uri_tester_compile_regexp (tester, format_patt, opts);
+    uri_tester_compile_regexp (tester, format_patt, opts);
 
     if (data[1] && data[2])
         g_free (patt);
@@ -590,7 +586,7 @@ uri_tester_add_url_pattern (UriTester *tester,
         g_free (opts);
     g_strfreev (data);
 
-    return g_string_free (format_patt, should_free);
+    g_string_free (format_patt, TRUE);
 }
 
 static inline void
@@ -602,8 +598,7 @@ uri_tester_frame_add (UriTester *tester, char *line)
   (void)*line++;
   if (strchr (line, '\'')
       || (strchr (line, ':')
-          && !g_regex_match_simple (".*\\[.*:.*\\].*", line,
-                                    G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY)))
+          && !g_regex_match (tester->priv->regex_frame_add, line, 0, NULL)))
     {
       return;
     }
@@ -622,8 +617,7 @@ uri_tester_frame_add_private (UriTester  *tester,
   if (!(data[1] && *data[1])
       ||  strchr (data[1], '\'')
       || (strchr (data[1], ':')
-          && !g_regex_match_simple (".*\\[.*:.*\\].*", data[1],
-                                    G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY)))
+          && !g_regex_match (tester->priv->regex_frame_add, data[1], 0, NULL)))
     {
       g_strfreev (data);
       return;
@@ -650,87 +644,129 @@ uri_tester_frame_add_private (UriTester  *tester,
   g_strfreev (data);
 }
 
-static char*
+static void
 uri_tester_parse_line (UriTester *tester, char *line)
 {
   if (!line)
-    return NULL;
+    return;
+
   g_strchomp (line);
   /* Ignore comments and new lines */
   if (line[0] == '!')
-    return NULL;
+    return;
   /* FIXME: No support for whitelisting */
   if (line[0] == '@' && line[1] == '@')
-    return NULL;
+    return;
   /* FIXME: No support for [include] and [exclude] tags */
   if (line[0] == '[')
-    return NULL;
+    return;
   /* FIXME: No support for domain= */
   if (strstr (line, "domain="))
-    return NULL;
+    return;
 
   /* Skip garbage */
   if (line[0] == ' ' || !line[0])
-    return NULL;
+    return;
 
   /* Got CSS block hider */
   if (line[0] == '#' && line[1] == '#' )
     {
       uri_tester_frame_add (tester, line);
-      return NULL;
+      return;
     }
   /* Got CSS block hider. Workaround */
   if (line[0] == '#')
-    return NULL;
+    return;
 
   /* Got per domain CSS hider rule */
   if (strstr (line, "##"))
     {
       uri_tester_frame_add_private (tester, line, "##");
-      return NULL;
+      return;
     }
 
   /* Got per domain CSS hider rule. Workaround */
   if (strchr (line, '#'))
     {
       uri_tester_frame_add_private (tester, line, "#");
-      return NULL;
+      return;
     }
   /* Got URL blocker rule */
   if (line[0] == '|' && line[1] == '|' )
     {
       (void)*line++;
       (void)*line++;
-      return uri_tester_add_url_pattern (tester, "", "fulluri", line);
+      uri_tester_add_url_pattern (tester, "", "fulluri", line);
+      return;
     }
   if (line[0] == '|')
     {
       (void)*line++;
-      return uri_tester_add_url_pattern (tester, "^", "fulluri", line);
+      uri_tester_add_url_pattern (tester, "^", "fulluri", line);
+      return;
     }
-  return uri_tester_add_url_pattern (tester, "", "uri", line);
+  uri_tester_add_url_pattern (tester, "", "uri", line);
 }
 
-static gboolean
-uri_tester_parse_file_at_uri (UriTester *tester, const char *fileuri)
+static void
+file_parse_cb (GDataInputStream *stream, GAsyncResult *result, UriTester *tester)
 {
-  FILE *file;
-  char line[2000];
-  char *path = NULL;
-  gboolean result = FALSE;
-
-  path = g_filename_from_uri (fileuri, NULL, NULL);
-  if ((file = g_fopen (path, "r")))
-    {
-      while (fgets (line, 2000, file))
-        g_free (uri_tester_parse_line (tester, line));
-      fclose (file);
+  char *line;
+  GError *error = NULL;
 
-      result = TRUE;
+  line = g_data_input_stream_read_line_finish (stream, result, NULL, &error);
+  if (!line) {
+    if (error) {
+      LOG ("Error parsing file: %s\n", error->message);
+      g_error_free (error);
     }
-  g_free (path);
 
-  return result;
+    return;
+  }
+
+  uri_tester_parse_line (tester, line);
+  g_free (line);
+
+  g_data_input_stream_read_line_async (stream, G_PRIORITY_DEFAULT_IDLE, NULL,
+                                       (GAsyncReadyCallback)file_parse_cb, tester);
+}
+
+static void
+file_read_cb (GFile *file, GAsyncResult *result, UriTester *tester)
+{
+  GFileInputStream *stream;
+  GDataInputStream *data_stream;
+  GError *error = NULL;
+
+  stream = g_file_read_finish (file, result, &error);
+  if (!stream) {
+    char *path;
+
+    path = g_file_get_path (file);
+    LOG ("Error opening file %s for parsing: %s\n", path, error->message);
+    g_free (path);
+    g_error_free (error);
+
+    return;
+  }
+
+  data_stream = g_data_input_stream_new (G_INPUT_STREAM (stream));
+  g_object_unref (stream);
+
+  g_data_input_stream_read_line_async (data_stream, G_PRIORITY_DEFAULT_IDLE, NULL,
+                                       (GAsyncReadyCallback)file_parse_cb, tester);
+  g_object_unref (data_stream);
+}
+
+static void
+uri_tester_parse_file_at_uri (UriTester *tester, const char *fileuri)
+{
+  GFile *file;
+  GFileInputStream *stream;
+
+  file = g_file_new_for_uri (fileuri);
+  g_file_read_async (file, G_PRIORITY_DEFAULT_IDLE, NULL, (GAsyncReadyCallback)file_read_cb, tester);
+  g_object_unref (file);
 }
 
 static void
@@ -759,6 +795,23 @@ uri_tester_init (UriTester *tester)
 
   priv->blockcss = g_string_new ("z-non-exist");
   priv->blockcssprivate = g_string_new ("");
+
+  priv->regex_third_party = g_regex_new (",third-party",
+                                         G_REGEX_CASELESS | G_REGEX_OPTIMIZE,
+                                         G_REGEX_MATCH_NOTEMPTY,
+                                         NULL);
+  priv->regex_pattern = g_regex_new ("^/.*[\\^\\$\\*].*/$",
+                                     G_REGEX_UNGREEDY | G_REGEX_OPTIMIZE,
+                                     G_REGEX_MATCH_NOTEMPTY,
+                                     NULL);
+  priv->regex_subdocument = g_regex_new ("subdocument",
+                                         G_REGEX_CASELESS | G_REGEX_OPTIMIZE,
+                                         G_REGEX_MATCH_NOTEMPTY,
+                                         NULL);
+  priv->regex_frame_add = g_regex_new (".*\\[.*:.*\\].*",
+                                       G_REGEX_CASELESS | G_REGEX_OPTIMIZE,
+                                       G_REGEX_MATCH_NOTEMPTY,
+                                       NULL);
 }
 
 static void
@@ -813,6 +866,11 @@ uri_tester_finalize (GObject *object)
   g_string_free (priv->blockcss, TRUE);
   g_string_free (priv->blockcssprivate, TRUE);
 
+  g_regex_unref (priv->regex_third_party);
+  g_regex_unref (priv->regex_pattern);
+  g_regex_unref (priv->regex_subdocument);
+  g_regex_unref (priv->regex_frame_add);
+
   G_OBJECT_CLASS (uri_tester_parent_class)->finalize (object);
 }
 
diff --git a/embed/web-extension/ephy-web-extension-main.c b/embed/web-extension/ephy-web-extension-main.c
index 2e82cd0..13076bc 100644
--- a/embed/web-extension/ephy-web-extension-main.c
+++ b/embed/web-extension/ephy-web-extension-main.c
@@ -26,9 +26,9 @@
 #include "ephy-file-helpers.h"
 
 static void
-bus_acquired_cb (GDBusConnection *connection,
-                 const char *name,
-                 EphyWebExtension *extension)
+name_acquired_cb (GDBusConnection *connection,
+                  const char *name,
+                  EphyWebExtension *extension)
 {
   ephy_web_extension_dbus_register (extension, connection);
 }
@@ -60,8 +60,9 @@ webkit_web_extension_initialize_with_user_data (WebKitWebExtension *extension,
   g_bus_own_name (G_BUS_TYPE_SESSION,
                   service_name,
                   G_BUS_NAME_OWNER_FLAGS_NONE,
-                  (GBusNameAcquiredCallback)bus_acquired_cb,
-                  NULL, NULL,
+                  NULL,
+                  (GBusNameAcquiredCallback)name_acquired_cb,
+                  NULL,
                   web_extension, NULL);
   g_free (service_name);
 }
diff --git a/help/C/keyboard-shortcut.page b/help/C/keyboard-shortcut.page
new file mode 100644
index 0000000..d0b8ff8
--- /dev/null
+++ b/help/C/keyboard-shortcut.page
@@ -0,0 +1,391 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" style="task"
+      id="keyboard-shortcut">
+
+  <info>
+    <link type="guide" xref="index#start" group="#first"/>
+    <revision pkgversion="3.13" date="2014-05-29" status="review"/>
+
+    <credit type="author copyright">
+      <name>Siyu Yang</name>
+      <email its:translate="no">yangsiyu1992@gmail.com</email>
+      <years>2014</years>
+    </credit>
+<!--    <credit type="copyright editor">
+      <name></name>
+      <email its:translate="no"></email>
+      <years></years>
+    </credit>-->
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
+    <desc>Browsing the web by using keyboard shortcuts.</desc>
+  </info>
+
+  <title>Keyboard shortcuts</title>
+
+  <p>Multiple keyboard shortcuts can be used to complete tasks when browsing
+  the web. They are listed below:</p>
+
+  <table rules="rows" frame="top bottom">
+    <thead>
+      <tr>
+        <td>
+          <p>Action</p>
+        </td>
+        <td>
+          <p>Shortcut</p>
+        </td>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>
+          <p>New window</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>N</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>New incognito window</p>
+        </td>
+        <td>
+          <p><keyseq><key>Shift</key><key>Ctrl</key><key>N</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Open</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>O</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Save as</p>
+        </td>
+        <td>
+          <p><keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Save as web application</p>
+        </td>
+        <td>
+          <p><keyseq><key>Shift</key><key>Ctrl</key><key>A</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Print</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>P</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Close tab</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>W</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Quit</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>Q</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Undo</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>Z</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Redo</p>
+        </td>
+        <td>
+          <p><keyseq><key>Shift</key><key>Ctrl</key><key>Z</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Cut</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>X</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Copy</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>C</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Paste</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>V</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Select all</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>A</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Find</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>F</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Find next</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>G</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Find previous</p>
+        </td>
+        <td>
+          <p><keyseq><key>Shift</key><key>Ctrl</key><key>G</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Edit bookmarks</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>B</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>History</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>H</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Preferences</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>E</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Stop</p>
+        </td>
+        <td>
+          <p><keyseq><key>Escape</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Reload</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>R</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Zoom in</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>+</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Zoom out</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>-</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Normal size</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>0</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Page source</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>U</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Add bookmark</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>D</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Location</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>L</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Previous tab</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>PgUp</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Next tab</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>PgDn</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Previous tab</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>PgUp</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Next tab</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>PgDn</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Move tab left</p>
+        </td>
+        <td>
+          <p><keyseq><key>Shift</key><key>Ctrl</key><key>PgUp</key>
+          </keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Move tab right</p>
+        </td>
+        <td>
+          <p><keyseq><key>Shift</key><key>Ctrl</key><key>PgDn</key>
+          </keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Fullscreen</p>
+        </td>
+        <td>
+          <p><keyseq><key>F11</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Selection caret</p>
+        </td>
+        <td>
+          <p><keyseq><key>F7</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Page menu</p>
+        </td>
+        <td>
+          <p><keyseq><key>F10</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>File home</p>
+        </td>
+        <td>
+          <p><keyseq><key>Home</key><key>Alt</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>File save as</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>S</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Go location</p>
+        </td>
+        <td>
+          <p><keyseq><key>Ctrl</key><key>L</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>View reload</p>
+        </td>
+        <td>
+          <p><keyseq><key>F5</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Navigation back</p>
+        </td>
+        <td>
+          <p><keyseq><key>Alt</key><key>Left</key></keyseq></p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Navigation forward</p>
+        </td>
+        <td>
+          <p><keyseq><key>Alt</key><key>Right</key></keyseq></p>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</page>
diff --git a/help/Makefile.am b/help/Makefile.am
index cf32a7d..1477a06 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -21,6 +21,7 @@ HELP_FILES = \
 	data-passwords.page \
 	history.page \
 	history-delete.page \
+	keyboard-shortcut.page \
 	pref.page \
 	pref-cookies.page \
 	pref-css.page \
diff --git a/help/hu/hu.po b/help/hu/hu.po
index cc9d4bd..ebb13b7 100644
--- a/help/hu/hu.po
+++ b/help/hu/hu.po
@@ -4,26 +4,28 @@
 #
 # Attila Hammer <hammera at pickup dot hu>, 2014.
 # Gabor Kelemen <kelemeng at gnome dot hu>, 2013, 2014.
+# Balázs Úr <urbalazs@gmail.com>, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: epiphany_help master\n"
-"POT-Creation-Date: 2014-03-24 16:41+0000\n"
-"PO-Revision-Date: 2014-03-24 21:49+0100\n"
-"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
+"POT-Creation-Date: 2014-07-22 03:31+0000\n"
+"PO-Revision-Date: 2014-07-22 10:58+0200\n"
+"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <openscope at googlegroups dot com>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 1.2\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 "Hammer Attila <hammera at pickup dot hu>, 2014.\n"
-"Kelemen Gábor <kelemeng at gnome dot hu>, 2013."
+"Kelemen Gábor <kelemeng at gnome dot hu>, 2013.\n"
+"Úr Balázs <urbalazs at gnome dot com>, 2014."
 
 #. (itstool) path: info/title
 #: C/index.page:8
@@ -796,9 +798,9 @@ msgid "Baptiste Mille-Mathias"
 msgstr "Baptiste Mille-Mathias"
 
 #. (itstool) path: credit/years
-#: C/data-cookies.page:18 C/data-passwords.page:26 C/pref-do-not-track.page:14
-#: C/pref-do-not-track.page:19 C/prob-restore-closed-page.page:13
-#: C/prob-restore-closed-page.page:18
+#: C/data-cookies.page:18 C/data-passwords.page:26 C/keyboard-shortcut.page:13
+#: C/pref-do-not-track.page:14 C/pref-do-not-track.page:19
+#: C/prob-restore-closed-page.page:13 C/prob-restore-closed-page.page:18
 msgid "2014"
 msgstr "2014"
 
@@ -1086,6 +1088,449 @@ msgstr ""
 "gui><gui style=\"menuitem\">Előzmények törlése</gui></guiseq> menüpont "
 "kiválasztásával."
 
+#. (itstool) path: credit/name
+#: C/keyboard-shortcut.page:11
+msgid "Siyu Yang"
+msgstr "Siyu Yang"
+
+#. (itstool) path: info/desc
+#: C/keyboard-shortcut.page:23
+msgid "Browsing the web by using keyboard shortcuts."
+msgstr "A web böngészése gyorsbillentyűk használatával."
+
+#. (itstool) path: page/title
+#: C/keyboard-shortcut.page:26
+msgid "Keyboard shortcuts"
+msgstr "Gyorsbillentyűk"
+
+#. (itstool) path: page/p
+#: C/keyboard-shortcut.page:28
+msgid ""
+"Multiple keyboard shortcuts can be used to complete tasks when browsing the "
+"web. They are listed below:"
+msgstr ""
+"A web böngészésekor több gyorsbillentyű használható a feladatok "
+"elvégzéséhez. Ezek listája a követező:"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:35
+msgid "Action"
+msgstr "Művelet"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:38
+msgid "Shortcut"
+msgstr "Gyorsbillentyű"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:45
+msgid "New window"
+msgstr "Új ablak"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:48
+msgid "<keyseq><key>Ctrl</key><key>N</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>N</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:53
+msgid "New incognito window"
+msgstr "Új inkognitó ablak"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:56
+msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>N</key></keyseq>"
+msgstr "<keyseq><key>Shift</key><key>Ctrl</key><key>N</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:61
+msgid "Open"
+msgstr "Megnyitás"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:64
+msgid "<keyseq><key>Ctrl</key><key>O</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>O</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:69
+msgid "Save as"
+msgstr "Mentés másként"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:72
+msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq>"
+msgstr "<keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:77
+#| msgid "Create a Web Application"
+msgid "Save as web application"
+msgstr "Mentés webalkalmazásként"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:80
+msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>A</key></keyseq>"
+msgstr "<keyseq><key>Shift</key><key>Ctrl</key><key>A</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:85
+msgid "Print"
+msgstr "Nyomtatás"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:88
+msgid "<keyseq><key>Ctrl</key><key>P</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>P</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:93
+msgid "Close tab"
+msgstr "Lap bezárása"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:96
+msgid "<keyseq><key>Ctrl</key><key>W</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>W</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:101
+msgid "Quit"
+msgstr "Kilépés"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:104
+msgid "<keyseq><key>Ctrl</key><key>Q</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>Q</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:109
+msgid "Undo"
+msgstr "Visszavonás"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:112
+msgid "<keyseq><key>Ctrl</key><key>Z</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>Z</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:117
+msgid "Redo"
+msgstr "Újra"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:120
+msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>Z</key></keyseq>"
+msgstr "<keyseq><key>Shift</key><key>Ctrl</key><key>Z</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:125
+msgid "Cut"
+msgstr "Kivágás"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:128
+msgid "<keyseq><key>Ctrl</key><key>X</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>X</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:133
+msgid "Copy"
+msgstr "Másolás"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:136
+msgid "<keyseq><key>Ctrl</key><key>C</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>C</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:141
+msgid "Paste"
+msgstr "Beillesztés"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:144
+msgid "<keyseq><key>Ctrl</key><key>V</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>V</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:149
+msgid "Select all"
+msgstr "Összes kijelölése"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:152
+msgid "<keyseq><key>Ctrl</key><key>A</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>A</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:157
+msgid "Find"
+msgstr "Keresés"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:160
+msgid "<keyseq><key>Ctrl</key><key>F</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>F</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:165
+msgid "Find next"
+msgstr "Következő keresése"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:168
+msgid "<keyseq><key>Ctrl</key><key>G</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>G</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:173
+msgid "Find previous"
+msgstr "Előző keresése"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:176
+msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>G</key></keyseq>"
+msgstr "<keyseq><key>Shift</key><key>Ctrl</key><key>G</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:181
+#| msgid "Smart bookmarks"
+msgid "Edit bookmarks"
+msgstr "Könyvjelzők szerkesztése"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:184
+msgid "<keyseq><key>Ctrl</key><key>B</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>B</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:189
+msgid "History"
+msgstr "Előzmények"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:192
+msgid "<keyseq><key>Ctrl</key><key>H</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>H</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:197
+msgid "Preferences"
+msgstr "Beállítások"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:200
+msgid "<keyseq><key>Ctrl</key><key>E</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>E</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:205
+msgid "Stop"
+msgstr "Leállítás"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:208
+msgid "<keyseq><key>Escape</key></keyseq>"
+msgstr "<keyseq><key>Escape</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:213
+msgid "Reload"
+msgstr "Újratöltés"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:216
+msgid "<keyseq><key>Ctrl</key><key>R</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>R</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:221
+msgid "Zoom in"
+msgstr "Nagyítás"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:224
+msgid "<keyseq><key>Ctrl</key><key>+</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>+</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:229
+msgid "Zoom out"
+msgstr "Kicsinyítés"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:232
+msgid "<keyseq><key>Ctrl</key><key>-</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>-</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:237
+msgid "Normal size"
+msgstr "Normál méret"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:240
+msgid "<keyseq><key>Ctrl</key><key>0</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>0</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:245
+msgid "Page source"
+msgstr "Oldal forrása"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:248
+msgid "<keyseq><key>Ctrl</key><key>U</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>U</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:253
+#| msgid "Add a smart bookmark"
+msgid "Add bookmark"
+msgstr "Könyvjelző hozzáadása"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:256
+msgid "<keyseq><key>Ctrl</key><key>D</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>D</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:261
+#| msgid "Introduction"
+msgid "Location"
+msgstr "Hely"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:264 C/keyboard-shortcut.page:362
+msgid "<keyseq><key>Ctrl</key><key>L</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>L</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:269 C/keyboard-shortcut.page:285
+msgid "Previous tab"
+msgstr "Előző lap"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:272 C/keyboard-shortcut.page:288
+msgid "<keyseq><key>Ctrl</key><key>PgUp</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>PgUp</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:277 C/keyboard-shortcut.page:293
+msgid "Next tab"
+msgstr "Következő lap"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:280 C/keyboard-shortcut.page:296
+msgid "<keyseq><key>Ctrl</key><key>PgDn</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>PgDn</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:301
+msgid "Move tab left"
+msgstr "Lap mozgatása balra"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:304
+msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>PgUp</key> </keyseq>"
+msgstr "<keyseq><key>Shift</key><key>Ctrl</key><key>PgUp</key> </keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:310
+msgid "Move tab right"
+msgstr "Lap mozgatása jobbra"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:313
+msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>PgDn</key> </keyseq>"
+msgstr "<keyseq><key>Shift</key><key>Ctrl</key><key>PgDn</key> </keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:319
+msgid "Fullscreen"
+msgstr "Teljes képernyő"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:322
+msgid "<keyseq><key>F11</key></keyseq>"
+msgstr "<keyseq><key>F11</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:327
+msgid "Selection caret"
+msgstr "Kijelölő kurzor"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:330
+msgid "<keyseq><key>F7</key></keyseq>"
+msgstr "<keyseq><key>F7</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:335
+msgid "Page menu"
+msgstr "Oldal menü"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:338
+msgid "<keyseq><key>F10</key></keyseq>"
+msgstr "<keyseq><key>F10</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:343
+msgid "File home"
+msgstr "Áttekintő nézet"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:346
+msgid "<keyseq><key>Home</key><key>Alt</key></keyseq>"
+msgstr "<keyseq><key>Home</key><key>Alt</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:351
+msgid "File save as"
+msgstr "Fájl mentése másként"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:354
+msgid "<keyseq><key>Ctrl</key><key>S</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>S</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:359
+msgid "Go location"
+msgstr "Ugrás helyre"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:367
+msgid "View reload"
+msgstr "Nézet újratöltése"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:370
+msgid "<keyseq><key>F5</key></keyseq>"
+msgstr "<keyseq><key>F5</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:375
+msgid "Navigation back"
+msgstr "Navigáció vissza"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:378
+msgid "<keyseq><key>Alt</key><key>Left</key></keyseq>"
+msgstr "<keyseq><key>Alt</key><key>Left</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:383
+msgid "Navigation forward"
+msgstr "Navigáció előre"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcut.page:386
+msgid "<keyseq><key>Alt</key><key>Right</key></keyseq>"
+msgstr "<keyseq><key>Alt</key><key>Right</key></keyseq>"
+
 #. (itstool) path: page/title
 #: C/pref.page:24
 msgid "<app>Web</app> preferences"
diff --git a/lib/ephy-uri-helpers.c b/lib/ephy-uri-helpers.c
index 2697dfa..aa8c2d2 100644
--- a/lib/ephy-uri-helpers.c
+++ b/lib/ephy-uri-helpers.c
@@ -32,19 +32,19 @@
  * URI related functions, including functions to clean up URI.
  */
 
-/* QueryItem holds a query parameter name/value pair. The name is unescaped in
- * query_decode() with form_decode(), the value is not altered. */
+/* QueryItem holds the decoded name for each parameter, as well as the untouched
+ * name/value pair. The name is unescaped in query_decode() with form_decode(),
+ * the pair is not altered. */
 typedef struct {
-  char *name;
-  char *value;
+  char *decoded_name;
+  char *pair;
 } QueryItem;
 
 static void
 query_item_free (QueryItem *item)
 {
-  g_free (item->name);
-  /* value is actually part of the name allocation,
-   * see query_decode() */
+  g_free (item->decoded_name);
+  g_free (item->pair);
   g_slice_free (QueryItem, item);
 }
 
@@ -74,63 +74,35 @@ form_decode (char *part)
   return TRUE;
 }
 
-static void
-append_form_encoded (GString *str, const char *in)
-{
-  const unsigned char *s = (const unsigned char *)in;
-
-  while (*s) {
-    if (*s == ' ') {
-      g_string_append_c (str, '+');
-      s++;
-    } else if (!g_ascii_isalnum (*s))
-      g_string_append_printf (str, "%%%02X", (int)*s++);
-    else
-      g_string_append_c (str, *s++);
-  }
-}
-
-static void
-encode_pair (GString *str, const char *name, const char *value)
-{
-  g_return_if_fail (name != NULL);
-  g_return_if_fail (value != NULL);
-
-  if (str->len)
-    g_string_append_c (str, '&');
-  append_form_encoded (str, name);
-  g_string_append_c (str, '=');
-  g_string_append (str, value);
-}
-
-/* Adapted from soup_form_decode in libsoup */
 static GList *
-query_decode (const char *query)
+query_split (const char *query)
 {
   GList *items;
-  char **pairs, *eq, *name, *value;
+  char **pairs;
   int i;
 
   items = NULL;
   pairs = g_strsplit (query, "&", -1);
   for (i = 0; pairs[i]; i++) {
     QueryItem *item;
+    char *decoded_name = NULL;
+    char *pair, *eq;
 
-    name = pairs[i];
-    eq = strchr (name, '=');
-    if (eq) {
-      *eq = '\0';
-      value = eq + 1;
-    } else
-      value = NULL;
-    if (!value || !form_decode (name)) {
-      g_free (name);
-      continue;
+    pair = pairs[i];
+    eq = strchr (pair, '=');
+    if (eq)
+      decoded_name = g_strndup (pair, eq - pair);
+    else
+      decoded_name = g_strdup (pair);
+
+    if (!form_decode (decoded_name)) {
+      g_free (decoded_name);
+      decoded_name = NULL;
     }
 
     item = g_slice_new0 (QueryItem);
-    item->name = name;
-    item->value = value;
+    item->decoded_name = decoded_name;
+    item->pair = pair;
     items = g_list_prepend (items, item);
   }
   g_free (pairs);
@@ -139,22 +111,28 @@ query_decode (const char *query)
 }
 
 static char *
-query_encode (GList *items)
+query_concat (GList *items)
 {
   GList *l;
-  GString *str;
+  GPtrArray *array;
+  char *ret;
 
   if (!items)
     return NULL;
 
-  str = g_string_new (NULL);
+  array = g_ptr_array_new ();
+
   for (l = items; l != NULL; l = l->next) {
     QueryItem *item = l->data;
 
-    encode_pair (str, item->name, item->value);
+    g_ptr_array_add (array, item->pair);
   }
+  g_ptr_array_add (array, NULL);
+
+  ret = g_strjoinv ("&", (char **) array->pdata);
+  g_ptr_array_free (array, TRUE);
 
-  return g_string_free (str, FALSE);
+  return ret;
 }
 
 static gboolean
@@ -194,6 +172,9 @@ is_garbage (const char *name,
   };
   guint i;
 
+  if (name == NULL)
+    return FALSE;
+
   for (i = 0; i < G_N_ELEMENTS (fields); i++) {
     if (fields[i].host != NULL &&
         !g_str_has_suffix (host, fields[i].host))
@@ -223,6 +204,7 @@ ephy_remove_tracking_from_uri (const char *uri_string)
   GList *items, *new_items, *l;
   const char *query, *host;
   char *new_query;
+  gboolean has_garbage = FALSE;
   char *ret = NULL;
 
   uri = soup_uri_new (uri_string);
@@ -234,27 +216,32 @@ ephy_remove_tracking_from_uri (const char *uri_string)
   if (!query)
     goto bail;
 
-  items = query_decode (query);
+  items = query_split (query);
   if (!items)
     goto bail;
 
   new_items = NULL;
   for (l = items; l != NULL; l = l->next) {
     QueryItem *item = l->data;
-    if (!is_garbage (item->name, host))
+
+    if (!is_garbage (item->decoded_name, host))
       new_items = g_list_prepend (new_items, item);
+    else
+      has_garbage = TRUE;
   }
-  new_items = g_list_reverse (new_items);
 
-  new_query = query_encode (new_items);
+  if (has_garbage) {
+    new_items = g_list_reverse (new_items);
+    new_query = query_concat (new_items);
 
-  g_list_free_full (items, (GDestroyNotify) query_item_free);
-  g_list_free (new_items);
+    soup_uri_set_query (uri, new_query);
+    g_free (new_query);
 
-  soup_uri_set_query (uri, new_query);
-  g_free (new_query);
+    ret = soup_uri_to_string (uri, FALSE);
+  }
 
-  ret = soup_uri_to_string (uri, FALSE);
+  g_list_free_full (items, (GDestroyNotify) query_item_free);
+  g_list_free (new_items);
 
 bail:
   soup_uri_free (uri);
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7bb93a6..d9a8027 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -28,16 +28,16 @@ msgstr ""
 "Project-Id-Version: epiphany\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=epiphany&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-02-21 04:39+0000\n"
-"PO-Revision-Date: 2014-02-21 10:13-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
+"POT-Creation-Date: 2014-05-15 15:33+0000\n"
+"PO-Revision-Date: 2014-05-15 16:20-0300\n"
+"Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.6.4\n"
+"X-Generator: Poedit 1.6.5\n"
 
 #: ../data/default-bookmarks.rdf.in.h:1
 msgid "Search the web"
@@ -84,9 +84,9 @@ msgstr ""
 "com a área de trabalho e uma interface gráfica simples e intuitiva que "
 "permite a você concentrar-se em suas páginas web."
 
-#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:315
-#: ../embed/ephy-about-handler.c:345 ../src/ephy-main.c:67
-#: ../src/ephy-main.c:314 ../src/ephy-main.c:472 ../src/window-commands.c:1509
+#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292
+#: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67
+#: ../src/ephy-main.c:314 ../src/ephy-main.c:472 ../src/window-commands.c:1512
 msgid "Web"
 msgstr "Web"
 
@@ -499,87 +499,86 @@ msgstr "Mostra a coluna de títulos na janela de favoritos."
 msgid "Whether to show the address column in the bookmarks window."
 msgstr "Mostra a coluna de endereços na janela de favoritos."
 
-#: ../embed/ephy-about-handler.c:156
+#: ../embed/ephy-about-handler.c:141
 msgid "Installed plugins"
 msgstr "Plug-ins instalados"
 
-#: ../embed/ephy-about-handler.c:158
+#: ../embed/ephy-about-handler.c:142
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: ../embed/ephy-about-handler.c:161
+#: ../embed/ephy-about-handler.c:145
 msgid "Plugins are disabled in the preferences"
 msgstr "Os plug-ins estão desabilitados nas preferências"
 
-#: ../embed/ephy-about-handler.c:174
+#: ../embed/ephy-about-handler.c:158
 msgid "Enabled"
 msgstr "Ativado"
 
 #. webkit_plugin_get_enabled (plugin) &&
-#: ../embed/ephy-about-handler.c:174
+#: ../embed/ephy-about-handler.c:158
 msgid "Yes"
 msgstr "Sim"
 
-#: ../embed/ephy-about-handler.c:174
+#: ../embed/ephy-about-handler.c:158
 msgid "No"
 msgstr "Não"
 
-#: ../embed/ephy-about-handler.c:175
+#: ../embed/ephy-about-handler.c:159
 msgid "MIME type"
 msgstr "Tipo MIME"
 
-#: ../embed/ephy-about-handler.c:175
+#: ../embed/ephy-about-handler.c:159
 msgid "Description"
 msgstr "Descrição"
 
-#: ../embed/ephy-about-handler.c:175
+#: ../embed/ephy-about-handler.c:159
 msgid "Suffixes"
 msgstr "Sufixos"
 
-#: ../embed/ephy-about-handler.c:235 ../embed/ephy-about-handler.c:238
+#: ../embed/ephy-about-handler.c:220 ../embed/ephy-about-handler.c:222
 msgid "Memory usage"
 msgstr "Uso de memória"
 
-#: ../embed/ephy-about-handler.c:288
+#: ../embed/ephy-about-handler.c:270
 #, c-format
 msgid "Version %s"
 msgstr "Versão %s"
 
-#: ../embed/ephy-about-handler.c:312
+#: ../embed/ephy-about-handler.c:290
 msgid "About Web"
 msgstr "Sobre o web"
 
-#: ../embed/ephy-about-handler.c:317
+#: ../embed/ephy-about-handler.c:294
 msgid "A simple, clean, beautiful view of the web"
 msgstr "Uma visão simples, limpa e bonita da web"
 
-#: ../embed/ephy-about-handler.c:368 ../embed/ephy-about-handler.c:370
+#: ../embed/ephy-about-handler.c:345 ../embed/ephy-about-handler.c:346
 msgid "Applications"
 msgstr "Aplicativos"
 
-#: ../embed/ephy-about-handler.c:371
+#: ../embed/ephy-about-handler.c:347
 msgid "List of installed web applications"
 msgstr "Lista dos aplicativos web instalados"
 
 #. Note for translators: this refers to the installation date.
-#: ../embed/ephy-about-handler.c:392
+#: ../embed/ephy-about-handler.c:364
 msgid "Installed on:"
 msgstr "Instalados em:"
 
-#: ../embed/ephy-about-handler.c:463
-#| msgid "Remove from this topic"
+#: ../embed/ephy-about-handler.c:468
 msgid "Remove from overview"
 msgstr "Remover da visão geral"
 
-#: ../embed/ephy-about-handler.c:499 ../embed/ephy-web-view.c:741
+#: ../embed/ephy-about-handler.c:483 ../embed/ephy-embed-utils.c:300
 msgid "Most Visited"
 msgstr "Mais visitados"
 
-#: ../embed/ephy-about-handler.c:551 ../embed/ephy-about-handler.c:554
+#: ../embed/ephy-about-handler.c:542 ../embed/ephy-about-handler.c:543
 msgid "Private Browsing"
 msgstr "Navegação privativa"
 
-#: ../embed/ephy-about-handler.c:555
+#: ../embed/ephy-about-handler.c:544
 msgid ""
 "You are currently browsing <em>incognito</em>. Pages viewed in this mode "
 "will not show up in your browsing history and all stored information will be "
@@ -589,25 +588,36 @@ msgstr ""
 "este modo não serão mostradas em seu histórico de navegação e todas as "
 "informações armazenadas serão apagadas quando você fechar a janela."
 
-#: ../embed/ephy-embed.c:473
+#. characters
+#: ../embed/ephy-embed.c:51
+msgid "Blank page"
+msgstr "Página em branco"
+
+#: ../embed/ephy-embed.c:542
 #, c-format
 msgid "Press %s to exit fullscreen"
 msgstr "Pressionar %s para sair da tela cheia"
 
 #. Translators: 'ESC' and 'F11' are keyboard keys.
-#: ../embed/ephy-embed.c:476
+#: ../embed/ephy-embed.c:545
 msgid "ESC"
 msgstr "ESC"
 
-#: ../embed/ephy-embed.c:476
+#: ../embed/ephy-embed.c:545
 msgid "F11"
 msgstr "F11"
 
-#: ../embed/ephy-embed-utils.c:59
+#: ../embed/ephy-embed-utils.c:64
 #, c-format
 msgid "Send an email message to “%s”"
 msgstr "Enviar um e-mail para \"%s\""
 
+# Parâmetro é "br-pt", conforme link informado
+#: ../embed/ephy-embed-utils.c:243 ../src/ephy-search-provider.c:287
+#, c-format
+msgid "http://duckduckgo.com/?q=%s&amp;t=epiphany"
+msgstr "http://duckduckgo.com/?q=%s&amp;t=epiphany&amp;kl=br-pt"
+
 #: ../embed/ephy-encodings.c:54
 msgid "Arabic (_IBM-864)"
 msgstr "Árabe (_IBM-864)"
@@ -952,50 +962,55 @@ msgstr "Localiza a ocorrência anterior da palavra ou frase"
 msgid "Find next occurrence of the search string"
 msgstr "Localiza a próxima ocorrência da palavra ou frase"
 
-#. characters
-#: ../embed/ephy-web-view.c:64 ../embed/ephy-web-view.c:2933
-msgid "Blank page"
-msgstr "Página em branco"
-
-#: ../embed/ephy-web-view.c:496 ../src/window-commands.c:329
+#: ../embed/ephy-web-view.c:488 ../src/window-commands.c:330
 msgid "Save"
 msgstr "Salvar"
 
 #. Translators: The %s the hostname where this is happening.
 #. * Example: mail.google.com.
 #.
-#: ../embed/ephy-web-view.c:508
+#: ../embed/ephy-web-view.c:500
 #, c-format
 msgid "Do you want to save your password for “%s”?"
 msgstr "Você deseja salvar sua senha pra \"%s\"?"
 
-#: ../embed/ephy-web-view.c:1402
+#: ../embed/ephy-web-view.c:1387
 msgid "Deny"
 msgstr "Negar"
 
-#: ../embed/ephy-web-view.c:1403
+#: ../embed/ephy-web-view.c:1388
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../embed/ephy-web-view.c:1413
+#: ../embed/ephy-web-view.c:1398
 #, c-format
 msgid "The page at <b>%s</b> wants to know your location."
 msgstr "A página em <b>%s</b> quer saber sua localização."
 
-#: ../embed/ephy-web-view.c:1758
+#. translators: %s here is the address of the web page
+#: ../embed/ephy-web-view.c:1482
+#, c-format
+msgid "Loading “%s”…"
+msgstr "Carregando \"%s\"…"
+
+#: ../embed/ephy-web-view.c:1484
+msgid "Loading…"
+msgstr "Carregando…"
+
+#: ../embed/ephy-web-view.c:1725
 msgid "None specified"
 msgstr "Nada especificado"
 
-#: ../embed/ephy-web-view.c:1771 ../embed/ephy-web-view.c:1786
+#: ../embed/ephy-web-view.c:1738 ../embed/ephy-web-view.c:1753
 #, c-format
 msgid "Problem loading “%s”"
 msgstr "Problema no carregamento de \"%s\""
 
-#: ../embed/ephy-web-view.c:1773
+#: ../embed/ephy-web-view.c:1740
 msgid "Oops! Unable to display this website."
 msgstr "Opa! Não foi possível mostrar esta página web."
 
-#: ../embed/ephy-web-view.c:1774
+#: ../embed/ephy-web-view.c:1741
 #, c-format
 msgid ""
 "<p>The site at “%s” seems to be unavailable. The precise error was:</"
@@ -1008,15 +1023,15 @@ msgstr ""
 "transferido para um novo endereço. Não esqueça de verificar se sua conexão "
 "com a internet está funcionando corretamente.</p>"
 
-#: ../embed/ephy-web-view.c:1782
+#: ../embed/ephy-web-view.c:1749
 msgid "Try again"
 msgstr "Tentar novamente"
 
-#: ../embed/ephy-web-view.c:1788
+#: ../embed/ephy-web-view.c:1755
 msgid "Oops! There may be a problem."
 msgstr "Opa! Pode ter alguma coisa de errada."
 
-#: ../embed/ephy-web-view.c:1789
+#: ../embed/ephy-web-view.c:1756
 #, c-format
 msgid ""
 "<p>This site may have caused Web to close unexpectedly.</p><p>If this "
@@ -1027,20 +1042,20 @@ msgstr ""
 "inesperadamente.</p><p>Se acontecer, por favor relate o problema aos "
 "desenvolvedores do <strong>%s</strong>.</p>"
 
-#: ../embed/ephy-web-view.c:1794 ../embed/ephy-web-view.c:1801
+#: ../embed/ephy-web-view.c:1761 ../embed/ephy-web-view.c:1768
 msgid "Reload Anyway"
 msgstr "Recarregar mesmo assim"
 
-#: ../embed/ephy-web-view.c:1798
+#: ../embed/ephy-web-view.c:1765
 #, c-format
 msgid "Problem displaying “%s”"
 msgstr "Problema na exibição de \"%s\""
 
-#: ../embed/ephy-web-view.c:1799
+#: ../embed/ephy-web-view.c:1766
 msgid "Oops!"
 msgstr "Oopa!"
 
-#: ../embed/ephy-web-view.c:1800
+#: ../embed/ephy-web-view.c:1767
 msgid ""
 "Something went wrong while displaying this page. Please reload or visit a "
 "different page to continue."
@@ -1048,29 +1063,13 @@ msgstr ""
 "Alguma coisa deu errado ao exibir esta página. Por favor recarregue-a ou "
 "visite uma página diferente para continuar."
 
-# Parâmetro é "br-pt", conforme link informado
-#: ../embed/ephy-web-view.c:2113 ../src/ephy-search-provider.c:287
-#, c-format
-msgid "http://duckduckgo.com/?q=%s&amp;t=epiphany"
-msgstr "http://duckduckgo.com/?q=%s&amp;t=epiphany&amp;kl=br-pt"
-
-#. translators: %s here is the address of the web page
-#: ../embed/ephy-web-view.c:2345
-#, c-format
-msgid "Loading “%s”…"
-msgstr "Carregando \"%s\"…"
-
-#: ../embed/ephy-web-view.c:2347
-msgid "Loading…"
-msgstr "Carregando…"
-
-#: ../embed/ephy-web-view.c:2837
+#: ../embed/ephy-web-view.c:2614
 msgid "_OK"
 msgstr "_OK"
 
 #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193
 #: ../src/bookmarks/ephy-bookmark-properties.c:428
-#: ../src/bookmarks/ephy-bookmarks-editor.c:815
+#: ../src/bookmarks/ephy-bookmarks-editor.c:819
 #: ../src/resources/clear-data-dialog.ui.h:3
 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:808
 msgid "_Cancel"
@@ -1096,7 +1095,7 @@ msgstr "Páginas da web"
 msgid "Images"
 msgstr "Imagens"
 
-#: ../lib/ephy-file-chooser.c:238 ../src/bookmarks/ephy-bookmarks-editor.c:633
+#: ../lib/ephy-file-chooser.c:238 ../src/bookmarks/ephy-bookmarks-editor.c:637
 msgid "All files"
 msgstr "Todos os arquivos"
 
@@ -1395,7 +1394,7 @@ msgstr "Erro ao baixar: %s"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1140
+#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1146
 #: ../src/window-commands.c:275
 msgid "Open"
 msgstr "Abrir"
@@ -1412,21 +1411,21 @@ msgstr "Iniciando…"
 #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
 #. * Select All, Input Methods and Insert Unicode control character.)
 #.
-#: ../lib/widgets/ephy-location-entry.c:618
+#: ../lib/widgets/ephy-location-entry.c:627
 #: ../src/resources/prefs-dialog.ui.h:36 ../src/ephy-history-window.c:189
 msgid "Cl_ear"
 msgstr "_Limpar"
 
 #. Edit actions.
-#: ../lib/widgets/ephy-location-entry.c:637 ../src/ephy-window.c:121
+#: ../lib/widgets/ephy-location-entry.c:646 ../src/ephy-window.c:121
 msgid "_Undo"
 msgstr "Desfa_zer"
 
-#: ../lib/widgets/ephy-location-entry.c:644
+#: ../lib/widgets/ephy-location-entry.c:653
 msgid "_Redo"
 msgstr "_Refazer"
 
-#: ../lib/widgets/ephy-location-entry.c:924
+#: ../lib/widgets/ephy-location-entry.c:933
 msgid "Drag and drop this icon to create a link to this page"
 msgstr "Arraste e solte esse ícone para criar um link para essa página"
 
@@ -1561,7 +1560,7 @@ msgid "Create a new topic"
 msgstr "Cria um novo tópico"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:161
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1158
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1154
 msgid "Open in New _Window"
 msgid_plural "Open in New _Windows"
 msgstr[0] "Abrir em nova _janela"
@@ -1572,7 +1571,7 @@ msgid "Open the selected bookmark in a new window"
 msgstr "Abre o favorito selecionado em uma nova janela"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:164
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1161
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1157
 msgid "Open in New _Tab"
 msgid_plural "Open in New _Tabs"
 msgstr[0] "Abrir em nova a_ba"
@@ -1628,7 +1627,7 @@ msgid "Cut the selection"
 msgstr "Corta a seleção"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:186
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1171 ../src/ephy-window.c:127
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:127
 msgid "_Copy"
 msgstr "_Copiar"
 
@@ -1689,7 +1688,7 @@ msgid "Show the title column"
 msgstr "Mostra a coluna de título"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:212
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1634
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1632
 msgid "Address"
 msgstr "Endereço"
 
@@ -1701,16 +1700,16 @@ msgstr "Mostrar a coluna de endereço"
 msgid "Type a topic"
 msgstr "Digite um tópico"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:373
+#: ../src/bookmarks/ephy-bookmarks-editor.c:377
 #, c-format
 msgid "Delete topic “%s”?"
 msgstr "Excluir o tópico \"%s\"?"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:376
+#: ../src/bookmarks/ephy-bookmarks-editor.c:380
 msgid "Delete this topic?"
 msgstr "Excluir esse tópico?"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:378
+#: ../src/bookmarks/ephy-bookmarks-editor.c:382
 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."
@@ -1719,44 +1718,44 @@ msgstr ""
 "descategorizados, a menos que eles também pertençam a outros tópicos. Os "
 "favoritos não serão excluídos."
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:381
+#: ../src/bookmarks/ephy-bookmarks-editor.c:385
 msgid "_Delete Topic"
 msgstr "E_xcluir tópico"
 
 #. FIXME: proper i18n after freeze
-#: ../src/bookmarks/ephy-bookmarks-editor.c:491
 #: ../src/bookmarks/ephy-bookmarks-editor.c:495
+#: ../src/bookmarks/ephy-bookmarks-editor.c:499
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:500
 #: ../src/bookmarks/ephy-bookmarks-editor.c:504
+#: ../src/bookmarks/ephy-bookmarks-editor.c:508
 msgid "Firebird"
 msgstr "Firebird"
 
 #. Translators: The %s is the name of a Mozilla profile.
-#: ../src/bookmarks/ephy-bookmarks-editor.c:509
+#: ../src/bookmarks/ephy-bookmarks-editor.c:513
 #, c-format
 msgid "Mozilla “%s” profile"
 msgstr "Perfil \"%s\" do Mozilla"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:513
+#: ../src/bookmarks/ephy-bookmarks-editor.c:517
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:517
+#: ../src/bookmarks/ephy-bookmarks-editor.c:521
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:546
+#: ../src/bookmarks/ephy-bookmarks-editor.c:550
 msgid "Import failed"
 msgstr "Falha ao importar"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:548
+#: ../src/bookmarks/ephy-bookmarks-editor.c:552
 msgid "Import Failed"
 msgstr "Falha ao importar"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:551
+#: ../src/bookmarks/ephy-bookmarks-editor.c:555
 #, c-format
 msgid ""
 "The bookmarks from “%s” could not be imported because the file is corrupted "
@@ -1765,62 +1764,62 @@ msgstr ""
 "Os favoritos de \"%s\" não foram importados pois o arquivo está corrompido "
 "ou é de um tipo sem suporte."
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:614
+#: ../src/bookmarks/ephy-bookmarks-editor.c:618
 msgid "Import Bookmarks from File"
 msgstr "Importar favoritos de arquivo"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:621
+#: ../src/bookmarks/ephy-bookmarks-editor.c:625
 msgid "Firefox/Mozilla bookmarks"
 msgstr "Favoritos do Firefox/Mozilla"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:625
+#: ../src/bookmarks/ephy-bookmarks-editor.c:629
 msgid "Galeon/Konqueror bookmarks"
 msgstr "Favoritos do Konqueror/Galeon"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:629
+#: ../src/bookmarks/ephy-bookmarks-editor.c:633
 msgid "Web bookmarks"
 msgstr "Favoritos do Web"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:753
+#: ../src/bookmarks/ephy-bookmarks-editor.c:757
 msgid "Export Bookmarks"
 msgstr "Exportar favoritos"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:760
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1497
+#: ../src/bookmarks/ephy-bookmarks-editor.c:764
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1495
 #: ../src/bookmarks/ephy-topic-action.c:217
 msgid "Bookmarks"
 msgstr "Favoritos"
 
 #. Make a format selection combo & label
-#: ../src/bookmarks/ephy-bookmarks-editor.c:766
+#: ../src/bookmarks/ephy-bookmarks-editor.c:770
 msgid "File f_ormat:"
 msgstr "_Formato do arquivo:"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:812
+#: ../src/bookmarks/ephy-bookmarks-editor.c:816
 msgid "Import Bookmarks"
 msgstr "Importar favoritos"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:817
+#: ../src/bookmarks/ephy-bookmarks-editor.c:821
 msgid "I_mport"
 msgstr "I_mportar"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:833
+#: ../src/bookmarks/ephy-bookmarks-editor.c:837
 msgid "Import bookmarks from:"
 msgstr "Importar favoritos de:"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:853
+#: ../src/bookmarks/ephy-bookmarks-editor.c:857
 msgid "File"
 msgstr "Arquivo"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1167
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1163
 msgid "_Copy Address"
 msgstr "_Copiar endereço"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1553
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1551
 msgid "Topics"
 msgstr "Tópicos"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1623
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1621
 msgid "Title"
 msgstr "Título"
 
@@ -2475,61 +2474,61 @@ msgstr "Se você fechar esta janela, os downloads serão cancelados"
 msgid "Close window and cancel downloads"
 msgstr "Fechar janela e cancelar downloads"
 
-#: ../src/ephy-window.c:1142
+#: ../src/ephy-window.c:1148
 msgid "Save As"
 msgstr "Salvar como"
 
-#: ../src/ephy-window.c:1144
+#: ../src/ephy-window.c:1150
 msgid "Save As Application"
 msgstr "Salva como aplicativo"
 
-#: ../src/ephy-window.c:1146
+#: ../src/ephy-window.c:1152
 msgid "Print"
 msgstr "Imprimir"
 
-#: ../src/ephy-window.c:1148
+#: ../src/ephy-window.c:1154
 msgid "Bookmark"
 msgstr "Favorito"
 
-#: ../src/ephy-window.c:1150
+#: ../src/ephy-window.c:1156
 msgid "Find"
 msgstr "Localizar"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1159
+#: ../src/ephy-window.c:1165
 msgid "Larger"
 msgstr "Ampliar"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1162
+#: ../src/ephy-window.c:1168
 msgid "Smaller"
 msgstr "Reduzir"
 
-#: ../src/ephy-window.c:1190
+#: ../src/ephy-window.c:1196
 msgid "Back"
 msgstr "Voltar"
 
-#: ../src/ephy-window.c:1202
+#: ../src/ephy-window.c:1208
 msgid "Forward"
 msgstr "Avançar"
 
-#: ../src/ephy-window.c:1214
+#: ../src/ephy-window.c:1220
 msgid "Zoom"
 msgstr "Zoom"
 
-#: ../src/ephy-window.c:1223
+#: ../src/ephy-window.c:1229
 msgid "New _Tab"
 msgstr "Nova a_ba"
 
-#: ../src/ephy-window.c:1231
+#: ../src/ephy-window.c:1237
 msgid "Go to most visited"
 msgstr "Ir para os mais visitados"
 
-#: ../src/popup-commands.c:234
+#: ../src/popup-commands.c:237
 msgid "Save Link As"
 msgstr "Salvar link como"
 
-#: ../src/popup-commands.c:240
+#: ../src/popup-commands.c:243
 msgid "Save Image As"
 msgstr "Salvar imagem como"
 
@@ -2639,19 +2638,19 @@ msgstr "Cria um aplicativo web"
 msgid "C_reate"
 msgstr "C_riar"
 
-#: ../src/window-commands.c:1470 ../src/window-commands.c:1493
+#: ../src/window-commands.c:1473 ../src/window-commands.c:1496
 msgid "Contact us at:"
 msgstr "Contate-nos em:"
 
-#: ../src/window-commands.c:1473
+#: ../src/window-commands.c:1476
 msgid "Contributors:"
 msgstr "Contribuidores:"
 
-#: ../src/window-commands.c:1476
+#: ../src/window-commands.c:1479
 msgid "Past developers:"
 msgstr "Desenvolvedores no passado:"
 
-#: ../src/window-commands.c:1502
+#: ../src/window-commands.c:1505
 #, c-format
 msgid ""
 "A simple, clean, beautiful view of the web.\n"
@@ -2668,7 +2667,7 @@ msgstr ""
 #. * this translation; in that case, please write each of them on a separate
 #. * line seperated by newlines (\n).
 #.
-#: ../src/window-commands.c:1525
+#: ../src/window-commands.c:1528
 msgid "translator-credits"
 msgstr ""
 "Afonso Celso Medina <medina@maua.br>\n"
@@ -2693,25 +2692,26 @@ msgstr ""
 "Enrico Nicoletto <liverig@gmail.com>\n"
 "Rafael Ferreira <rafael.f.f1@gmail.com>"
 
-#: ../src/window-commands.c:1528
+#: ../src/window-commands.c:1531
 msgid "Web Website"
 msgstr "Website do Navegador web"
 
-#: ../src/window-commands.c:1667
+#: ../src/window-commands.c:1670
 msgid "Enable caret browsing mode?"
 msgstr "Ativar o modo de navegação com cursor?"
 
-#: ../src/window-commands.c:1670
+#: ../src/window-commands.c:1673
 msgid ""
 "Pressing F7 turns caret browsing on or off. This feature places a moveable "
 "cursor in web pages, allowing you to move around with your keyboard. Do you "
 "want to enable caret browsing?"
 msgstr ""
-"Ao pressionar a tecla F7 liga/desliga a navegação com cursor. Esta "
-"funcionalidade insere um cursor nas páginas web, permitindo-lhe navegar pela "
-"página com o seu teclado. Você quer ativar o modo de navegação com cursor?"
+"Ao pressionar a tecla F7 alterna-se a navegação com cursor para ligado ou "
+"desligado. Esta funcionalidade insere um cursor nas páginas web, permitindo-"
+"lhe navegar pela página com o seu teclado. Você deseja habilitar o modo de "
+"navegação com cursor?"
 
-#: ../src/window-commands.c:1673
+#: ../src/window-commands.c:1676
 msgid "_Enable"
 msgstr "_Ativar"
 
diff --git a/po/sv.po b/po/sv.po
index a69ec6a..077293e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,49 +1,73 @@
 # Swedish messages for Epiphany.
-# Copyright (C) 2000-2012 Free Software Foundation, Inc.
+# Copyright © 2000-2012, 2014 Free Software Foundation, Inc.
 # Dennis Persson <dennis@linux.nu>, 2000.
 # Christian Rose <menthos@menthos.com>, 2000, 2001, 2002, 2003, 2004, 2005.
 # Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
+# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2014.
 #
 # $Id: sv.po,v 1.65 2006/08/16 05:31:44 dnylande Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: epiphany\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany\n"
-"POT-Creation-Date: 2012-03-12 18:15+0100\n"
-"PO-Revision-Date: 2012-03-12 18:15+0100\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=epiphany&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-04-07 15:44+0000\n"
+"PO-Revision-Date: 2014-05-20 23:16+0100\n"
+"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.6.4\n"
 
 #: ../data/default-bookmarks.rdf.in.h:1
 msgid "Search the web"
 msgstr "Sök på nätet"
 
-#. Translators you should change these links to respect your locale.
-#. For instance in .nl these should be
-#. "http://www.google.nl" and "http://www.google.nl/search?q=%s"
-#: ../data/default-bookmarks.rdf.in.h:5
-msgid "http://www.google.com"
-msgstr "http://www.google.se"
-
-#. Translators you should change these links to respect your locale.
-#. For instance in .nl these should be
-#. "http://www.google.nl" and "http://www.google.nl/search?q=%s"
-#: ../data/default-bookmarks.rdf.in.h:10
+#. Translators: you can use the regions listed in
+#. https://duckduckgo.com/params to boost a particular region
+#. associated with your language. For instance, for translators
+#. to Finnish, it might make sense to add kl=fi-fi to the search
+#. URL in order to boost results from Finland. Additionally, the
+#. 'kad' parameter can be used to specify the locale in which
+#. duckduckgo must be translated. So, for a Finnish localized
+#. version of duckduckgo that will render results tailored for
+#. Finland, the string would be:
+#. https://duckduckgo.com/?t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI
+#.
+#: ../data/default-bookmarks.rdf.in.h:13
+msgid "https://duckduckgo.com/?t=epiphany"
+msgstr "https://duckduckgo.com/?t=epiphany&amp;kl=se-sv&amp;kad=sv_SE"
+
+#. Translators: you can use the regions listed in
+#. https://duckduckgo.com/params to boost a particular region
+#. associated with your language. For instance, for translators
+#. to Finnish, it might make sense to add kl=fi-fi to the search
+#. URL in order to boost results from Finland. Additionally, the
+#. 'kad' parameter can be used to specify the locale in which
+#. duckduckgo must be translated. For such case, the search url
+#. would be
+#. https://duckduckgo.com/?q=%s&amp;t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI
+#: ../data/default-bookmarks.rdf.in.h:24
 #, no-c-format
-msgid "http://www.google.com/search?q=%s&amp;ie=UTF-8&amp;oe=UTF-8"
-msgstr "http://www.google.se/search?q=%s&amp;ie=UTF-8&amp;oe=UTF-8"
-
-#: ../data/epiphany.desktop.in.in.h:1
-#: ../src/ephy-main.c:73
-#: ../src/ephy-main.c:321
-#: ../src/ephy-main.c:467
-#: ../src/window-commands.c:1228
+msgid "https://duckduckgo.com/?q=%s&amp;t=epiphany"
+msgstr "https://duckduckgo.com/?q=%s&amp;t=epiphany&amp;kl=se-sv&amp;kad=sv_SE"
+
+#: ../data/epiphany.appdata.xml.in.h:1
+msgid ""
+"The web browser for GNOME, featuring tight integration with the desktop and "
+"a simple and intuitive user interface that allows you to focus on your web "
+"pages."
+msgstr ""
+"Webbläsaren för GNOME, med stark integration mot skrivbordet och ett enkelt, "
+"intuitivt användargränssnitt som tillåter dig att fokusera på dina webbsidor."
+
+#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292
+#: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67
+#: ../src/ephy-main.c:314 ../src/ephy-main.c:472 ../src/window-commands.c:1512
 msgid "Web"
 msgstr "Webb"
 
@@ -53,869 +77,1083 @@ msgstr "Webbläsare"
 
 #: ../data/epiphany.desktop.in.in.h:3
 msgid "Epiphany Web Browser"
-msgstr "Webbläsaren Epiphany"
+msgstr "Epiphany webbläsare"
 
 #: ../data/epiphany.desktop.in.in.h:4
 msgid "Browse the web"
 msgstr "Surfa på nätet"
 
-#: ../data/ui/epiphany-application-menu.ui.h:1
-msgid "_New Window"
-msgstr "_Nytt fönster"
+#: ../data/epiphany.desktop.in.in.h:5
+msgid "web;browser;internet;"
+msgstr "webb;webbläsare;internet;nätet;"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:1
+msgid "Browse with caret"
+msgstr "Navigera med markör"
+
+#. DuckDuckGo is the default search engine. Must exactly match the URL used
+#. in the preferences dialog, except this string is surrounded by single quotes
+#. and uses &amp; instead of simply &. If the match is not otherwise exact,
+#. there will be a spurious, ugly entry in the preferences combo, so please
+#. test this. Should ideally also match the default smart bookmark link in
+#. default-bookmarks.rdf. See the comment there for region parameters to
+#. the URL.
+#: ../data/org.gnome.epiphany.gschema.xml.h:10
+#, no-c-format
+msgid "'https://duckduckgo.com/?q=%s&amp;t=epiphany'"
+msgstr ""
+"'https://duckduckgo.com/?q=%s&amp;t=epiphany&amp;kl=se-sv&amp;kad=sv_SE'"
 
-#. Toplevel
-#: ../data/ui/epiphany-application-menu.ui.h:2
-#: ../src/ephy-window.c:87
-msgid "_Bookmarks"
-msgstr "_Bokmärken"
+#: ../data/org.gnome.epiphany.gschema.xml.h:11
+msgid "URL Search"
+msgstr "URL-sökning"
 
-#: ../data/ui/epiphany-application-menu.ui.h:3
-msgid "_History"
-msgstr "_Historik"
+#: ../data/org.gnome.epiphany.gschema.xml.h:12
+msgid "Search string for keywords entered in the URL bar."
+msgstr "Söksträng för nyckelord angivna i adressfältet."
 
-#: ../data/ui/epiphany-application-menu.ui.h:4
-#: ../data/ui/prefs-dialog.ui.h:3
-msgid "Preferences"
-msgstr "Inställningar"
+#: ../data/org.gnome.epiphany.gschema.xml.h:13
+msgid "User agent"
+msgstr "Användaragent"
 
-#: ../data/ui/epiphany-application-menu.ui.h:5
-#: ../data/ui/epiphany.ui.h:10
-msgid "Personal Data"
-msgstr "Personlig data"
+#: ../data/org.gnome.epiphany.gschema.xml.h:14
+msgid ""
+"String that will be used as user agent, to identify the browser to the web "
+"servers."
+msgstr ""
+"Sträng som ska användas som användaragent för att identifiera webbläsaren "
+"till webbservrarna."
 
-#: ../data/ui/epiphany-application-menu.ui.h:6
-#: ../src/bookmarks/ephy-bookmarks-editor.c:155
-#: ../src/ephy-history-window.c:132
-msgid "_Help"
-msgstr "_Hjälp"
+#: ../data/org.gnome.epiphany.gschema.xml.h:15
+msgid "Automatic downloads"
+msgstr "Automatiska hämtningar"
 
-#: ../data/ui/epiphany-application-menu.ui.h:7
-#: ../src/bookmarks/ephy-bookmarks-editor.c:204
-#: ../src/ephy-history-window.c:173
-msgid "_About"
-msgstr "_Om"
+#: ../data/org.gnome.epiphany.gschema.xml.h:16
+msgid ""
+"When files cannot be opened by the browser they are automatically downloaded "
+"to the download folder and opened with the appropriate application."
+msgstr ""
+"När filer inte kan öppnas av webbläsaren hämtas de automatiskt till "
+"hämtningskatalogen och öppnas med lämpligt program."
 
-#: ../data/ui/epiphany-application-menu.ui.h:8
-msgid "_Quit"
-msgstr "A_vsluta"
+#: ../data/org.gnome.epiphany.gschema.xml.h:17
+msgid "Force new windows to be opened in tabs"
+msgstr "Tvinga nya fönster att öppnas i flikar."
 
-#: ../data/ui/epiphany.ui.h:1
-msgid "Cookie properties"
-msgstr "Kakegenskaper"
+#: ../data/org.gnome.epiphany.gschema.xml.h:18
+msgid ""
+"Force new window requests to be opened in tabs instead of using a new window."
+msgstr ""
+"Tvinga ny fönsterbegäran att öppnas i flik istället för att använda nytt "
+"fönster."
 
-#: ../data/ui/epiphany.ui.h:2
-msgid "Content:"
-msgstr "Innehåll:"
+#: ../data/org.gnome.epiphany.gschema.xml.h:19
+msgid "Remember passwords"
+msgstr "Kom ihåg lösenord"
 
-#: ../data/ui/epiphany.ui.h:3
-msgid "Path:"
-msgstr "Sökväg:"
+#: ../data/org.gnome.epiphany.gschema.xml.h:20
+msgid "Whether to store and prefill passwords in web sites."
+msgstr "Huruvida lösenord ska lagras och på förhand matas in på webbplatser."
 
-#: ../data/ui/epiphany.ui.h:4
-msgid "Send for:"
-msgstr "Skicka för:"
+#: ../data/org.gnome.epiphany.gschema.xml.h:21
+msgid "Automatically manage offline status with NetworkManager"
+msgstr "Hantera automatiskt frånkopplad status med NetworkManager"
 
-#: ../data/ui/epiphany.ui.h:5
-msgid "Expires:"
-msgstr "Utgår:"
+#: ../data/org.gnome.epiphany.gschema.xml.h:22
+msgid "Enable smooth scrolling"
+msgstr "Aktivera mjuk rullning"
 
-#: ../data/ui/epiphany.ui.h:6
-msgid "Text Encoding"
-msgstr "Textkodning"
+#: ../data/org.gnome.epiphany.gschema.xml.h:23
+msgid "Don't use an external application to view page source."
+msgstr "Använd inte ett externt program för att visa källkod för sidor."
 
-#: ../data/ui/epiphany.ui.h:7
-msgid "<b>_Automatic</b>"
-msgstr "<b>_Automatisk</b>"
+#: ../data/org.gnome.epiphany.gschema.xml.h:24
+msgid "Whether to automatically restore the last session"
+msgstr "Huruvida den senaste sessionen ska återskapas automatiskt"
 
-#: ../data/ui/epiphany.ui.h:8
-#: ../src/ephy-encoding-menu.c:338
-msgid "Use the encoding specified by the document"
-msgstr "Använd kodningen som är angiven i dokumentet"
+#: ../data/org.gnome.epiphany.gschema.xml.h:25
+msgid ""
+"Defines how the session will be restored during startup. Allowed values are "
+"'always' (the previous state of the application is always restored), "
+"'crashed' (the session is only restored if the application crashes) and "
+"'never' (the homepage is always shown)."
+msgstr ""
+"Definierar hur sessionen återställs vid uppstart. Tillåtna värden är \"always"
+"\" (programmets tidigare tillstånd återställs alltid), \"crashed"
+"\" (sessionen återställs endast om programmet kraschar) and \"never"
+"\" (hemsidan visas alltid)."
 
-#: ../data/ui/epiphany.ui.h:9
-msgid "<b>_Use a different encoding:</b>"
-msgstr "<b>_Använd en annan teckenkodning:</b>"
+#: ../data/org.gnome.epiphany.gschema.xml.h:26
+msgid ""
+"Whether to delay loading of tabs that are not immediately visible on session "
+"restore"
+msgstr ""
+"Huruvida inläsning av flikar som inte är omedelbart synliga ska fördröjas "
+"vid sessionsåterställning"
 
-#: ../data/ui/epiphany.ui.h:11
-#: ../data/ui/prefs-dialog.ui.h:21
-msgid "Cookies"
-msgstr "Kakor"
+#: ../data/org.gnome.epiphany.gschema.xml.h:27
+msgid ""
+"When this option is set to true, tabs will not start loading until the user "
+"switches to them, upon session restore."
+msgstr ""
+"När detta är sant kommer flikar inte börja läsas in förrän användaren byter "
+"till dem då en session återskapats."
 
-#: ../data/ui/epiphany.ui.h:12
-msgid "_Show passwords"
-msgstr "_Visa lösenord"
+#: ../data/org.gnome.epiphany.gschema.xml.h:28
+msgid "Process model"
+msgstr "Processmodell"
 
-#: ../data/ui/epiphany.ui.h:13
-#: ../data/ui/prefs-dialog.ui.h:27
-msgid "Passwords"
-msgstr "Lösenord"
+#: ../data/org.gnome.epiphany.gschema.xml.h:29
+msgid ""
+"This option allows to set the process model used. Use 'shared-secondary-"
+"process' to use a single web process shared by all the tabs and 'one-"
+"secondary-process-per-web-view' to use a different web process for each tab."
+msgstr ""
+"Detta alternativ anger processmodellen som används. Använd \"shared-"
+"secondary-process\" för att använda en ensam webbprocess som delas av alla "
+"flikar och \"one-secondary-process-per-web-view\" för att använda olika "
+"processer för varje flik."
 
-#: ../data/ui/prefs-dialog.ui.h:1
-msgid "Add Language"
-msgstr "Lägg till språk"
+#: ../data/org.gnome.epiphany.gschema.xml.h:30
+msgid "Toolbar style"
+msgstr "Stil på verktygsrad"
 
-#: ../data/ui/prefs-dialog.ui.h:2
-msgid "Choose a l_anguage:"
-msgstr "Välj ett s_pråk:"
+#: ../data/org.gnome.epiphany.gschema.xml.h:31
+msgid ""
+"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both"
+"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and "
+"\"text\"."
+msgstr ""
+"Stil på verktygsraden. Tillåtna värden är \"\" (använd standardstilen i "
+"GNOME), \"both\" (både text och ikoner), \"both-horiz\" (text bredvid "
+"ikoner), \"icons\" (ikoner) och \"text\"."
 
-#. If we don't have XDG user dirs info, return an educated guess.
-#: ../data/ui/prefs-dialog.ui.h:4
-#: ../lib/ephy-file-helpers.c:116
-msgid "Downloads"
-msgstr "Hämtningar"
+#: ../data/org.gnome.epiphany.gschema.xml.h:32
+msgid "[Deprecated]"
+msgstr "[Föråldrad]"
 
-#: ../data/ui/prefs-dialog.ui.h:5
-msgid "_Download folder:"
-msgstr "_Hämtningsmapp:"
+#: ../data/org.gnome.epiphany.gschema.xml.h:33
+msgid ""
+"[Deprecated] This setting is deprecated, use 'tabs-bar-visibility-policy' "
+"instead."
+msgstr ""
+"[Föråldrad] Denna inställning har fasats ut, använd \"tabs-bar-visibility-"
+"policy\" i stället."
 
-#: ../data/ui/prefs-dialog.ui.h:6
-msgid "A_utomatically open downloaded files"
-msgstr "Öppna automatiskt _hämtade filer"
+#: ../data/org.gnome.epiphany.gschema.xml.h:34
+msgid "Visibility of the downloads window"
+msgstr "Synlighet för hämtningsfönstret"
 
-#: ../data/ui/prefs-dialog.ui.h:7
-msgid "General"
-msgstr "Allmänt"
+#: ../data/org.gnome.epiphany.gschema.xml.h:35
+msgid ""
+"Hide or show the downloads window. When hidden, a notification will be shown "
+"when new downloads are started."
+msgstr ""
+"Dölj eller visa hämtningsfönstret. När dolt kommer en notifiering att visas "
+"när nya hämtningar startas."
 
-#: ../data/ui/prefs-dialog.ui.h:8
-msgid "Fonts"
-msgstr "Typsnitt"
+#: ../data/org.gnome.epiphany.gschema.xml.h:36
+msgid "The visibility policy for the tabs bar."
+msgstr "Synlighetspolicy för flikraden."
 
-#: ../data/ui/prefs-dialog.ui.h:9
-msgid "_Use system fonts"
-msgstr "An_vänd systemtypsnitt"
+#: ../data/org.gnome.epiphany.gschema.xml.h:37
+msgid ""
+"Controls when the tabs bar is shown. Possible values are 'always' (the tabs "
+"bar is always shown), 'more-than-one' (the tabs bar is only shown if there's "
+"two or more tabs) and 'never' (the tabs bar is never shown)."
+msgstr ""
+"Kontrollerar när flikraden visas. Möjliga värden är \"always\" (flikraden "
+"visas alltid), \"more-than-one\" (Flikraden visas bara om det finns två "
+"eller fler flikar) och \"never\" (flikraden visas aldrig)."
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:38
+#| msgid "_Minimum font size:"
+msgid "Minimum font size"
+msgstr "Minsta typsnittsstorlek"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:39
+#| msgid "_Use system fonts"
+msgid "Use GNOME fonts"
+msgstr "Använd GNOME-typsnitt"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:40
+msgid "Use GNOME font settings."
+msgstr "Använd typsnittsinställningar för GNOME"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:41
+#| msgid "Sans serif font:"
+msgid "Custom sans-serif font"
+msgstr "Anpassat sans serif-typsnitt"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:42
+msgid ""
+"A value to be used to override sans-serif desktop font when use-gnome-fonts "
+"is set."
+msgstr ""
+"Ett värde som används för att åsidosätta skrivbordets sans serif-typsnitt "
+"när use-gnome-fonts är inställt."
 
-#: ../data/ui/prefs-dialog.ui.h:10
-msgid "Sans serif font:"
-msgstr "Sans serif-typsnitt:"
+#: ../data/org.gnome.epiphany.gschema.xml.h:43
+#| msgid "Sans serif font:"
+msgid "Custom serif font"
+msgstr "Anpassat serif-typsnitt"
 
-#: ../data/ui/prefs-dialog.ui.h:11
-msgid "Serif font:"
-msgstr "Serif-typsnitt:"
+#: ../data/org.gnome.epiphany.gschema.xml.h:44
+msgid ""
+"A value to be used to override serif desktop font when use-gnome-fonts is "
+"set."
+msgstr ""
+"Ett värde som används för att åsidosätta skrivbordets serif-typsnitt när use-"
+"gnome-fonts är inställt."
 
-#: ../data/ui/prefs-dialog.ui.h:12
-msgid "Monospace font:"
-msgstr "Typsnitt med fast breddslag:"
+#: ../data/org.gnome.epiphany.gschema.xml.h:45
+#| msgid "Monospace font:"
+msgid "Custom monospace font"
+msgstr "Anpassat typsnitt med fast breddslag:"
 
-#: ../data/ui/prefs-dialog.ui.h:13
-msgid "Style"
-msgstr "Stil"
+#: ../data/org.gnome.epiphany.gschema.xml.h:46
+msgid ""
+"A value to be used to override monospace desktop font when use-gnome-fonts "
+"is set."
+msgstr ""
+"Ett värde som används för att åsidosätta skrivbordets typsnitt med fast "
+"breddslag när use-gnome-fonts är inställt."
 
-#: ../data/ui/prefs-dialog.ui.h:14
-msgid "Use custom _stylesheet"
-msgstr "Använd anpassad _stilmall"
+#: ../data/org.gnome.epiphany.gschema.xml.h:47
+msgid "Use own colors"
+msgstr "Använd egna färger"
 
-#: ../data/ui/prefs-dialog.ui.h:15
-msgid "_Edit Stylesheet…"
-msgstr "R_edigera stilmall..."
+#: ../data/org.gnome.epiphany.gschema.xml.h:48
+msgid "Use your own colors instead of the colors the page requests."
+msgstr "Använd dina egna färger istället för de färger som sidan begär."
 
-#: ../data/ui/prefs-dialog.ui.h:16
-msgid "Fonts & Style"
-msgstr "Typsnitt & Stil"
+#: ../data/org.gnome.epiphany.gschema.xml.h:49
+#| msgid "Use own colors"
+msgid "Use own fonts"
+msgstr "Använd egna typsnitt"
 
-#: ../data/ui/prefs-dialog.ui.h:17
-msgid "Web Content"
-msgstr "Webbinnehåll"
+#: ../data/org.gnome.epiphany.gschema.xml.h:50
+msgid "Use your own fonts instead of the fonts the page requests."
+msgstr "Använd dina egna typsnitt istället för de typsnitt som sidan begär."
 
-#: ../data/ui/prefs-dialog.ui.h:18
-msgid "Allow popup _windows"
-msgstr "Tillåt popup_fönster"
+#: ../data/org.gnome.epiphany.gschema.xml.h:51
+msgid "Use a custom CSS"
+msgstr "Använd anpassad CSS"
 
-#: ../data/ui/prefs-dialog.ui.h:19
-msgid "Enable _plugins"
-msgstr "Aktivera _tillägg"
+#: ../data/org.gnome.epiphany.gschema.xml.h:52
+msgid "Use a custom CSS file to modify websites own CSS."
+msgstr "Använd en anpassad CSS-fil för att ändra webbplatsers egna CSS."
 
-#: ../data/ui/prefs-dialog.ui.h:20
-msgid "Enable Java_Script"
-msgstr "Använd Java_Script"
+#: ../data/org.gnome.epiphany.gschema.xml.h:53
+#| msgid "_Enable spell checking"
+msgid "Enable spell checking"
+msgstr "Aktivera stavningskontroll"
 
-#: ../data/ui/prefs-dialog.ui.h:22
-msgid "_Always accept"
-msgstr "_Acceptera alltid"
+#: ../data/org.gnome.epiphany.gschema.xml.h:54
+msgid "Spell check any text typed in editable areas."
+msgstr "Stavningskontrollera all text som skrivs in i redigerbara ytor."
 
-#: ../data/ui/prefs-dialog.ui.h:23
-msgid "Only _from sites you visit"
-msgstr "Endast _från webbplatser du besöker"
+#: ../data/org.gnome.epiphany.gschema.xml.h:55
+msgid "Default encoding"
+msgstr "Standardkodning"
 
-#. Refers to "Only from sites you visit" option under Cookies.
-#: ../data/ui/prefs-dialog.ui.h:25
-msgid "<small>For example, not from advertisers on these sites</small>"
-msgstr "<small>Inte från annonsörer på dessa webbplatser, till exempel</small>"
+#: ../data/org.gnome.epiphany.gschema.xml.h:56
+msgid ""
+"Default encoding. Accepted values are the ones WebKitGTK+ can understand."
+msgstr "Standardkodning. Accepterade värden är de som WebKitGTK+ förstår."
 
-#: ../data/ui/prefs-dialog.ui.h:26
-msgid "_Never accept"
-msgstr "A_cceptera aldrig"
+#: ../data/org.gnome.epiphany.gschema.xml.h:57
+msgid "Size of disk cache"
+msgstr "Storlek på diskcache"
 
-#: ../data/ui/prefs-dialog.ui.h:28
-msgid "_Remember passwords"
-msgstr "_Kom ihåg lösenord"
+#: ../data/org.gnome.epiphany.gschema.xml.h:58
+msgid "Size of disk cache, in MB."
+msgstr "Storlek på diskcache, i MB."
 
-#: ../data/ui/prefs-dialog.ui.h:29
-msgid "Temporary Files"
-msgstr "Temporära filer"
+#: ../data/org.gnome.epiphany.gschema.xml.h:59
+#: ../src/resources/prefs-dialog.ui.h:40
+msgid "Languages"
+msgstr "Språk"
 
-#: ../data/ui/prefs-dialog.ui.h:30
-msgid "_Disk space:"
-msgstr "_Diskutrymme:"
+#: ../data/org.gnome.epiphany.gschema.xml.h:60
+msgid "Preferred languages, two letter codes."
+msgstr "Föredragna språk, tvåbokstavskoder."
 
-#: ../data/ui/prefs-dialog.ui.h:31
-msgid "MB"
-msgstr "MB"
+#: ../data/org.gnome.epiphany.gschema.xml.h:61
+msgid "Cookie accept"
+msgstr "Accepterande av kakor"
 
-#. Translators: the mnemonic shouldn't conflict with any of the
-#. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
-#. * Select All, Input Methods and Insert Unicode control character.)
-#.
-#: ../data/ui/prefs-dialog.ui.h:32
-#: ../lib/widgets/ephy-location-entry.c:462
-#: ../src/ephy-history-window.c:231
-#: ../src/pdm-dialog.c:355
-msgid "Cl_ear"
-msgstr "T_öm"
+#: ../data/org.gnome.epiphany.gschema.xml.h:62
+msgid ""
+"Where to accept cookies from. Possible values are \"anywhere\", \"current "
+"site\" and \"nowhere\"."
+msgstr ""
+"Var kakor ska accepteras ifrån. Möjliga värden är \"anywhere"
+"\" (varsomhelst), \"current site\" (aktuell server) och \"nowhere"
+"\" (ingenstans ifrån)."
 
-#: ../data/ui/prefs-dialog.ui.h:33
-msgid "Privacy"
-msgstr "Integritet"
+#: ../data/org.gnome.epiphany.gschema.xml.h:63
+msgid "Image animation mode"
+msgstr "Bildanimeringsläge"
 
-#: ../data/ui/prefs-dialog.ui.h:34
-#: ../src/ephy-encoding-dialog.c:302
-msgid "Encodings"
-msgstr "Teckenkodningar"
+#: ../data/org.gnome.epiphany.gschema.xml.h:64
+msgid ""
+"How to present animated images. Possible values are \"normal\", \"once\" and "
+"\"disabled\"."
+msgstr ""
+"Hur animerade bilder ska presenteras. Möjliga värden är \"normal\", \"once\" "
+"och \"disabled\"."
 
-#: ../data/ui/prefs-dialog.ui.h:35
-msgid "De_fault:"
-msgstr "Stan_dard:"
+#: ../data/org.gnome.epiphany.gschema.xml.h:65
+msgid "Allow popups"
+msgstr "Tillåt popupfönster"
 
-#: ../data/ui/prefs-dialog.ui.h:36
-msgid "Languages"
-msgstr "Språk"
+#: ../data/org.gnome.epiphany.gschema.xml.h:66
+msgid ""
+"Allow sites to open new windows using JavaScript (if JavaScript is enabled)."
+msgstr ""
+"Tillåt webbplatser att öppna nya fönster med hjälp av JavaScript (om "
+"JavaScript är aktiverat)."
 
-#: ../data/ui/prefs-dialog.ui.h:37
-msgid "Spell checking"
-msgstr "Stavningskontroll"
+#: ../data/org.gnome.epiphany.gschema.xml.h:67
+#| msgid "Enable _plugins"
+msgid "Enable Plugins"
+msgstr "Aktivera tillägg"
 
-#: ../data/ui/prefs-dialog.ui.h:38
-msgid "_Enable spell checking"
-msgstr "A_ktivera stavningskontroll"
+#: ../data/org.gnome.epiphany.gschema.xml.h:68
+msgid "Enable JavaScript"
+msgstr "Använd JavaScript"
 
-#: ../data/ui/prefs-dialog.ui.h:39
-#: ../src/prefs-dialog.c:774
-msgid "Language"
-msgstr "Språk"
+#: ../data/org.gnome.epiphany.gschema.xml.h:69
+#| msgid "Enabled"
+msgid "Enable WebGL"
+msgstr "Aktivera WebGL"
 
-#: ../embed/ephy-download.c:217
-msgctxt "file type"
-msgid "Unknown"
-msgstr "Okänd"
+#: ../data/org.gnome.epiphany.gschema.xml.h:70
+msgid "Whether to enable support for WebGL contexts."
+msgstr "Huruvida stöd för WebGL-innehåll ska aktiveras."
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:71
+#| msgid "Enabled"
+msgid "Enable WebAudio"
+msgstr "Aktivera WebAudio"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:72
+msgid "Whether to enable support for WebAudio."
+msgstr "Huruvida stöd för WebAudio ska aktiveras."
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:73
+msgid "Do Not Track"
+msgstr "Spåra mig inte"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:74
+msgid ""
+"Whether to tell websites that we do not wish to be tracked. Please note that "
+"web pages are not forced to follow this setting."
+msgstr ""
+"Huruvida vi säger till webbplatser att vi inte vill spåras. Observera att "
+"webbplatser inte är tvungna att följa denna inställning."
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:75
+#| msgid "Enabled"
+msgid "Enable Adblock"
+msgstr "Aktivera Adblock"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:76
+msgid ""
+"Whether to block the embedded advertisements that web pages might want to "
+"show."
+msgstr "Huruvida inbäddade annonser som webbplatser vill visa ska blockeras."
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:77
+msgid "The downloads folder"
+msgstr "Hämtningsmappen"
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:78
+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."
+msgstr ""
+"Sökvägen till mappen som filer ska hämtas till, eller \"Downloads\" för att "
+"använda standardhämtningsmappen, eller \"Desktop\" för att använda "
+"skrivbordsmappen."
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:79
+#| msgid "Whether to print the page title in the header"
+msgid "Whether to show the title column in the bookmarks window."
+msgstr "Huruvida titelkolumnen i bokmärkesfönstret ska visas."
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:80
+#| msgid "Whether to print the page address in the header"
+msgid "Whether to show the address column in the bookmarks window."
+msgstr "Huruvida adresskolumnen i bokmärkesfönstret ska visas."
+
+#: ../embed/ephy-about-handler.c:141
+msgid "Installed plugins"
+msgstr "Installerade tillägg"
+
+#: ../embed/ephy-about-handler.c:142
+msgid "Plugins"
+msgstr "Tillägg"
+
+#: ../embed/ephy-about-handler.c:145
+msgid "Plugins are disabled in the preferences"
+msgstr "Tillägg är inaktiverade i inställningarna"
+
+#: ../embed/ephy-about-handler.c:158
+msgid "Enabled"
+msgstr "Aktiverad"
+
+#. webkit_plugin_get_enabled (plugin) &&
+#: ../embed/ephy-about-handler.c:158
+msgid "Yes"
+msgstr "Ja"
+
+#: ../embed/ephy-about-handler.c:158
+msgid "No"
+msgstr "Nej"
+
+#: ../embed/ephy-about-handler.c:159
+msgid "MIME type"
+msgstr "MIME-typ"
+
+#: ../embed/ephy-about-handler.c:159
+msgid "Description"
+msgstr "Beskrivning"
+
+#: ../embed/ephy-about-handler.c:159
+msgid "Suffixes"
+msgstr "Filändelser"
+
+#: ../embed/ephy-about-handler.c:220 ../embed/ephy-about-handler.c:222
+msgid "Memory usage"
+msgstr "Minnesanvändning"
+
+#: ../embed/ephy-about-handler.c:270
+#, c-format
+msgid "Version %s"
+msgstr "Version %s"
+
+#: ../embed/ephy-about-handler.c:290
+#| msgid "_About"
+msgid "About Web"
+msgstr "Om Webb"
+
+#: ../embed/ephy-about-handler.c:294
+msgid "A simple, clean, beautiful view of the web"
+msgstr "Ett enkelt, stilrent och vackert sätt att se webben"
+
+#: ../embed/ephy-about-handler.c:345 ../embed/ephy-about-handler.c:346
+msgid "Applications"
+msgstr "Applikationer"
+
+#: ../embed/ephy-about-handler.c:347
+msgid "List of installed web applications"
+msgstr "Lista över installerade webbapplikationer"
+
+#. Note for translators: this refers to the installation date.
+#: ../embed/ephy-about-handler.c:364
+msgid "Installed on:"
+msgstr "Installerades:"
+
+#: ../embed/ephy-about-handler.c:468
+#| msgid "_Remove from Toolbar"
+msgid "Remove from overview"
+msgstr "Ta bort från överblick"
+
+#: ../embed/ephy-about-handler.c:483 ../embed/ephy-embed-utils.c:300
+#| msgctxt "bookmarks"
+#| msgid "Most Visited"
+msgid "Most Visited"
+msgstr "Mest besökta"
+
+#: ../embed/ephy-about-handler.c:542 ../embed/ephy-about-handler.c:543
+msgid "Private Browsing"
+msgstr "Privat surfning"
+
+#: ../embed/ephy-about-handler.c:544
+msgid ""
+"You are currently browsing <em>incognito</em>. Pages viewed in this mode "
+"will not show up in your browsing history and all stored information will be "
+"cleared when you close the window."
+msgstr ""
+"Du surfar nu <em>inkognito</em>. Sidor som visas i detta läge kommer inte "
+"att dyka upp i din sidhistorik och all lagrad information kommer att tömmas "
+"då du stänger fönstret."
+
+#. characters
+#: ../embed/ephy-embed.c:51
+msgid "Blank page"
+msgstr "Tom sida"
 
-#: ../embed/ephy-embed.c:806
-msgid "Web Inspector"
-msgstr "Webbinspektör"
+#: ../embed/ephy-embed.c:542
+#, c-format
+#| msgid "Browse at full screen"
+msgid "Press %s to exit fullscreen"
+msgstr "Tryck %s för att avsluta helskärmsläge"
+
+#. Translators: 'ESC' and 'F11' are keyboard keys.
+#: ../embed/ephy-embed.c:545
+msgid "ESC"
+msgstr "Esc"
 
-#: ../embed/ephy-embed-shell.c:264
-msgid "Epiphany can't be used now. Initialization failed."
-msgstr "Epiphany kan inte användas nu. Initiering misslyckades."
+#: ../embed/ephy-embed.c:545
+msgid "F11"
+msgstr "F11"
 
-#: ../embed/ephy-embed-utils.c:61
+#: ../embed/ephy-embed-utils.c:64
 #, c-format
 msgid "Send an email message to “%s”"
-msgstr "Skicka ett e-postmeddelande till \"%s\""
+msgstr "Skicka ett e-postmeddelande till ”%s”"
 
-#: ../embed/ephy-encodings.c:59
+#: ../embed/ephy-embed-utils.c:243 ../src/ephy-search-provider.c:287
+#, c-format
+msgid "http://duckduckgo.com/?q=%s&amp;t=epiphany"
+msgstr "http://duckduckgo.com/?q=%s&amp;t=epiphany&amp;kl=se-sv&amp;kad=sv_SE"
+
+#: ../embed/ephy-encodings.c:54
 msgid "Arabic (_IBM-864)"
 msgstr "Arabisk (_IBM-864)"
 
-#: ../embed/ephy-encodings.c:60
+#: ../embed/ephy-encodings.c:55
 msgid "Arabic (ISO-_8859-6)"
 msgstr "Arabisk (ISO-_8859-6)"
 
-#: ../embed/ephy-encodings.c:61
+#: ../embed/ephy-encodings.c:56
 msgid "Arabic (_MacArabic)"
 msgstr "Arabisk (_MacArabic)"
 
-#: ../embed/ephy-encodings.c:62
+#: ../embed/ephy-encodings.c:57
 msgid "Arabic (_Windows-1256)"
 msgstr "Arabisk (_Windows-1256)"
 
-#: ../embed/ephy-encodings.c:63
+#: ../embed/ephy-encodings.c:58
 msgid "Baltic (_ISO-8859-13)"
 msgstr "Baltisk (_ISO-8859-13)"
 
-#: ../embed/ephy-encodings.c:64
+#: ../embed/ephy-encodings.c:59
 msgid "Baltic (I_SO-8859-4)"
 msgstr "Baltisk (I_SO-8859-4)"
 
-#: ../embed/ephy-encodings.c:65
+#: ../embed/ephy-encodings.c:60
 msgid "Baltic (_Windows-1257)"
 msgstr "Baltisk (_Windows-1257)"
 
-#: ../embed/ephy-encodings.c:66
+#: ../embed/ephy-encodings.c:61
 msgid "_Armenian (ARMSCII-8)"
 msgstr "_Armenisk (ARMSCII-8)"
 
-#: ../embed/ephy-encodings.c:67
+#: ../embed/ephy-encodings.c:62
 msgid "_Georgian (GEOSTD8)"
 msgstr "_Georgisk (GEOSTD8)"
 
-#: ../embed/ephy-encodings.c:68
+#: ../embed/ephy-encodings.c:63
 msgid "Central European (_IBM-852)"
 msgstr "Centraleuropeisk (_IBM-852)"
 
-#: ../embed/ephy-encodings.c:69
+#: ../embed/ephy-encodings.c:64
 msgid "Central European (I_SO-8859-2)"
 msgstr "Centraleuropeisk (I_SO-8859-2)"
 
-#: ../embed/ephy-encodings.c:70
+#: ../embed/ephy-encodings.c:65
 msgid "Central European (_MacCE)"
 msgstr "Centraleuropeisk (_MacCE)"
 
-#: ../embed/ephy-encodings.c:71
+#: ../embed/ephy-encodings.c:66
 msgid "Central European (_Windows-1250)"
 msgstr "Centraleuropeisk (_Windows-1250)"
 
-#: ../embed/ephy-encodings.c:72
+#: ../embed/ephy-encodings.c:67
 msgid "Chinese Simplified (_GB18030)"
 msgstr "Förenklad kinesisk (_GB18030)"
 
-#: ../embed/ephy-encodings.c:73
+#: ../embed/ephy-encodings.c:68
 msgid "Chinese Simplified (G_B2312)"
 msgstr "Förenklad kinesisk (G_B2312)"
 
-#: ../embed/ephy-encodings.c:74
+#: ../embed/ephy-encodings.c:69
 msgid "Chinese Simplified (GB_K)"
 msgstr "Förenklad kinesisk (GB_K)"
 
-#: ../embed/ephy-encodings.c:75
+#: ../embed/ephy-encodings.c:70
 msgid "Chinese Simplified (_HZ)"
 msgstr "Förenklad kinesisk (_HZ)"
 
-#: ../embed/ephy-encodings.c:76
+#: ../embed/ephy-encodings.c:71
 msgid "Chinese Simplified (_ISO-2022-CN)"
 msgstr "Förenklad kinesisk (_ISO-2022-CN)"
 
-#: ../embed/ephy-encodings.c:77
+#: ../embed/ephy-encodings.c:72
 msgid "Chinese Traditional (Big_5)"
 msgstr "Traditionell kinesisk (Big_5)"
 
-#: ../embed/ephy-encodings.c:78
+#: ../embed/ephy-encodings.c:73
 msgid "Chinese Traditional (Big5-HK_SCS)"
 msgstr "Traditionell kinesisk (Big5-HK_SCS)"
 
-#: ../embed/ephy-encodings.c:79
+#: ../embed/ephy-encodings.c:74
 msgid "Chinese Traditional (_EUC-TW)"
 msgstr "Traditionell kinesisk (_EUC-TW)"
 
-#: ../embed/ephy-encodings.c:80
+#: ../embed/ephy-encodings.c:75
 msgid "Cyrillic (_IBM-855)"
 msgstr "Kyrillisk (_IBM-855)"
 
-#: ../embed/ephy-encodings.c:81
+#: ../embed/ephy-encodings.c:76
 msgid "Cyrillic (I_SO-8859-5)"
 msgstr "Kyrillisk (I_SO-8859-5)"
 
-#: ../embed/ephy-encodings.c:82
+#: ../embed/ephy-encodings.c:77
 msgid "Cyrillic (IS_O-IR-111)"
 msgstr "Kyrillisk (IS_O-IR-111)"
 
-#: ../embed/ephy-encodings.c:83
+#: ../embed/ephy-encodings.c:78
 msgid "Cyrillic (_KOI8-R)"
 msgstr "Kyrillisk (_KOI8-R)"
 
-#: ../embed/ephy-encodings.c:84
+#: ../embed/ephy-encodings.c:79
 msgid "Cyrillic (_MacCyrillic)"
 msgstr "Kyrillisk (_MacCyrillic)"
 
-#: ../embed/ephy-encodings.c:85
+#: ../embed/ephy-encodings.c:80
 msgid "Cyrillic (_Windows-1251)"
 msgstr "Kyrillisk (_Windows-1251)"
 
-#: ../embed/ephy-encodings.c:86
+#: ../embed/ephy-encodings.c:81
 msgid "Cyrillic/_Russian (IBM-866)"
 msgstr "Kyrillisk/_Rysk (IBM-866)"
 
-#: ../embed/ephy-encodings.c:87
+#: ../embed/ephy-encodings.c:82
 msgid "Greek (_ISO-8859-7)"
 msgstr "Grekisk (_ISO-8859-7)"
 
-#: ../embed/ephy-encodings.c:88
+#: ../embed/ephy-encodings.c:83
 msgid "Greek (_MacGreek)"
 msgstr "Grekisk (_MacGreek)"
 
-#: ../embed/ephy-encodings.c:89
+#: ../embed/ephy-encodings.c:84
 msgid "Greek (_Windows-1253)"
 msgstr "Grekisk (_Windows-1253)"
 
-#: ../embed/ephy-encodings.c:90
+#: ../embed/ephy-encodings.c:85
 msgid "Gujarati (_MacGujarati)"
 msgstr "Gujarati (_MacGujarati)"
 
-#: ../embed/ephy-encodings.c:91
+#: ../embed/ephy-encodings.c:86
 msgid "Gurmukhi (Mac_Gurmukhi)"
 msgstr "Gurmuki (Mac_Gurmukhi)"
 
-#: ../embed/ephy-encodings.c:92
+#: ../embed/ephy-encodings.c:87
 msgid "Hindi (Mac_Devanagari)"
 msgstr "Hindi (Mac_Devanagari)"
 
-#: ../embed/ephy-encodings.c:93
+#: ../embed/ephy-encodings.c:88
 msgid "Hebrew (_IBM-862)"
 msgstr "Hebreisk (_IBM-862)"
 
-#: ../embed/ephy-encodings.c:94
+#: ../embed/ephy-encodings.c:89
 msgid "Hebrew (IS_O-8859-8-I)"
 msgstr "Hebreisk (IS_O-8859-8-I)"
 
-#: ../embed/ephy-encodings.c:95
+#: ../embed/ephy-encodings.c:90
 msgid "Hebrew (_MacHebrew)"
 msgstr "Hebreisk (_MacHebrew)"
 
-#: ../embed/ephy-encodings.c:96
+#: ../embed/ephy-encodings.c:91
 msgid "Hebrew (_Windows-1255)"
 msgstr "Hebreisk (_Windows-1255)"
 
-#: ../embed/ephy-encodings.c:97
+#: ../embed/ephy-encodings.c:92
 msgid "_Visual Hebrew (ISO-8859-8)"
 msgstr "_Visuell hebreisk (ISO-8859-8)"
 
-#: ../embed/ephy-encodings.c:98
+#: ../embed/ephy-encodings.c:93
 msgid "Japanese (_EUC-JP)"
 msgstr "Japansk (_EUC-JP)"
 
-#: ../embed/ephy-encodings.c:99
+#: ../embed/ephy-encodings.c:94
 msgid "Japanese (_ISO-2022-JP)"
 msgstr "Japansk (_ISO-2022-JP)"
 
-#: ../embed/ephy-encodings.c:100
+#: ../embed/ephy-encodings.c:95
 msgid "Japanese (_Shift-JIS)"
 msgstr "Japansk (_Shift-JIS)"
 
-#: ../embed/ephy-encodings.c:101
+#: ../embed/ephy-encodings.c:96
 msgid "Korean (_EUC-KR)"
 msgstr "Koreansk (_EUC-KR)"
 
-#: ../embed/ephy-encodings.c:102
+#: ../embed/ephy-encodings.c:97
 msgid "Korean (_ISO-2022-KR)"
 msgstr "Koreansk (_ISO-2022-KR)"
 
-#: ../embed/ephy-encodings.c:103
+#: ../embed/ephy-encodings.c:98
 msgid "Korean (_JOHAB)"
 msgstr "Koreansk (_JOHAB)"
 
-#: ../embed/ephy-encodings.c:104
+#: ../embed/ephy-encodings.c:99
 msgid "Korean (_UHC)"
 msgstr "Koreansk (_UHC)"
 
-#: ../embed/ephy-encodings.c:105
+#: ../embed/ephy-encodings.c:100
 msgid "_Celtic (ISO-8859-14)"
 msgstr "_Keltisk (ISO-8859-14)"
 
-#: ../embed/ephy-encodings.c:106
+#: ../embed/ephy-encodings.c:101
 msgid "_Icelandic (MacIcelandic)"
 msgstr "_Isländsk (MacIcelandic)"
 
-#: ../embed/ephy-encodings.c:107
+#: ../embed/ephy-encodings.c:102
 msgid "_Nordic (ISO-8859-10)"
 msgstr "_Nordisk (ISO-8859-10)"
 
-#: ../embed/ephy-encodings.c:108
+#: ../embed/ephy-encodings.c:103
 msgid "_Persian (MacFarsi)"
 msgstr "_Persisk (MacFarsi)"
 
-#: ../embed/ephy-encodings.c:109
+#: ../embed/ephy-encodings.c:104
 msgid "Croatian (Mac_Croatian)"
 msgstr "Kroatisk (Mac_Croatian)"
 
-#: ../embed/ephy-encodings.c:110
+#: ../embed/ephy-encodings.c:105
 msgid "_Romanian (MacRomanian)"
 msgstr "_Rumänsk (MacRomanian)"
 
-#: ../embed/ephy-encodings.c:111
+#: ../embed/ephy-encodings.c:106
 msgid "R_omanian (ISO-8859-16)"
 msgstr "R_umänsk (ISO-8859-16)"
 
-#: ../embed/ephy-encodings.c:112
+#: ../embed/ephy-encodings.c:107
 msgid "South _European (ISO-8859-3)"
 msgstr "Syd_europeisk (ISO-8859-3)"
 
-#: ../embed/ephy-encodings.c:113
+#: ../embed/ephy-encodings.c:108
 msgid "Thai (TIS-_620)"
 msgstr "Thailändsk (TIS-_620)"
 
-#: ../embed/ephy-encodings.c:114
+#: ../embed/ephy-encodings.c:109
 msgid "Thai (IS_O-8859-11)"
 msgstr "Thailändsk (IS_O-8859-11)"
 
-#: ../embed/ephy-encodings.c:115
+#: ../embed/ephy-encodings.c:110
 msgid "_Thai (Windows-874)"
 msgstr "_Thailändsk (Windows-874)"
 
-#: ../embed/ephy-encodings.c:116
+#: ../embed/ephy-encodings.c:111
 msgid "Turkish (_IBM-857)"
 msgstr "Turkisk (_IBM-857)"
 
-#: ../embed/ephy-encodings.c:117
+#: ../embed/ephy-encodings.c:112
 msgid "Turkish (I_SO-8859-9)"
 msgstr "Turkisk (I_SO-8859-9)"
 
-#: ../embed/ephy-encodings.c:118
+#: ../embed/ephy-encodings.c:113
 msgid "Turkish (_MacTurkish)"
 msgstr "Turkisk (_MacTurkish)"
 
-#: ../embed/ephy-encodings.c:119
+#: ../embed/ephy-encodings.c:114
 msgid "Turkish (_Windows-1254)"
 msgstr "Turkisk (_Windows-1254)"
 
-#: ../embed/ephy-encodings.c:120
+#: ../embed/ephy-encodings.c:115
 msgid "Unicode (UTF-_8)"
 msgstr "Unicode (UTF-_8)"
 
-#: ../embed/ephy-encodings.c:121
+#: ../embed/ephy-encodings.c:116
 msgid "Cyrillic/Ukrainian (_KOI8-U)"
 msgstr "Kyrillisk/Ukrainsk (_KOI8-U)"
 
-#: ../embed/ephy-encodings.c:122
+#: ../embed/ephy-encodings.c:117
 msgid "Cyrillic/Ukrainian (Mac_Ukrainian)"
 msgstr "Kyrillisk/Ukrainsk (Mac_Ukrainian)"
 
-#: ../embed/ephy-encodings.c:123
+#: ../embed/ephy-encodings.c:118
 msgid "Vietnamese (_TCVN)"
 msgstr "Vietnamesisk (_TCVN)"
 
-#: ../embed/ephy-encodings.c:124
+#: ../embed/ephy-encodings.c:119
 msgid "Vietnamese (_VISCII)"
 msgstr "Vietnamesisk (_VISCII)"
 
-#: ../embed/ephy-encodings.c:125
+#: ../embed/ephy-encodings.c:120
 msgid "Vietnamese (V_PS)"
 msgstr "Vietnamesisk (V_PS)"
 
-#: ../embed/ephy-encodings.c:126
+#: ../embed/ephy-encodings.c:121
 msgid "Vietnamese (_Windows-1258)"
 msgstr "Vietnamesisk (_Windows-1258)"
 
-#: ../embed/ephy-encodings.c:127
+#: ../embed/ephy-encodings.c:122
 msgid "Western (_IBM-850)"
 msgstr "Västerländsk (_IBM-850)"
 
-#: ../embed/ephy-encodings.c:128
+#: ../embed/ephy-encodings.c:123
 msgid "Western (_ISO-8859-1)"
 msgstr "Västerländsk (_ISO-8859-1)"
 
-#: ../embed/ephy-encodings.c:129
+#: ../embed/ephy-encodings.c:124
 msgid "Western (IS_O-8859-15)"
 msgstr "Västerländsk (IS_O-8859-15)"
 
-#: ../embed/ephy-encodings.c:130
+#: ../embed/ephy-encodings.c:125
 msgid "Western (_MacRoman)"
 msgstr "Västerländsk (_MacRoman)"
 
-#: ../embed/ephy-encodings.c:131
+#: ../embed/ephy-encodings.c:126
 msgid "Western (_Windows-1252)"
 msgstr "Västerländsk (_Windows-1252)"
 
-#. the following encodings are so rarely used that we don't want to pollute the "related"
-#. * part of the encodings menu with them, so we set the language group to 0 here
+#. The following encodings are so rarely used that we don't want to
+#. * pollute the "related" part of the encodings menu with them, so we
+#. * set the language group to 0 here.
 #.
-#: ../embed/ephy-encodings.c:136
+#: ../embed/ephy-encodings.c:132
 msgid "English (_US-ASCII)"
 msgstr "Engelsk (_US-ASCII)"
 
-#: ../embed/ephy-encodings.c:137
+#: ../embed/ephy-encodings.c:133
 msgid "Unicode (UTF-_16 BE)"
 msgstr "Unicode (UTF-_16 BE)"
 
-#: ../embed/ephy-encodings.c:138
+#: ../embed/ephy-encodings.c:134
 msgid "Unicode (UTF-1_6 LE)"
 msgstr "Unicode (UTF-1_6 LE)"
 
-#: ../embed/ephy-encodings.c:139
+#: ../embed/ephy-encodings.c:135
 msgid "Unicode (UTF-_32 BE)"
 msgstr "Unicode (UTF-_32 BE)"
 
-#: ../embed/ephy-encodings.c:140
+#: ../embed/ephy-encodings.c:136
 msgid "Unicode (UTF-3_2 LE)"
 msgstr "Unicode (UTF-3_2 LE)"
 
-#. translators: this is the title that an unknown encoding will
+#. Translators: this is the title that an unknown encoding will
 #. * be displayed as.
 #.
-#: ../embed/ephy-encodings.c:281
+#: ../embed/ephy-encodings.c:218
 #, c-format
 msgid "Unknown (%s)"
 msgstr "Okänd (%s)"
 
-# Detta används i historiken och bland bokmärkena i betydelserna
-# "alla webbplatser", "alla bokmärken".
-#: ../embed/ephy-history.c:474
-msgid "All"
-msgstr "Alla"
-
-#: ../embed/ephy-history.c:640
-#: ../lib/history/ephy-history-service-hosts-table.c:360
-msgid "Others"
-msgstr "Andra"
-
-#: ../embed/ephy-history.c:646
-#: ../lib/history/ephy-history-service-hosts-table.c:364
-msgid "Local files"
-msgstr "Lokala filer"
-
-#: ../embed/ephy-request-about.c:101
-#: ../embed/ephy-request-about.c:104
-msgid "Installed plugins"
-msgstr "Installerade tillägg"
-
-#: ../embed/ephy-request-about.c:116
-msgid "Enabled"
-msgstr "Aktiverad"
-
-#: ../embed/ephy-request-about.c:116
-msgid "Yes"
-msgstr "Ja"
-
-#: ../embed/ephy-request-about.c:116
-msgid "No"
-msgstr "Nej"
-
-#: ../embed/ephy-request-about.c:117
-msgid "MIME type"
-msgstr "MIME-typ"
-
-#: ../embed/ephy-request-about.c:117
-msgid "Description"
-msgstr "Beskrivning"
-
-#: ../embed/ephy-request-about.c:117
-msgid "Suffixes"
-msgstr "Filändelser"
-
-#: ../embed/ephy-request-about.c:146
-#: ../embed/ephy-request-about.c:149
-msgid "Memory usage"
-msgstr "Minnesanvändning"
-
-#: ../embed/ephy-request-about.c:175
-#: ../embed/ephy-request-about.c:177
-msgid "Applications"
-msgstr "Applikationer"
+#: ../embed/ephy-find-toolbar.c:105
+#| msgid "Not found"
+msgid "Text not found"
+msgstr "Texten hittades inte"
 
-#: ../embed/ephy-request-about.c:178
-msgid "List of installed web applications"
-msgstr "Lista över installerade webbapplikationer"
+#: ../embed/ephy-find-toolbar.c:112
+msgid "Search wrapped back to the top"
+msgstr "Sökning började om från början"
 
-#. Note for translators: this refers to the installation date.
-#: ../embed/ephy-request-about.c:195
-msgid "Installed on:"
-msgstr "Installerades:"
+#: ../embed/ephy-find-toolbar.c:456
+msgid "Type to search…"
+msgstr "Skriv för att söka…"
 
-#. characters
-#. ms
-#. RELOAD_DELAY * RELOAD_DELAY_MAX_TICKS = 10 s
-#: ../embed/ephy-web-view.c:72
-#: ../embed/ephy-web-view.c:3463
-msgid "Blank page"
-msgstr "Tom sida"
+#: ../embed/ephy-find-toolbar.c:462
+msgid "Find previous occurrence of the search string"
+msgstr "Sök föregående förekomst av söksträngen"
 
-#: ../embed/ephy-web-view.c:761
-msgid "_Not now"
-msgstr "_Inte nu"
+#: ../embed/ephy-find-toolbar.c:470
+msgid "Find next occurrence of the search string"
+msgstr "Sök nästa förekomst av söksträngen"
 
-#: ../embed/ephy-web-view.c:766
-msgid "_Store password"
-msgstr "_Lagra lösenord"
+#: ../embed/ephy-web-view.c:488 ../src/window-commands.c:330
+msgid "Save"
+msgstr "Spara"
 
-#. Translators: The first %s is the username and the second one is the
-#. * hostname where this is happening. Example: gnome@gmail.com and
-#. * mail.google.com.
+#. Translators: The %s the hostname where this is happening.
+#. * Example: mail.google.com.
 #.
-#: ../embed/ephy-web-view.c:777
+#: ../embed/ephy-web-view.c:500
 #, c-format
-msgid "<big>Would you like to store the password for <b>%s</b> in <b>%s</b>?</big>"
-msgstr "<big>Vill du lagra lösenordet för <b>%s</b> på <b>%s</b>?</big>"
+msgid "Do you want to save your password for “%s”?"
+msgstr "Vill du spara ditt lösenord för ”%s”?"
 
-#. Translators: Geolocation policy for a specific site.
-#: ../embed/ephy-web-view.c:1748
+#: ../embed/ephy-web-view.c:1380
 msgid "Deny"
 msgstr "Neka"
 
-#. Translators: Geolocation policy for a specific site.
-#: ../embed/ephy-web-view.c:1754
+#: ../embed/ephy-web-view.c:1381
 msgid "Allow"
 msgstr "Tillåt"
 
-#: ../embed/ephy-web-view.c:1761
+#: ../embed/ephy-web-view.c:1391
 #, c-format
 msgid "The page at <b>%s</b> wants to know your location."
 msgstr "Sidan på <b>%s</b> vill veta din geografiska plats."
 
-#: ../embed/ephy-web-view.c:2041
-msgid "None specified"
-msgstr "Inget angivet"
-
-#: ../embed/ephy-web-view.c:2050
-#: ../embed/ephy-web-view.c:2068
-#, c-format
-msgid "Oops! Error loading %s"
-msgstr "Oops! Fel vid inläsning av %s"
-
-#: ../embed/ephy-web-view.c:2052
-msgid "Oops! It was not possible to show this website"
-msgstr "Hoppsan! Det var omöjligt att visa denna webbplats"
-
-#: ../embed/ephy-web-view.c:2053
-#, c-format
-msgid "<p>The website at <strong>%s</strong> seems to be unavailable. The precise error was:</p><p><em>%s</em></p><p>It could be temporarily switched off or moved to a new address. Don't forget to check that your internet connection is working correctly.</p>"
-msgstr "<p>Webbplatsen på <strong>%s</strong> verkar inte vara tillgänglig. Det exakta felet var:</p><p><em>%s</em></p><p>Den kan vara avstängd för tillfället eller har flyttats till en ny adress. Glöm inte att kontrollera att din internetanslutning fungerar som den ska.</p>"
-
-#: ../embed/ephy-web-view.c:2062
-msgid "Try again"
-msgstr "Försök igen"
-
-#: ../embed/ephy-web-view.c:2070
-msgid "Oops! This site might have caused the web browser to close unexpectedly"
-msgstr "Hoppsan! Denna webbplats kan ha orsakat att Epiphany stängdes oväntat"
-
-#: ../embed/ephy-web-view.c:2072
-#, c-format
-msgid "<p>This page was loading when the web browser closed unexpectedly.</p><p>This might happen again if you reload the page. If it does, please report the problem to the <strong>%s</strong> developers.</p>"
-msgstr "<p>Denna sida lästes in när webbläsaren oväntat stängdes.</p><p>Detta kan hända igen om du uppdaterar sidan. Om det sker så rapportera problemet till <strong>%s</strong>-utvecklarna.</p>"
-
-#: ../embed/ephy-web-view.c:2080
-msgid "Load again anyway"
-msgstr "Läs in igen ändå"
-
-#: ../embed/ephy-web-view.c:2348
-#, c-format
-msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8"
-msgstr "http://www.google.se/search?q=%s&ie=UTF-8&oe=UTF-8"
-
-#: ../embed/ephy-web-view.c:2634
-msgid "Plugins"
-msgstr "Tillägg"
-
 #. translators: %s here is the address of the web page
-#: ../embed/ephy-web-view.c:2741
+#: ../embed/ephy-web-view.c:1475
 #, c-format
 msgid "Loading “%s”…"
-msgstr "Läser in \"%s\"..."
+msgstr "Läser in ”%s”…"
 
-#: ../embed/ephy-web-view.c:2743
+#: ../embed/ephy-web-view.c:1477
 msgid "Loading…"
-msgstr "Läser in..."
-
-#. Translators: this is the directory name to store auxilary files
-#. * when saving html files.
-#.
-#: ../embed/ephy-web-view.c:3667
-#, c-format
-msgid "%s Files"
-msgstr "Filer för %s"
+msgstr "Läser in…"
 
-#: ../lib/egg/eggdesktopfile.c:165
-#, c-format
-msgid "File is not a valid .desktop file"
-msgstr "Filen är inte en giltig .desktop-fil"
+#: ../embed/ephy-web-view.c:1718
+msgid "None specified"
+msgstr "Inget angivet"
 
-#: ../lib/egg/eggdesktopfile.c:188
+#: ../embed/ephy-web-view.c:1731 ../embed/ephy-web-view.c:1746
 #, c-format
-msgid "Unrecognized desktop file Version '%s'"
-msgstr "Okänd Version \"%s\" i desktop-fil"
+#| msgid "Loading “%s”…"
+msgid "Problem loading “%s”"
+msgstr "Problem vid inläsning av ”%s”"
 
-#: ../lib/egg/eggdesktopfile.c:958
-#, c-format
-msgid "Starting %s"
-msgstr "Startar %s"
+#: ../embed/ephy-web-view.c:1733
+#| msgid "Oops! It was not possible to show this website"
+msgid "Oops! Unable to display this website."
+msgstr "Hoppsan! Kunde inte visa denna webbplats."
 
-#: ../lib/egg/eggdesktopfile.c:1100
+#: ../embed/ephy-web-view.c:1734
 #, c-format
-msgid "Application does not accept documents on command line"
-msgstr "Programmet tar inte emot dokument på kommandoraden"
+#| msgid ""
+#| "<p>The website at <strong>%s</strong> seems to be unavailable. The "
+#| "precise error was:</p><p><em>%s</em></p><p>It could be temporarily "
+#| "switched off or moved to a new address. Don't forget to check that your "
+#| "internet connection is working correctly.</p>"
+msgid ""
+"<p>The site at “%s” seems to be unavailable. The precise error was:</"
+"p><p><code>%s</code></p><p>It may be temporarily unavailable or moved to a "
+"new address. You may wish to verify that your internet connection is working "
+"correctly.</p>"
+msgstr ""
+"<p>Webbplatsen på ”%s” verkar inte vara tillgänglig. Det exakta felet var:</"
+"p><p><code>%s</code></p><p>Den kan vara avstängd för tillfället eller har "
+"flyttats till en ny adress. Glöm inte att kontrollera att din "
+"internetanslutning fungerar som den ska.</p>"
 
-#: ../lib/egg/eggdesktopfile.c:1168
-#, c-format
-msgid "Unrecognized launch option: %d"
-msgstr "Okänt startalternativ: %d"
+#: ../embed/ephy-web-view.c:1742
+msgid "Try again"
+msgstr "Försök igen"
 
-#: ../lib/egg/eggdesktopfile.c:1373
-#, c-format
-msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr "Kan inte skicka dokument-URI:er till en \"Type=Link\"-skrivbordspost"
+#: ../embed/ephy-web-view.c:1748
+msgid "Oops! There may be a problem."
+msgstr "Hoppsan! Det kan ha uppstått ett problem."
 
-#: ../lib/egg/eggdesktopfile.c:1392
+#: ../embed/ephy-web-view.c:1749
 #, c-format
-msgid "Not a launchable item"
-msgstr "Inte ett startbart objekt"
-
-#: ../lib/egg/eggsmclient.c:225
-msgid "Disable connection to session manager"
-msgstr "Inaktivera anslutning till sessionshanterare"
-
-#: ../lib/egg/eggsmclient.c:228
-msgid "Specify file containing saved configuration"
-msgstr "Ange fil som innehåller sparad konfiguration"
-
-#: ../lib/egg/eggsmclient.c:228
-#: ../src/ephy-main.c:88
-#: ../src/ephy-main.c:90
-msgid "FILE"
-msgstr "FIL"
-
-#: ../lib/egg/eggsmclient.c:231
-msgid "Specify session management ID"
-msgstr "Ange id för sessionshantering"
+#| msgid ""
+#| "<p>This page was loading when the web browser closed unexpectedly.</"
+#| "p><p>This might happen again if you reload the page. If it does, please "
+#| "report the problem to the <strong>%s</strong> developers.</p>"
+msgid ""
+"<p>This site may have caused Web to close unexpectedly.</p><p>If this "
+"happens again, please report the problem to the <strong>%s</strong> "
+"developers.</p>"
+msgstr ""
+"<p>Denna sida kan ha fått Webb att oväntat stängas.</p><p>Rapportera gärna "
+"problemet till <strong>%s</strong>-utvecklarna om det händer igen.</p>"
 
-#: ../lib/egg/eggsmclient.c:231
-msgid "ID"
-msgstr "ID"
+#: ../embed/ephy-web-view.c:1754 ../embed/ephy-web-view.c:1761
+#| msgid "Load again anyway"
+msgid "Reload Anyway"
+msgstr "Uppdatera ändå"
 
-#: ../lib/egg/eggsmclient.c:252
-msgid "Session management options:"
-msgstr "Flaggor för sessionshantering:"
+#: ../embed/ephy-web-view.c:1758
+#, c-format
+#| msgid "Save link “%s”"
+msgid "Problem displaying “%s”"
+msgstr "Problem med att visa ”%s”"
 
-#: ../lib/egg/eggsmclient.c:253
-msgid "Show session management options"
-msgstr "Visa flaggor för sessionshantering"
+#: ../embed/ephy-web-view.c:1759
+msgid "Oops!"
+msgstr "Hoppsan!"
 
-#: ../lib/ephy-file-chooser.c:382
+#: ../embed/ephy-web-view.c:1760
+msgid ""
+"Something went wrong while displaying this page. Please reload or visit a "
+"different page to continue."
+msgstr ""
+"Något gick fel då denna sida skulle visas. Uppdatera sidan eller besök en "
+"annan sida för att fortsätta."
+
+#: ../embed/ephy-web-view.c:2607
+msgid "_OK"
+msgstr "_OK"
+
+#: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193
+#: ../src/bookmarks/ephy-bookmark-properties.c:428
+#: ../src/bookmarks/ephy-bookmarks-editor.c:819
+#: ../src/resources/clear-data-dialog.ui.h:3
+#: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:808
+#| msgid "Cancel"
+msgid "_Cancel"
+msgstr "A_vbryt"
+
+#: ../lib/ephy-file-chooser.c:185 ../src/resources/history-dialog.ui.h:7
+#| msgid "Open"
+msgid "_Open"
+msgstr "Ö_ppna"
+
+#: ../lib/ephy-file-chooser.c:194
+#| msgid "Save"
+msgid "_Save"
+msgstr "_Spara"
+
+#: ../lib/ephy-file-chooser.c:209
 msgid "All supported types"
 msgstr "Alla typer som stöds"
 
-#: ../lib/ephy-file-chooser.c:393
+#: ../lib/ephy-file-chooser.c:221
 msgid "Web pages"
 msgstr "Webbsidor"
 
-#: ../lib/ephy-file-chooser.c:401
+#: ../lib/ephy-file-chooser.c:230
 msgid "Images"
 msgstr "Bilder"
 
-#: ../lib/ephy-file-chooser.c:409
-#: ../src/bookmarks/ephy-bookmarks-editor.c:635
+#: ../lib/ephy-file-chooser.c:238 ../src/bookmarks/ephy-bookmarks-editor.c:637
 msgid "All files"
 msgstr "Alla filer"
 
 #. If we don't have XDG user dirs info, return an educated guess.
-#: ../lib/ephy-file-helpers.c:162
+#: ../lib/ephy-file-helpers.c:112 ../src/resources/prefs-dialog.ui.h:2
+msgid "Downloads"
+msgstr "Hämtningar"
+
+#. If we don't have XDG user dirs info, return an educated guess.
+#: ../lib/ephy-file-helpers.c:165
 msgid "Desktop"
 msgstr "Skrivbord"
 
-#: ../lib/ephy-file-helpers.c:325
+#: ../lib/ephy-file-helpers.c:333
 #, c-format
 msgid "Could not create a temporary directory in “%s”."
-msgstr "Kunde inte skapa en temporär katalog i \"%s\"."
+msgstr "Kunde inte skapa en temporär katalog i ”%s”."
 
-#: ../lib/ephy-file-helpers.c:421
+#: ../lib/ephy-file-helpers.c:469
 #, c-format
 msgid "The file “%s” exists. Please move it out of the way."
-msgstr "Filen \"%s\" existerar. Vänligen flytta bort den."
+msgstr "Filen ”%s” existerar. Vänligen flytta bort den."
 
-#: ../lib/ephy-file-helpers.c:432
+#: ../lib/ephy-file-helpers.c:490
 #, c-format
 msgid "Failed to create directory “%s”."
-msgstr "Misslyckades med att skapa katalogen %s."
+msgstr "Misslyckades med att skapa katalogen ”%s”."
+
+#. Translators: The first %s is the username and the second one is the
+#. * hostname where this is happening. Example: gnome@gmail.com and
+#. * mail.google.com.
+#.
+#: ../lib/ephy-form-auth-data.c:139
+#, c-format
+msgid "Password for %s in a form in %s"
+msgstr "Lösenord för %s i ett formulär på %s"
+
+#. Translators: The first %s is the hostname where this is happening.
+#. * Example: mail.google.com.
+#.
+#: ../lib/ephy-form-auth-data.c:145
+#, c-format
+msgid "Password in a form in %s"
+msgstr "Lösenord i ett formulär på %s"
 
 #: ../lib/ephy-gui.c:206
 #, c-format
 msgid "Directory “%s” is not writable"
-msgstr "Katalogen \"%s\" är inte skrivbar"
+msgstr "Katalogen ”%s” är inte skrivbar"
 
 #: ../lib/ephy-gui.c:210
 msgid "You do not have permission to create files in this directory."
@@ -928,11 +1166,15 @@ msgstr "Katalogen är inte skrivbar"
 #: ../lib/ephy-gui.c:242
 #, c-format
 msgid "Cannot overwrite existing file “%s”"
-msgstr "Kan inte skriva över existerande filen \"%s\""
+msgstr "Kan inte skriva över den existerande filen ”%s”"
 
 #: ../lib/ephy-gui.c:246
-msgid "A file with this name already exists and you don't have permission to overwrite it."
-msgstr "Det finns redan en fil med detta namn och du har inte rättighet att skriva över den."
+msgid ""
+"A file with this name already exists and you don't have permission to "
+"overwrite it."
+msgstr ""
+"Det finns redan en fil med detta namn och du har inte rättighet att skriva "
+"över den."
 
 #: ../lib/ephy-gui.c:249
 msgid "Cannot Overwrite File"
@@ -948,13 +1190,50 @@ msgid "Master password needed"
 msgstr "Huvudlösenordet behövs"
 
 #: ../lib/ephy-nss-glue.c:64
-msgid "The passwords from the previous version (Gecko) are locked with a master password. If you want Epiphany to import them, please enter your master password below."
-msgstr "Lösenorden från den tidigare versionen (Gecko) är låsta med ett huvudlösenord. Ange ditt huvudlösenord nedan om du vill att Epiphany ska importera dem."
+#| msgid ""
+#| "The passwords from the previous version (Gecko) are locked with a master "
+#| "password. If you want Epiphany to import them, please enter your master "
+#| "password below."
+msgid ""
+"The passwords from the previous version are locked with a master password. "
+"If you want to import them, please enter your master password below."
+msgstr ""
+"Lösenorden från den tidigare versionen är låsta med ett huvudlösenord. Ange "
+"ditt huvudlösenord nedan om du vill importera dem."
 
-#: ../lib/ephy-profile-migrator.c:82
+#: ../lib/ephy-profile-migrator.c:100
 msgid "Failed to copy cookies file from Mozilla."
 msgstr "Misslyckades med att kopiera cookie-filen från Mozilla. "
 
+#: ../lib/ephy-profile-migrator.c:652
+msgid ""
+"Web 3.6 deprecated this directory and tried migrating this configuration to "
+"~/.config/epiphany"
+msgstr ""
+"Webb 3.6 fasade ut denna katalog och försökte migrera denna inställning till "
+"~/.config/epiphany"
+
+#: ../lib/ephy-profile-migrator.c:1030
+msgid "Executes only the n-th migration step"
+msgstr "Utför bara det n:te migrationssteget"
+
+#: ../lib/ephy-profile-migrator.c:1032
+msgid "Specifies the required version for the migrator"
+msgstr "Anger versionen som krävs för migrationsverktyget"
+
+#: ../lib/ephy-profile-migrator.c:1034
+msgid "Specifies the profile where the migrator should run"
+msgstr "Anger profilen där migrationsverktyget ska köra"
+
+#: ../lib/ephy-profile-migrator.c:1047
+msgid "Web profile migrator"
+msgstr "Migrationsverktyg för webbprofiler"
+
+#: ../lib/ephy-profile-migrator.c:1048
+#| msgid "GNOME Web Browser options"
+msgid "Web profile migrator options"
+msgstr "Alternativ för migrationsverktyget för webbprofiler"
+
 #. Translators: "friendly time" string for the current day, strftime format. like "Today 12:34 am"
 #: ../lib/ephy-time-helpers.c:223
 msgid "Today %I:%M %p"
@@ -979,7 +1258,7 @@ msgstr "%a %H.%M"
 #.
 #: ../lib/ephy-time-helpers.c:264
 msgid "%b %d %I:%M %p"
-msgstr "%b %d %H.%M"
+msgstr "%d %b %H.%M"
 
 #. Translators: "friendly time" string for a day in a different year,
 #. * strftime format. e.g. "Feb 12 1997"
@@ -993,201 +1272,259 @@ msgstr "%d %b %Y"
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../lib/ephy-zoom.h:44
+#: ../lib/ephy-zoom.h:45
 msgid "50%"
 msgstr "50%"
 
-#: ../lib/ephy-zoom.h:45
+#: ../lib/ephy-zoom.h:46
 msgid "75%"
 msgstr "75%"
 
-#: ../lib/ephy-zoom.h:46
+#: ../lib/ephy-zoom.h:47
 msgid "100%"
 msgstr "100%"
 
-#: ../lib/ephy-zoom.h:47
+#: ../lib/ephy-zoom.h:48
 msgid "125%"
 msgstr "125%"
 
-#: ../lib/ephy-zoom.h:48
+#: ../lib/ephy-zoom.h:49
 msgid "150%"
 msgstr "150%"
 
-#: ../lib/ephy-zoom.h:49
+#: ../lib/ephy-zoom.h:50
 msgid "175%"
 msgstr "175%"
 
-#: ../lib/ephy-zoom.h:50
+#: ../lib/ephy-zoom.h:51
 msgid "200%"
 msgstr "200%"
 
-#: ../lib/ephy-zoom.h:51
+#: ../lib/ephy-zoom.h:52
 msgid "300%"
 msgstr "300%"
 
-#: ../lib/ephy-zoom.h:52
+#: ../lib/ephy-zoom.h:53
 msgid "400%"
 msgstr "400%"
 
-#: ../lib/widgets/ephy-download-widget.c:88
-#, c-format
-msgid "%u:%02u hour left"
-msgid_plural "%u:%02u hours left"
-msgstr[0] "%u:%02u timme kvar"
-msgstr[1] "%u:%02u timmar kvar"
+#: ../lib/history/ephy-history-service-hosts-table.c:363
+msgid "Others"
+msgstr "Andra"
 
-#: ../lib/widgets/ephy-download-widget.c:90
-#, c-format
-msgid "%u hour left"
-msgid_plural "%u hours left"
-msgstr[0] "%u timme kvar"
-msgstr[1] "%u timmar kvar"
+#: ../lib/history/ephy-history-service-hosts-table.c:367
+msgid "Local files"
+msgstr "Lokala filer"
 
-#: ../lib/widgets/ephy-download-widget.c:93
-#, c-format
-msgid "%u:%02u minute left"
-msgid_plural "%u:%02u minutes left"
-msgstr[0] "%u:%02u minut kvar"
-msgstr[1] "%u:%02u minuter kvar"
+#: ../lib/widgets/ephy-certificate-dialog.c:92
+msgid "The certificate does not match the expected identity"
+msgstr "Certifikatet överensstämmer inte med den förväntade identiteten"
 
-#: ../lib/widgets/ephy-download-widget.c:95
-#, c-format
-msgid "%u second left"
-msgid_plural "%u seconds left"
-msgstr[0] "%u sekund kvar"
-msgstr[1] "%u sekunder kvar"
+#: ../lib/widgets/ephy-certificate-dialog.c:95
+#| msgid "Certificate _Fields"
+msgid "The certificate has expired"
+msgstr "Certifikatet har gått ut"
 
-#: ../lib/widgets/ephy-download-widget.c:164
-msgid "Finished"
-msgstr "Färdig"
+#: ../lib/widgets/ephy-certificate-dialog.c:98
+msgid "The signing certificate authority is not known"
+msgstr "Den signerande certifikatutfärdaren är okänd"
 
-#: ../lib/widgets/ephy-download-widget.c:203
-#, c-format
-msgid "Error downloading: %s"
-msgstr "Fel vid hämtning: %s"
+#: ../lib/widgets/ephy-certificate-dialog.c:101
+msgid "The certificate contains errors"
+msgstr "Certifikatet innehåller fel"
 
-#: ../lib/widgets/ephy-download-widget.c:271
-#: ../src/window-commands.c:482
-msgid "Cancel"
-msgstr "Avbryt"
+#: ../lib/widgets/ephy-certificate-dialog.c:104
+msgid "The certificate has been revoked"
+msgstr "Certifikatet har spärrats"
 
-#: ../lib/widgets/ephy-download-widget.c:280
-#: ../src/ephy-window.c:1276
-#: ../src/window-commands.c:263
-msgid "Open"
-msgstr "Öppna"
+#: ../lib/widgets/ephy-certificate-dialog.c:107
+msgid "The certificate is signed using a weak signature algorithm"
+msgstr "Certifikatet är signerat med en svag algoritm på signaturen."
 
-#: ../lib/widgets/ephy-download-widget.c:286
-msgid "Show in folder"
-msgstr "Visa i mapp"
+#: ../lib/widgets/ephy-certificate-dialog.c:110
+msgid "The certificate activation time is still in the future"
+msgstr "Aktiveringstiden för certifikatet är i framtiden"
 
-#: ../lib/widgets/ephy-download-widget.c:458
-msgid "Starting…"
-msgstr "Startar..."
+#: ../lib/widgets/ephy-certificate-dialog.c:149
+msgid "The identity of this website has been verified"
+msgstr "Denna webbplats identitet har verifierats"
+
+#: ../lib/widgets/ephy-certificate-dialog.c:150
+msgid "The identity of this website has not been verified"
+msgstr "Denna webbplats identitet har inte verifierats"
 
-#: ../lib/widgets/ephy-hosts-store.c:112
-msgid "All sites"
-msgstr "Alla webbplatser"
+#: ../lib/widgets/ephy-download-widget.c:107
+#, c-format
+#| msgid "%u second left"
+#| msgid_plural "%u seconds left"
+msgid "%d second left"
+msgid_plural "%d seconds left"
+msgstr[0] "%d sekund kvar"
+msgstr[1] "%d sekunder kvar"
+
+#: ../lib/widgets/ephy-download-widget.c:113
+#, c-format
+#| msgid "%u:%02u minute left"
+#| msgid_plural "%u:%02u minutes left"
+msgid "%d minute left"
+msgid_plural "%d minutes left"
+msgstr[0] "%d minut kvar"
+msgstr[1] "%d minuter kvar"
+
+#: ../lib/widgets/ephy-download-widget.c:119
+#, c-format
+#| msgid "%u hour left"
+#| msgid_plural "%u hours left"
+msgid "%d hour left"
+msgid_plural "%d hours left"
+msgstr[0] "%d timme kvar"
+msgstr[1] "%d timmar kvar"
+
+#: ../lib/widgets/ephy-download-widget.c:125
+#, c-format
+#| msgid "%u second left"
+#| msgid_plural "%u seconds left"
+msgid "%d day left"
+msgid_plural "%d days left"
+msgstr[0] "%d dag kvar"
+msgstr[1] "%d dagar kvar"
+
+#: ../lib/widgets/ephy-download-widget.c:131
+#, c-format
+#| msgid "%u second left"
+#| msgid_plural "%u seconds left"
+msgid "%d week left"
+msgid_plural "%d weeks left"
+msgstr[0] "%d vecka kvar"
+msgstr[1] "%d veckor kvar"
+
+#: ../lib/widgets/ephy-download-widget.c:137
+#, c-format
+#| msgid "%u second left"
+#| msgid_plural "%u seconds left"
+msgid "%d month left"
+msgid_plural "%d months left"
+msgstr[0] "%d månad kvar"
+msgstr[1] "%d månader kvar"
+
+#: ../lib/widgets/ephy-download-widget.c:293
+msgid "Finished"
+msgstr "Färdig"
 
-#: ../lib/widgets/ephy-hosts-view.c:43
-msgid "Sites"
-msgstr "Webbplatser"
+#: ../lib/widgets/ephy-download-widget.c:309
+#, c-format
+msgid "Error downloading: %s"
+msgstr "Fel vid hämtning: %s"
 
-#: ../lib/widgets/ephy-location-entry.c:742
-msgid "Drag and drop this icon to create a link to this page"
-msgstr "Drag och släpp denna ikon för att skapa en länk till denna sida"
+#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:712
+msgid "Cancel"
+msgstr "Avbryt"
 
-#: ../lib/widgets/ephy-search-entry.c:162
-msgid "Clear"
-msgstr "Töm"
+#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1146
+#: ../src/window-commands.c:275
+msgid "Open"
+msgstr "Öppna"
 
-#: ../lib/widgets/ephy-urls-view.c:43
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1646
-msgid "Title"
-msgstr "Titel"
+#: ../lib/widgets/ephy-download-widget.c:377
+msgid "Show in folder"
+msgstr "Visa i mapp"
 
-#: ../lib/widgets/ephy-urls-view.c:51
-#: ../src/bookmarks/ephy-bookmarks-editor.c:213
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1657
-msgid "Address"
-msgstr "Adress"
+#: ../lib/widgets/ephy-download-widget.c:586
+msgid "Starting…"
+msgstr "Startar…"
 
-#: ../lib/widgets/ephy-urls-view.c:59
-msgid "Date"
-msgstr "Datum"
+#. Translators: the mnemonic shouldn't conflict with any of the
+#. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
+#. * Select All, Input Methods and Insert Unicode control character.)
+#.
+#: ../lib/widgets/ephy-location-entry.c:627
+#: ../src/resources/prefs-dialog.ui.h:36 ../src/ephy-history-window.c:189
+msgid "Cl_ear"
+msgstr "T_öm"
+
+#. Edit actions.
+#: ../lib/widgets/ephy-location-entry.c:646 ../src/ephy-window.c:121
+msgid "_Undo"
+msgstr "_Ångra"
+
+#: ../lib/widgets/ephy-location-entry.c:653
+msgid "_Redo"
+msgstr "_Gör om"
+
+#: ../lib/widgets/ephy-location-entry.c:933
+msgid "Drag and drop this icon to create a link to this page"
+msgstr "Drag och släpp denna ikon för att skapa en länk till denna sida"
 
 #. Translators: This string is used when counting bookmarks that
 #. * are similar to each other
 #: ../src/bookmarks/ephy-bookmark-properties.c:84
-#: ../src/bookmarks/ephy-bookmark-properties.c:613
-#, c-format
-msgid "%d _Similar"
-msgid_plural "%d _Similar"
-msgstr[0] "%d _liknande"
-msgstr[1] "%d _liknande"
-
-#: ../src/bookmarks/ephy-bookmark-properties.c:256
-#, c-format
-msgid "_Unify With %d Identical Bookmark"
-msgid_plural "_Unify With %d Identical Bookmarks"
-msgstr[0] "_Förena med %d identiskt bokmärke"
-msgstr[1] "_Förena med %d identiska bokmärken"
-
-#: ../src/bookmarks/ephy-bookmark-properties.c:276
-#: ../src/bookmarks/ephy-bookmark-properties.c:298
 #, c-format
-msgid "Show “%s”"
-msgstr "Visa \"%s\""
+msgid "%d bookmark is similar"
+msgid_plural "%d bookmarks are similar"
+msgstr[0] "%d bokmärke liknar detta"
+msgstr[1] "%d bokmärken liknar detta"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:423
+#: ../src/bookmarks/ephy-bookmark-properties.c:234
 #, c-format
 msgid "“%s” Properties"
-msgstr "Egenskaper för \"%s\""
+msgstr "Egenskaper för ”%s”"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:547
+#: ../src/bookmarks/ephy-bookmark-properties.c:358
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:564
+#: ../src/bookmarks/ephy-bookmark-properties.c:375
 msgid "A_ddress:"
 msgstr "A_dress:"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:576
+#: ../src/bookmarks/ephy-bookmark-properties.c:387
 msgid "T_opics:"
 msgstr "Äm_nen:"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:599
+#: ../src/bookmarks/ephy-bookmark-properties.c:410
 msgid "Sho_w all topics"
 msgstr "Visa _alla ämnen"
 
-#: ../src/bookmarks/ephy-bookmarks.c:93
+#: ../src/bookmarks/ephy-bookmark-properties.c:431
+#: ../src/resources/prefs-dialog.ui.h:41
+#: ../src/resources/prefs-lang-dialog.ui.h:3
+#| msgid "_Address"
+msgid "_Add"
+msgstr "_Lägg till"
+
+#: ../src/bookmarks/ephy-bookmark-properties.c:438
+#: ../src/bookmarks/ephy-bookmarks-editor.c:178 ../src/ephy-window.c:114
+msgid "_Close"
+msgstr "S_täng"
+
+#: ../src/bookmarks/ephy-bookmarks.c:88
 msgid "Entertainment"
 msgstr "Nöje"
 
-#: ../src/bookmarks/ephy-bookmarks.c:94
+#: ../src/bookmarks/ephy-bookmarks.c:89
 msgid "News"
 msgstr "Nyheter"
 
-#: ../src/bookmarks/ephy-bookmarks.c:95
+#: ../src/bookmarks/ephy-bookmarks.c:90
 msgid "Shopping"
 msgstr "Köp och sälj"
 
-#: ../src/bookmarks/ephy-bookmarks.c:96
+#: ../src/bookmarks/ephy-bookmarks.c:91
 msgid "Sports"
 msgstr "Sport"
 
-#: ../src/bookmarks/ephy-bookmarks.c:97
+#: ../src/bookmarks/ephy-bookmarks.c:92
 msgid "Travel"
 msgstr "Resor"
 
-#: ../src/bookmarks/ephy-bookmarks.c:98
+#: ../src/bookmarks/ephy-bookmarks.c:93
 msgid "Work"
 msgstr "Arbete"
 
 # Detta används i historiken och bland bokmärkena i betydelserna
 # "alla webbplatser", "alla bokmärken".
 #. Translators: this topic contains all bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:951
+#: ../src/bookmarks/ephy-bookmarks.c:926
 msgctxt "bookmarks"
 msgid "All"
 msgstr "Alla"
@@ -1195,336 +1532,329 @@ msgstr "Alla"
 # Detta ska vara plural
 #. Translators: this topic contains the not categorized
 #. bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:955
+#: ../src/bookmarks/ephy-bookmarks.c:930
 msgctxt "bookmarks"
 msgid "Not Categorized"
 msgstr "Inte kategoriserade"
 
 #. Translators: this is an automatic topic containing local
 #. * websites bookmarks autodiscovered with zeroconf.
-#: ../src/bookmarks/ephy-bookmarks.c:960
+#: ../src/bookmarks/ephy-bookmarks.c:934
 msgctxt "bookmarks"
 msgid "Nearby Sites"
 msgstr "Närliggande webbplatser"
 
-#: ../src/bookmarks/ephy-bookmarks.c:1179
-#: ../src/bookmarks/ephy-bookmarks-import.c:271
+#: ../src/bookmarks/ephy-bookmarks.c:1148
+#: ../src/bookmarks/ephy-bookmarks-import.c:270
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:76
-msgid "Epiphany (RDF)"
-msgstr "Epiphany (RDF)"
+#: ../src/bookmarks/ephy-bookmarks-editor.c:75
+msgid "Web (RDF)"
+msgstr "Webb (RDF)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:77
+#: ../src/bookmarks/ephy-bookmarks-editor.c:76
 msgid "Mozilla (HTML)"
 msgstr "Mozilla (HTML)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:125
+#: ../src/bookmarks/ephy-bookmarks-editor.c:124
 msgid "Remove from this topic"
-msgstr "Ta bort det detta ämne"
+msgstr "Ta bort från detta ämne"
 
 # Arkiv Arkiv Arkiv Arkiv Arkiv Arkiv Arkiv och inget annat än Arkiv!
 #. Toplevel
-#: ../src/bookmarks/ephy-bookmarks-editor.c:152
-#: ../src/ephy-history-window.c:129
+#: ../src/bookmarks/ephy-bookmarks-editor.c:151
 msgid "_File"
 msgstr "_Arkiv"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:153
-#: ../src/ephy-history-window.c:130
+#: ../src/bookmarks/ephy-bookmarks-editor.c:152
 msgid "_Edit"
 msgstr "_Redigera"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:154
-#: ../src/ephy-history-window.c:131
+#: ../src/bookmarks/ephy-bookmarks-editor.c:153
 msgid "_View"
 msgstr "_Visa"
 
+#. Help.
+#: ../src/bookmarks/ephy-bookmarks-editor.c:154
+#: ../src/resources/epiphany-application-menu.ui.h:7 ../src/ephy-window.c:191
+msgid "_Help"
+msgstr "_Hjälp"
+
 #. File Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:159
+#: ../src/bookmarks/ephy-bookmarks-editor.c:158
 msgid "_New Topic"
 msgstr "_Nytt ämne"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:160
+#: ../src/bookmarks/ephy-bookmarks-editor.c:159
 msgid "Create a new topic"
 msgstr "Skapa ett nytt ämne"
 
-#. File Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:162
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1161
-#: ../src/ephy-history-window.c:136
-#: ../src/ephy-history-window.c:642
+#: ../src/bookmarks/ephy-bookmarks-editor.c:161
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1154
 msgid "Open in New _Window"
 msgid_plural "Open in New _Windows"
 msgstr[0] "Öppna i nyt_t fönster"
 msgstr[1] "Öppna i n_ya fönster"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:163
+#: ../src/bookmarks/ephy-bookmarks-editor.c:162
 msgid "Open the selected bookmark in a new window"
 msgstr "Öppna det markerade bokmärket i ett nytt fönster"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:165
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1164
-#: ../src/ephy-history-window.c:139
-#: ../src/ephy-history-window.c:645
+#: ../src/bookmarks/ephy-bookmarks-editor.c:164
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1157
 msgid "Open in New _Tab"
 msgid_plural "Open in New _Tabs"
 msgstr[0] "Öppna i ny _flik"
 msgstr[1] "Öppna i nya _flikar"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:166
+#: ../src/bookmarks/ephy-bookmarks-editor.c:165
 msgid "Open the selected bookmark in a new tab"
 msgstr "Öppna det markerade bokmärket i en ny flik"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:168
+#: ../src/bookmarks/ephy-bookmarks-editor.c:167
 msgid "_Rename…"
-msgstr "_Byt namn..."
+msgstr "_Byt namn…"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:169
+#: ../src/bookmarks/ephy-bookmarks-editor.c:168
 msgid "Rename the selected bookmark or topic"
 msgstr "Byt namn på det markerade bokmärket eller ämnet"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:170
+#: ../src/bookmarks/ephy-bookmarks-editor.c:169
 msgid "_Properties"
 msgstr "_Egenskaper"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:171
+#: ../src/bookmarks/ephy-bookmarks-editor.c:170
 msgid "View or modify the properties of the selected bookmark"
 msgstr "Visa eller ändra egenskaperna för det markerade bokmärket"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:173
+#: ../src/bookmarks/ephy-bookmarks-editor.c:172
 msgid "_Import Bookmarks…"
-msgstr "_Importera bokmärken..."
+msgstr "_Importera bokmärken…"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:174
+#: ../src/bookmarks/ephy-bookmarks-editor.c:173
 msgid "Import bookmarks from another browser or a bookmarks file"
 msgstr "Importera bokmärken från en annan webbläsare eller en bokmärkesfil"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:176
+#: ../src/bookmarks/ephy-bookmarks-editor.c:175
 msgid "_Export Bookmarks…"
-msgstr "_Exportera bokmärken..."
+msgstr "_Exportera bokmärken…"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:177
+#: ../src/bookmarks/ephy-bookmarks-editor.c:176
 msgid "Export bookmarks to a file"
 msgstr "Exportera bokmärken till en fil"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:179
-#: ../src/ephy-history-window.c:145
-#: ../src/ephy-window.c:105
-msgid "_Close"
-msgstr "S_täng"
-
-#: ../src/bookmarks/ephy-bookmarks-editor.c:180
 msgid "Close the bookmarks window"
 msgstr "Stäng bokmärkesfönstret"
 
 #. Edit Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:184
-#: ../src/ephy-history-window.c:150
-#: ../src/ephy-window.c:114
+#: ../src/bookmarks/ephy-bookmarks-editor.c:183 ../src/ephy-window.c:125
 msgid "Cu_t"
 msgstr "Klipp _ut"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:185
-#: ../src/ephy-history-window.c:151
+#: ../src/bookmarks/ephy-bookmarks-editor.c:184
 msgid "Cut the selection"
 msgstr "Klipp ut markeringen"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:187
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1174
-#: ../src/ephy-history-window.c:153
-#: ../src/ephy-history-window.c:655
-#: ../src/ephy-window.c:116
+#: ../src/bookmarks/ephy-bookmarks-editor.c:186
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:127
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:188
-#: ../src/ephy-history-window.c:154
+#: ../src/bookmarks/ephy-bookmarks-editor.c:187
 msgid "Copy the selection"
 msgstr "Kopiera markeringen"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:190
-#: ../src/ephy-history-window.c:156
-#: ../src/ephy-window.c:118
+#: ../src/bookmarks/ephy-bookmarks-editor.c:189 ../src/ephy-window.c:129
 msgid "_Paste"
 msgstr "Klistra _in"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:191
-#: ../src/ephy-history-window.c:157
+#: ../src/bookmarks/ephy-bookmarks-editor.c:190
 msgid "Paste the clipboard"
 msgstr "Klistra in från urklipp"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:193
-#: ../src/ephy-history-window.c:159
+#: ../src/bookmarks/ephy-bookmarks-editor.c:192
+#: ../src/resources/history-dialog.ui.h:10
 msgid "_Delete"
 msgstr "_Ta bort"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:194
+#: ../src/bookmarks/ephy-bookmarks-editor.c:193
 msgid "Delete the selected bookmark or topic"
 msgstr "Ta bort det markerade bokmärket eller ämnet"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:196
-#: ../src/ephy-history-window.c:162
-#: ../src/ephy-window.c:122
+#: ../src/bookmarks/ephy-bookmarks-editor.c:195 ../src/ephy-window.c:133
 msgid "Select _All"
 msgstr "Markera _allt"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:197
+#: ../src/bookmarks/ephy-bookmarks-editor.c:196
 msgid "Select all bookmarks or text"
 msgstr "Markera alla bokmärken eller text"
 
 #. Help Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:201
-#: ../src/ephy-history-window.c:170
+#: ../src/bookmarks/ephy-bookmarks-editor.c:200
 msgid "_Contents"
 msgstr "_Innehåll"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:202
+#: ../src/bookmarks/ephy-bookmarks-editor.c:201
 msgid "Display bookmarks help"
 msgstr "Visa hjälp för bokmärken"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:205
-#: ../src/ephy-history-window.c:174
+#: ../src/bookmarks/ephy-bookmarks-editor.c:203
+#: ../src/resources/epiphany-application-menu.ui.h:8 ../src/ephy-window.c:193
+msgid "_About"
+msgstr "_Om"
+
+#: ../src/bookmarks/ephy-bookmarks-editor.c:204
 msgid "Display credits for the web browser creators"
 msgstr "Visa tack till webbläsarens upphovsmän"
 
 #. View Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:211
-#: ../src/ephy-history-window.c:188
+#: ../src/bookmarks/ephy-bookmarks-editor.c:210
 msgid "_Title"
 msgstr "_Titel"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:212
-#: ../src/ephy-history-window.c:189
+#: ../src/bookmarks/ephy-bookmarks-editor.c:211
 msgid "Show the title column"
 msgstr "Visa titelkolumnen"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:214
-#: ../src/ephy-history-window.c:191
+#: ../src/bookmarks/ephy-bookmarks-editor.c:212
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1632
+msgid "Address"
+msgstr "Adress"
+
+#: ../src/bookmarks/ephy-bookmarks-editor.c:213
 msgid "Show the address column"
 msgstr "Visa adresskolumnen"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:256
+#: ../src/bookmarks/ephy-bookmarks-editor.c:255
 msgid "Type a topic"
 msgstr "Ange ett ämne"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:375
+#: ../src/bookmarks/ephy-bookmarks-editor.c:377
 #, c-format
 msgid "Delete topic “%s”?"
-msgstr "Ta bort ämnet \"%s\"?"
+msgstr "Ta bort ämnet ”%s”?"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:378
+#: ../src/bookmarks/ephy-bookmarks-editor.c:380
 msgid "Delete this topic?"
 msgstr "Ta bort det detta ämne?"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:380
-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."
-msgstr "Att ta bort detta ämne kommer att medfölja att alla dess bokmärken blir okategoriserade, såvida de inte även tillhör andra ämnen. Bokmärkena kommer inte att tas bort."
+#: ../src/bookmarks/ephy-bookmarks-editor.c:382
+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."
+msgstr ""
+"Att ta bort detta ämne kommer att medfölja att alla dess bokmärken blir "
+"okategoriserade, såvida de inte även tillhör andra ämnen. Bokmärkena kommer "
+"inte att tas bort."
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:383
+#: ../src/bookmarks/ephy-bookmarks-editor.c:385
 msgid "_Delete Topic"
 msgstr "_Ta bort ämne"
 
 #. FIXME: proper i18n after freeze
-#: ../src/bookmarks/ephy-bookmarks-editor.c:493
-#: ../src/bookmarks/ephy-bookmarks-editor.c:497
+#: ../src/bookmarks/ephy-bookmarks-editor.c:495
+#: ../src/bookmarks/ephy-bookmarks-editor.c:499
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:502
-#: ../src/bookmarks/ephy-bookmarks-editor.c:506
+#: ../src/bookmarks/ephy-bookmarks-editor.c:504
+#: ../src/bookmarks/ephy-bookmarks-editor.c:508
 msgid "Firebird"
 msgstr "Firebird"
 
 #. Translators: The %s is the name of a Mozilla profile.
-#: ../src/bookmarks/ephy-bookmarks-editor.c:511
+#: ../src/bookmarks/ephy-bookmarks-editor.c:513
 #, c-format
 msgid "Mozilla “%s” profile"
-msgstr "Mozilla-profil \"%s\""
+msgstr "Mozilla-profil ”%s”"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:515
+#: ../src/bookmarks/ephy-bookmarks-editor.c:517
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:519
+#: ../src/bookmarks/ephy-bookmarks-editor.c:521
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:548
+#: ../src/bookmarks/ephy-bookmarks-editor.c:550
 msgid "Import failed"
 msgstr "Import misslyckades"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:550
+#: ../src/bookmarks/ephy-bookmarks-editor.c:552
 msgid "Import Failed"
 msgstr "Import misslyckades"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:553
+#: ../src/bookmarks/ephy-bookmarks-editor.c:555
 #, c-format
-msgid "The bookmarks from “%s” could not be imported because the file is corrupted or of an unsupported type."
-msgstr "Bokmärkena från \"%s\" kunde inte importeras eftersom filen är skadad eller av en typ som inte stöds."
+msgid ""
+"The bookmarks from “%s” could not be imported because the file is corrupted "
+"or of an unsupported type."
+msgstr ""
+"Bokmärkena från ”%s” kunde inte importeras eftersom filen är skadad eller av "
+"en typ som inte stöds."
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:616
+#: ../src/bookmarks/ephy-bookmarks-editor.c:618
 msgid "Import Bookmarks from File"
 msgstr "Importera bokmärken från fil"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:623
+#: ../src/bookmarks/ephy-bookmarks-editor.c:625
 msgid "Firefox/Mozilla bookmarks"
 msgstr "Firefox/Mozilla-bokmärken"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:627
+#: ../src/bookmarks/ephy-bookmarks-editor.c:629
 msgid "Galeon/Konqueror bookmarks"
 msgstr "Galeon/Konqueror-bokmärken"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:631
-msgid "Epiphany bookmarks"
-msgstr "Epiphany-bokmärken"
+#: ../src/bookmarks/ephy-bookmarks-editor.c:633
+#| msgid "Web Bookmarks"
+msgid "Web bookmarks"
+msgstr "Webbokmärken"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:755
+#: ../src/bookmarks/ephy-bookmarks-editor.c:757
 msgid "Export Bookmarks"
 msgstr "Exportera bokmärken"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:763
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1520
+#: ../src/bookmarks/ephy-bookmarks-editor.c:764
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1495
 #: ../src/bookmarks/ephy-topic-action.c:217
 msgid "Bookmarks"
 msgstr "Bokmärken"
 
 #. Make a format selection combo & label
-#: ../src/bookmarks/ephy-bookmarks-editor.c:769
+#: ../src/bookmarks/ephy-bookmarks-editor.c:770
 msgid "File f_ormat:"
 msgstr "Filf_ormat:"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:815
+#: ../src/bookmarks/ephy-bookmarks-editor.c:816
 msgid "Import Bookmarks"
 msgstr "Importera bokmärken"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:820
+#: ../src/bookmarks/ephy-bookmarks-editor.c:821
 msgid "I_mport"
 msgstr "I_mportera"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:836
+#: ../src/bookmarks/ephy-bookmarks-editor.c:837
 msgid "Import bookmarks from:"
 msgstr "Importera bokmärken från:"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:856
+#: ../src/bookmarks/ephy-bookmarks-editor.c:857
 msgid "File"
 msgstr "Fil"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1170
-#: ../src/ephy-history-window.c:651
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1163
 msgid "_Copy Address"
 msgstr "_Kopiera adress"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1411
-#: ../src/ephy-history-window.c:804
-msgid "_Search:"
-msgstr "_Sök:"
-
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1576
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1551
 msgid "Topics"
 msgstr "Ämnen"
 
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1621
+msgid "Title"
+msgstr "Titel"
+
 #. FIXME !!!!
 #: ../src/bookmarks/ephy-open-tabs-action.c:74
 msgid "Open in New _Tabs"
@@ -1537,613 +1867,737 @@ msgstr "Öppna alla bokmärken i detta ämne i nya _flikar"
 #: ../src/bookmarks/ephy-topics-entry.c:330
 #, c-format
 msgid "Create topic “%s”"
-msgstr "Skapa ämnet \"%s\""
+msgstr "Skapa ämnet ”%s”"
+
+#: ../src/resources/clear-data-dialog.ui.h:1
+#| msgid "Clear All Personal Data"
+msgid "Clear Personal Data"
+msgstr "Töm personlig data"
+
+#: ../src/resources/clear-data-dialog.ui.h:2
+#| msgid "Clear"
+msgid "C_lear"
+msgstr "_Töm"
+
+#: ../src/resources/clear-data-dialog.ui.h:4
+#| msgid "<b>Select the personal data you want to clear</b>"
+msgid "Select the personal data you wish to clear"
+msgstr "Välj det personliga data som du vill tömma"
+
+#: ../src/resources/clear-data-dialog.ui.h:5
+#| msgid ""
+#| "You are about to clear personal data that is stored about the web pages "
+#| "you have visited. Before proceeding, check the types of information that "
+#| "you want to remove:"
+msgid ""
+"You are about to clear personal data that is stored about the web pages you "
+"have visited. Check the types of information that you want to remove:"
+msgstr ""
+"Du är på väg att tömma personlig data som lagrats om de webbsidor som du har "
+"besökt. Kryssa för de typer av information som du vill ta bort:"
 
-#: ../src/ephy-combined-stop-reload-action.c:41
-msgid "Stop"
-msgstr "Stoppa"
+#: ../src/resources/clear-data-dialog.ui.h:6
+#: ../src/resources/cookies-dialog.ui.h:1
+#: ../src/resources/prefs-dialog.ui.h:21
+msgid "Cookies"
+msgstr "Kakor"
 
-#: ../src/ephy-combined-stop-reload-action.c:42
-msgid "Stop current data transfer"
-msgstr "Stoppa den aktuella dataöverföringen"
+#: ../src/resources/clear-data-dialog.ui.h:7
+#| msgid "_Temporary files"
+msgid "Cache and temporary files"
+msgstr "Cache och temporära filer"
+
+#: ../src/resources/clear-data-dialog.ui.h:8
+#| msgid "Clear browsing history?"
+msgid "Browsing history"
+msgstr "Surfhistorik"
+
+#: ../src/resources/clear-data-dialog.ui.h:9
+#| msgid "Saved _passwords"
+msgid "Saved passwords"
+msgstr "Sparade lösenord"
+
+#: ../src/resources/clear-data-dialog.ui.h:10
+#| msgid ""
+#| "<small><i><b>Note:</b> You cannot undo this action. The data you are "
+#| "choosing to clear will be deleted forever.</i></small>"
+msgid ""
+"You cannot undo this action. The data you are choosing to clear will be "
+"removed forever."
+msgstr ""
+"Du kan inte ångra denna åtgärd. Det data som du väljer att tömma går inte "
+"att återställa."
+
+#: ../src/resources/cookies-dialog.ui.h:2
+#: ../src/resources/history-dialog.ui.h:2
+#: ../src/resources/passwords-dialog.ui.h:2
+#| msgid "Clear _All..."
+msgid "C_lear All"
+msgstr "_Töm allt"
+
+#: ../src/resources/cookies-dialog.ui.h:3
+#: ../src/resources/passwords-dialog.ui.h:4
+#| msgid "Sites"
+msgid "Site"
+msgstr "Webbplats"
+
+#: ../src/resources/cookies-dialog.ui.h:4
+msgid "Remove"
+msgstr "Ta bort"
 
-#: ../src/ephy-combined-stop-reload-action.c:44
-#: ../src/ephy-window.c:137
-msgid "_Reload"
-msgstr "_Uppdatera"
+#. File actions.
+#: ../src/resources/epiphany-application-menu.ui.h:1 ../src/ephy-window.c:100
+msgid "_New Window"
+msgstr "_Nytt fönster"
 
-#: ../src/ephy-combined-stop-reload-action.c:45
-msgid "Display the latest content of the current page"
-msgstr "Visa det senaste innehållet på den aktuella sidan"
+#: ../src/resources/epiphany-application-menu.ui.h:2 ../src/ephy-window.c:102
+#| msgid "_New Window"
+msgid "New _Incognito Window"
+msgstr "Nytt _inkognito-fönster"
 
-#: ../src/ephy-encoding-menu.c:330
-msgid "_Other…"
-msgstr "_Andra..."
+#: ../src/resources/epiphany-application-menu.ui.h:3
+msgid "Reopen Closed _Tab"
+msgstr "Öppna stängd _flik igen"
 
-#: ../src/ephy-encoding-menu.c:331
-msgid "Other encodings"
-msgstr "Andra teckenkodningar"
+#. Toplevel
+#: ../src/resources/epiphany-application-menu.ui.h:4 ../src/ephy-window.c:93
+msgid "_Bookmarks"
+msgstr "_Bokmärken"
+
+#: ../src/resources/epiphany-application-menu.ui.h:5 ../src/ephy-window.c:143
+msgid "_History"
+msgstr "_Historik"
+
+#: ../src/resources/epiphany-application-menu.ui.h:6 ../src/ephy-window.c:145
+#| msgid "Preferences"
+msgid "Pr_eferences"
+msgstr "Instä_llningar"
+
+#: ../src/resources/epiphany-application-menu.ui.h:9 ../src/ephy-window.c:116
+msgid "_Quit"
+msgstr "A_vsluta"
+
+#: ../src/resources/epiphany.ui.h:1
+msgid "Text Encoding"
+msgstr "Textkodning"
 
-#: ../src/ephy-encoding-menu.c:337
+#: ../src/resources/epiphany.ui.h:2 ../src/ephy-encoding-menu.c:327
 msgid "_Automatic"
 msgstr "_Automatisk"
 
-#: ../src/ephy-find-toolbar.c:153
-msgid "Not found"
-msgstr "Hittades inte"
+#: ../src/resources/epiphany.ui.h:3 ../src/ephy-encoding-menu.c:328
+msgid "Use the encoding specified by the document"
+msgstr "Använd kodningen som är angiven i dokumentet"
 
-#: ../src/ephy-find-toolbar.c:165
-msgid "Wrapped"
-msgstr "Började om från början"
+#: ../src/resources/epiphany.ui.h:4
+#| msgid "<b>_Use a different encoding:</b>"
+msgid "_Use a different encoding:"
+msgstr "_Använd en annan kodning:"
 
-#: ../src/ephy-find-toolbar.c:185
-msgid "Find links:"
-msgstr "Sök länkar:"
+#: ../src/resources/history-dialog.ui.h:1
+msgid "History"
+msgstr "Historik"
 
-#: ../src/ephy-find-toolbar.c:185
-msgid "Find:"
-msgstr "Sök:"
+#: ../src/resources/history-dialog.ui.h:3
+#| msgid "Clear History"
+msgid "Search history"
+msgstr "Sökhistorik"
 
-#. Create a menu item, and sync it
-#. Case sensitivity
-#: ../src/ephy-find-toolbar.c:459
-#: ../src/ephy-find-toolbar.c:582
-msgid "_Case sensitive"
-msgstr "_Gör skillnad på VERSALER och gemener"
+#: ../src/resources/history-dialog.ui.h:4
+msgid "Date"
+msgstr "Datum"
 
-#: ../src/ephy-find-toolbar.c:565
-msgid "Find Previous"
-msgstr "Sök föregående"
+#: ../src/resources/history-dialog.ui.h:5
+msgid "Name"
+msgstr "Namn"
 
-#: ../src/ephy-find-toolbar.c:568
-msgid "Find previous occurrence of the search string"
-msgstr "Sök föregående förekomst av söksträngen"
+#: ../src/resources/history-dialog.ui.h:6
+#| msgid "_Location…"
+msgid "Location"
+msgstr "Plats"
 
-#: ../src/ephy-find-toolbar.c:574
-msgid "Find Next"
-msgstr "Sök nästa"
+#: ../src/resources/history-dialog.ui.h:8
+#| msgid "_Location…"
+msgid "_Copy Location"
+msgstr "_Kopiera plats"
 
-#: ../src/ephy-find-toolbar.c:577
-msgid "Find next occurrence of the search string"
-msgstr "Sök nästa förekomst av söksträngen"
+#: ../src/resources/history-dialog.ui.h:9
+#| msgid "Add _Bookmark…"
+msgid "Add _Bookmark"
+msgstr "Lägg till b_okmärke"
 
-#. exit button
-#: ../src/ephy-fullscreen-popup.c:232
-msgid "Leave Fullscreen"
-msgstr "Lämna helskärmsläge"
+#: ../src/resources/passwords-dialog.ui.h:1
+#: ../src/resources/prefs-dialog.ui.h:30
+msgid "Passwords"
+msgstr "Lösenord"
 
-#: ../src/ephy-history-window.c:137
-msgid "Open the selected history link in a new window"
-msgstr "Öppna den markerade historiklänken i ett nytt fönster"
+#: ../src/resources/passwords-dialog.ui.h:3
+#| msgid "_Show passwords"
+msgid "Search passwords"
+msgstr "Sök lösenord"
 
-#: ../src/ephy-history-window.c:140
-msgid "Open the selected history link in a new tab"
-msgstr "Öppna den markerade historiklänken i en ny flik"
+#: ../src/resources/passwords-dialog.ui.h:5
+msgid "User Name"
+msgstr "Användarnamn"
 
-#: ../src/ephy-history-window.c:142
-msgid "Add _Bookmark…"
-msgstr "Lägg till b_okmärke..."
+#: ../src/resources/passwords-dialog.ui.h:6
+#| msgid "Passwords"
+msgid "Password"
+msgstr "Lösenord"
 
-#: ../src/ephy-history-window.c:143
-msgid "Bookmark the selected history link"
-msgstr "Lägg till bokmärke för den markerade historiklänken"
+#: ../src/resources/passwords-dialog.ui.h:7
+#| msgid "_Password:"
+msgid "_Copy Password"
+msgstr "_Kopiera lösenord"
 
-#: ../src/ephy-history-window.c:146
-msgid "Close the history window"
-msgstr "Stäng detta historikfönster"
+#: ../src/resources/passwords-dialog.ui.h:8
+#| msgid "_Username:"
+msgid "C_opy Username"
+msgstr "K_opiera användarnamn"
 
-#: ../src/ephy-history-window.c:160
-msgid "Delete the selected history link"
-msgstr "Ta bort den markerade historiklänken"
+#: ../src/resources/prefs-dialog.ui.h:1
+msgid "Preferences"
+msgstr "Inställningar"
 
-#: ../src/ephy-history-window.c:163
-msgid "Select all history links or text"
-msgstr "Markera alla historiklänkar eller text"
+#: ../src/resources/prefs-dialog.ui.h:3
+msgid "_Download folder:"
+msgstr "_Hämtningsmapp:"
 
-#: ../src/ephy-history-window.c:165
-msgid "Clear _History"
-msgstr "Töm _historik"
+#: ../src/resources/prefs-dialog.ui.h:4
+msgid "A_utomatically open downloaded files"
+msgstr "Öppna automatiskt _hämtade filer"
 
-#: ../src/ephy-history-window.c:166
-msgid "Clear your browsing history"
-msgstr "Töm din bläddringshistorik"
+#: ../src/resources/prefs-dialog.ui.h:5
+#| msgid "_Search:"
+msgid "Search"
+msgstr "Sökning"
 
-#: ../src/ephy-history-window.c:171
-msgid "Display history help"
-msgstr "Visa hjälp för historik"
+#: ../src/resources/prefs-dialog.ui.h:6
+msgid "_Engine:"
+msgstr "_Motor:"
 
-#: ../src/ephy-history-window.c:190
-msgid "_Address"
-msgstr "_Adress"
+#: ../src/resources/prefs-dialog.ui.h:7
+msgid "Web Content"
+msgstr "Webbinnehåll"
 
-#: ../src/ephy-history-window.c:192
-msgid "_Date and Time"
-msgstr "_Datum och tid"
+#: ../src/resources/prefs-dialog.ui.h:8
+msgid "Allow popup _windows"
+msgstr "Tillåt popup_fönster"
 
-#: ../src/ephy-history-window.c:193
-msgid "Show the date and time column"
-msgstr "Visa datum- och tidskolumnerna"
+#: ../src/resources/prefs-dialog.ui.h:9
+msgid "Allow _advertisements"
+msgstr "Tillåt _annonser"
 
-#: ../src/ephy-history-window.c:221
-msgid "Clear browsing history?"
-msgstr "Töm bläddringshistorik?"
+#: ../src/resources/prefs-dialog.ui.h:10
+msgid "Enable _plugins"
+msgstr "Aktivera _tillägg"
 
-#: ../src/ephy-history-window.c:225
-msgid "Clearing the browsing history will cause all history links to be permanently deleted."
-msgstr "Att tömma bläddringshistoriken kommer att orsaka att alla historiklänkar tas bort permanent."
+#: ../src/resources/prefs-dialog.ui.h:11
+msgid "General"
+msgstr "Allmänt"
 
-#: ../src/ephy-history-window.c:240
-msgid "Clear History"
-msgstr "Töm historik"
+#: ../src/resources/prefs-dialog.ui.h:12
+msgid "Fonts"
+msgstr "Typsnitt"
 
-#: ../src/ephy-history-window.c:813
-msgid "Last 30 minutes"
-msgstr "Senaste 30 minuterna"
+#: ../src/resources/prefs-dialog.ui.h:13
+msgid "_Use system fonts"
+msgstr "An_vänd systemtypsnitt"
 
-#: ../src/ephy-history-window.c:814
-msgid "Today"
-msgstr "Idag"
+#: ../src/resources/prefs-dialog.ui.h:14
+msgid "Sans serif font:"
+msgstr "Sans serif-typsnitt:"
 
-#. keep this in sync with embed/ephy-history.c's
-#. * HISTORY_PAGE_OBSOLETE_DAYS
-#: ../src/ephy-history-window.c:816
-#: ../src/ephy-history-window.c:820
-#: ../src/ephy-history-window.c:826
-#, c-format
-msgid "Last %d day"
-msgid_plural "Last %d days"
-msgstr[0] "Senaste %d dagen"
-msgstr[1] "Senaste %d dagarna"
+#: ../src/resources/prefs-dialog.ui.h:15
+msgid "Serif font:"
+msgstr "Serif-typsnitt:"
 
-#: ../src/ephy-history-window.c:830
-msgid "All history"
-msgstr "All historik"
+#: ../src/resources/prefs-dialog.ui.h:16
+msgid "Monospace font:"
+msgstr "Typsnitt med fast breddslag:"
 
-#: ../src/ephy-history-window.c:1125
-msgid "History"
-msgstr "Historik"
+#: ../src/resources/prefs-dialog.ui.h:17
+msgid "Style"
+msgstr "Stil"
 
-#: ../src/ephy-main.c:82
-msgid "Open a new tab in an existing browser window"
-msgstr "Öppna en ny flik i ett befintligt webbläsarfönster"
+#: ../src/resources/prefs-dialog.ui.h:18
+msgid "Use custom _stylesheet"
+msgstr "Använd anpassad _stilmall"
 
-#: ../src/ephy-main.c:84
-msgid "Open a new browser window"
-msgstr "Öppna ett nytt webbläsarfönster"
+#: ../src/resources/prefs-dialog.ui.h:19
+msgid "_Edit Stylesheet…"
+msgstr "R_edigera stilmall…"
 
-#: ../src/ephy-main.c:86
-msgid "Launch the bookmarks editor"
-msgstr "Starta bokmärkesredigeraren"
+#: ../src/resources/prefs-dialog.ui.h:20
+msgid "Fonts & Style"
+msgstr "Typsnitt & stil"
 
-#: ../src/ephy-main.c:88
-msgid "Import bookmarks from the given file"
-msgstr "Importera bokmärken från den angivna filen"
+#: ../src/resources/prefs-dialog.ui.h:22
+#| msgid "Manage Certificates"
+msgid "Manage Cookies"
+msgstr "Hantera kakor"
 
-#: ../src/ephy-main.c:90
-msgid "Load the given session file"
-msgstr "Läs in den angivna sessionsfilen"
+#: ../src/resources/prefs-dialog.ui.h:23
+msgid "_Always accept"
+msgstr "_Acceptera alltid"
 
-#: ../src/ephy-main.c:92
-msgid "Add a bookmark"
-msgstr "Lägg till ett bokmärke"
+#: ../src/resources/prefs-dialog.ui.h:24
+msgid "Only _from sites you visit"
+msgstr "Endast _från webbplatser du besöker"
 
-#: ../src/ephy-main.c:92
-msgid "URL"
-msgstr "URL"
+#. Refers to "Only from sites you visit" option under Cookies.
+#: ../src/resources/prefs-dialog.ui.h:26
+msgid "<small>For example, not from advertisers on these sites</small>"
+msgstr "<small>Inte från annonsörer på dessa webbplatser, till exempel</small>"
 
-#: ../src/ephy-main.c:94
-msgid "Start a private instance"
-msgstr "Starta en privat instans"
+#: ../src/resources/prefs-dialog.ui.h:27
+msgid "_Never accept"
+msgstr "A_cceptera aldrig"
 
-#: ../src/ephy-main.c:96
-msgid "Start the browser in application mode"
-msgstr "Starta webbläsaren i programläge"
+#: ../src/resources/prefs-dialog.ui.h:28
+msgid "Tracking"
+msgstr "Spårning"
 
-#: ../src/ephy-main.c:98
-msgid "Profile directory to use in the private instance"
-msgstr "Profilkatalog att använda i den privata instansen"
+#: ../src/resources/prefs-dialog.ui.h:29
+msgid "_Tell web sites I do not want to be tracked"
+msgstr "_Säg till webbplatser att jag inte vill bli spårad"
 
-#: ../src/ephy-main.c:98
-msgid "DIR"
-msgstr "KAT"
+#: ../src/resources/prefs-dialog.ui.h:31
+#| msgid "Passwords"
+msgid "Manage Passwords"
+msgstr "Hantera lösenord"
 
-#: ../src/ephy-main.c:100
-msgid "URL …"
-msgstr "URL …"
+#: ../src/resources/prefs-dialog.ui.h:32
+msgid "_Remember passwords"
+msgstr "_Kom ihåg lösenord"
 
-#: ../src/ephy-main.c:208
-msgid "Could not start Web"
-msgstr "Kunde inte starta Webb"
+#: ../src/resources/prefs-dialog.ui.h:33
+msgid "Temporary Files"
+msgstr "Temporära filer"
 
-#: ../src/ephy-main.c:211
-#, c-format
-msgid ""
+#: ../src/resources/prefs-dialog.ui.h:34
+msgid "_Disk space:"
+msgstr "_Diskutrymme:"
+
+#: ../src/resources/prefs-dialog.ui.h:35
+msgid "MB"
+msgstr "MB"
+
+#: ../src/resources/prefs-dialog.ui.h:37
+msgid "Privacy"
+msgstr "Integritet"
+
+#: ../src/resources/prefs-dialog.ui.h:38 ../src/ephy-encoding-dialog.c:379
+msgid "Encodings"
+msgstr "Kodningar"
+
+#: ../src/resources/prefs-dialog.ui.h:39
+msgid "De_fault:"
+msgstr "Stan_dard:"
+
+#: ../src/resources/prefs-dialog.ui.h:42
+msgid "_Remove"
+msgstr "_Ta bort"
+
+#: ../src/resources/prefs-dialog.ui.h:43
+msgid "_Up"
+msgstr "_Upp"
+
+#: ../src/resources/prefs-dialog.ui.h:44
+#| msgid "_Download"
+msgid "_Down"
+msgstr "_Ner"
+
+#: ../src/resources/prefs-dialog.ui.h:45
+msgid "Spell checking"
+msgstr "Stavningskontroll"
+
+#: ../src/resources/prefs-dialog.ui.h:46
+msgid "_Enable spell checking"
+msgstr "A_ktivera stavningskontroll"
+
+#: ../src/resources/prefs-dialog.ui.h:47 ../src/prefs-dialog.c:839
+msgid "Language"
+msgstr "Språk"
+
+#: ../src/resources/prefs-lang-dialog.ui.h:1
+msgid "Add Language"
+msgstr "Lägg till språk"
+
+#: ../src/resources/prefs-lang-dialog.ui.h:4
+msgid "Choose a l_anguage:"
+msgstr "Välj ett s_pråk:"
+
+#: ../src/ephy-combined-stop-reload-action.c:41
+msgid "Stop"
+msgstr "Stoppa"
+
+#: ../src/ephy-combined-stop-reload-action.c:42
+msgid "Stop current data transfer"
+msgstr "Stoppa den aktuella dataöverföringen"
+
+#: ../src/ephy-combined-stop-reload-action.c:44 ../src/ephy-window.c:154
+msgid "_Reload"
+msgstr "_Uppdatera"
+
+#: ../src/ephy-combined-stop-reload-action.c:45
+msgid "Display the latest content of the current page"
+msgstr "Visa det senaste innehållet på den aktuella sidan"
+
+#: ../src/ephy-encoding-menu.c:320
+msgid "_Other…"
+msgstr "_Andra…"
+
+#: ../src/ephy-encoding-menu.c:321
+msgid "Other encodings"
+msgstr "Andra kodningar"
+
+#: ../src/ephy-history-window.c:179
+msgid "Clear browsing history?"
+msgstr "Töm surfhistorik?"
+
+#: ../src/ephy-history-window.c:183
+msgid ""
+"Clearing the browsing history will cause all history links to be permanently "
+"deleted."
+msgstr ""
+"Att tömma surfhistoriken kommer att orsaka att alla historiklänkar tas bort "
+"permanent."
+
+#: ../src/ephy-main.c:76
+msgid "Open a new tab in an existing browser window"
+msgstr "Öppna en ny flik i ett befintligt webbläsarfönster"
+
+#: ../src/ephy-main.c:78
+msgid "Open a new browser window"
+msgstr "Öppna ett nytt webbläsarfönster"
+
+#: ../src/ephy-main.c:80
+msgid "Import bookmarks from the given file"
+msgstr "Importera bokmärken från den angivna filen"
+
+#: ../src/ephy-main.c:80 ../src/ephy-main.c:82
+msgid "FILE"
+msgstr "FIL"
+
+#: ../src/ephy-main.c:82
+msgid "Load the given session file"
+msgstr "Läs in den angivna sessionsfilen"
+
+#: ../src/ephy-main.c:84
+msgid "Add a bookmark"
+msgstr "Lägg till ett bokmärke"
+
+#: ../src/ephy-main.c:84
+msgid "URL"
+msgstr "URL"
+
+#: ../src/ephy-main.c:86
+msgid "Start a private instance"
+msgstr "Starta en privat instans"
+
+#: ../src/ephy-main.c:88
+#| msgid "Start the browser in application mode"
+msgid "Start an instance in incognito mode"
+msgstr "Starta en instans i inkognitoläge"
+
+#: ../src/ephy-main.c:90
+#| msgid "Start a private instance"
+msgid "Start an instance in netbank mode"
+msgstr "Starta en instans i nätbanksläge"
+
+#: ../src/ephy-main.c:92
+msgid "Start the browser in application mode"
+msgstr "Starta webbläsaren i programläge"
+
+#: ../src/ephy-main.c:94
+msgid "Profile directory to use in the private instance"
+msgstr "Profilkatalog att använda i den privata instansen"
+
+#: ../src/ephy-main.c:94
+msgid "DIR"
+msgstr "KAT"
+
+#: ../src/ephy-main.c:96
+msgid "URL …"
+msgstr "URL …"
+
+#: ../src/ephy-main.c:201
+msgid "Could not start Web"
+msgstr "Kunde inte starta Webb"
+
+#: ../src/ephy-main.c:204
+#, c-format
+msgid ""
 "Startup failed because of the following error:\n"
 "%s"
 msgstr ""
 "Uppstart misslyckades på grund av följande fel:\n"
 "%s"
 
-#: ../src/ephy-main.c:322
+#: ../src/ephy-main.c:315
 msgid "Web options"
 msgstr "Webbalternativ"
 
-#: ../src/ephy-notebook.c:592
+#: ../src/ephy-notebook.c:602
 msgid "Close tab"
 msgstr "Stäng flik"
 
-#: ../src/ephy-session.c:115
+#: ../src/ephy-search-provider.c:199
 #, c-format
-msgid "Downloads will be aborted and logout proceed in %d second."
-msgid_plural "Downloads will be aborted and logout proceed in %d seconds."
-msgstr[0] "Hämtningar kommer att avbrytas och utloggning sker om %d sekund."
-msgstr[1] "Hämtningar kommer att avbrytas och utloggning sker om %d sekunder."
-
-#: ../src/ephy-session.c:219
-msgid "Abort pending downloads?"
-msgstr "Avbryt alla återstående hämtningar?"
-
-#: ../src/ephy-session.c:224
-msgid "There are still downloads pending. If you log out, they will be aborted and lost."
-msgstr "Det finns fortfarande utestående hämtningar. Om du loggar ut kommer de att avbrytas och förloras."
-
-#: ../src/ephy-session.c:228
-msgid "_Cancel Logout"
-msgstr "Avbryt _utloggning"
-
-#: ../src/ephy-session.c:230
-msgid "_Abort Downloads"
-msgstr "_Avbryt hämtningar"
+#| msgid "Search the web"
+msgid "Search the Web for %s"
+msgstr "Sök på nätet efter %s"
 
-#: ../src/ephy-session.c:770
-msgid "_Don't recover"
-msgstr "Åt_erställ inte"
-
-#: ../src/ephy-session.c:775
-msgid "_Recover session"
-msgstr "Återstäl_l session"
-
-#: ../src/ephy-session.c:780
-msgid "Do you want to recover the previous browser windows and tabs?"
-msgstr "Vill du återställa tidigare webbläsarfönster och -flikar?"
-
-#: ../src/ephy-window.c:91
-msgid "_Extensions"
-msgstr "_Tillägg"
-
-#. File actions.
-#: ../src/ephy-window.c:95
+#: ../src/ephy-window.c:104
 msgid "_Open…"
-msgstr "_Öppna..."
+msgstr "_Öppna…"
 
-#: ../src/ephy-window.c:97
+#: ../src/ephy-window.c:106
 msgid "Save _As…"
-msgstr "Spara _som..."
+msgstr "Spara _som…"
 
-#: ../src/ephy-window.c:99
+#: ../src/ephy-window.c:108
 msgid "Save As _Web Application…"
-msgstr "Spara som _webbapplikation..."
+msgstr "Spara som _webbapplikation…"
 
-#: ../src/ephy-window.c:101
+#: ../src/ephy-window.c:110
 msgid "_Print…"
-msgstr "S_kriv ut..."
+msgstr "S_kriv ut…"
 
-#: ../src/ephy-window.c:103
+#: ../src/ephy-window.c:112
 msgid "S_end Link by Email…"
-msgstr "Sk_icka länk via e-post..."
+msgstr "Sk_icka länk via e-post…"
 
-#. Edit actions.
-#: ../src/ephy-window.c:110
-msgid "_Undo"
-msgstr "_Ångra"
-
-#: ../src/ephy-window.c:112
+#: ../src/ephy-window.c:123
 msgid "Re_do"
 msgstr "_Gör om"
 
-#: ../src/ephy-window.c:124
+#: ../src/ephy-window.c:135
 msgid "_Find…"
-msgstr "_Sök..."
+msgstr "_Sök…"
 
-#: ../src/ephy-window.c:126
+#: ../src/ephy-window.c:137
 msgid "Find Ne_xt"
 msgstr "Sök n_ästa"
 
-#: ../src/ephy-window.c:128
+#: ../src/ephy-window.c:139
 msgid "Find Pre_vious"
 msgstr "Sök före_gående"
 
+#: ../src/ephy-window.c:141
+#| msgid "_Edit Bookmarks"
+msgid "Edit _Bookmarks"
+msgstr "Redigera b_okmärken"
+
 #. View actions.
-#: ../src/ephy-window.c:133
-#: ../src/ephy-window.c:135
+#: ../src/ephy-window.c:150 ../src/ephy-window.c:152
 msgid "_Stop"
 msgstr "_Stopp"
 
-#: ../src/ephy-window.c:139
-msgid "_Larger Text"
-msgstr "_Större text"
+#: ../src/ephy-window.c:156
+#| msgid "Zoom"
+msgid "Zoom _In"
+msgstr "Zooma _in"
 
-#: ../src/ephy-window.c:141
-msgid "S_maller Text"
-msgstr "_Mindre text"
+#: ../src/ephy-window.c:158
+#| msgid "Zoom"
+msgid "Zoom O_ut"
+msgstr "Zooma _ut"
 
-#: ../src/ephy-window.c:143
+#: ../src/ephy-window.c:160
 msgid "_Normal Size"
 msgstr "_Normal storlek"
 
-#: ../src/ephy-window.c:145
+#: ../src/ephy-window.c:162
 msgid "Text _Encoding"
 msgstr "Text_kodning"
 
-#: ../src/ephy-window.c:146
+#: ../src/ephy-window.c:163
 msgid "_Page Source"
 msgstr "Sidk_älla"
 
 #. Bookmarks actions.
-#: ../src/ephy-window.c:151
+#: ../src/ephy-window.c:168
 msgid "_Add Bookmark…"
-msgstr "_Lägg till bokmärke..."
+msgstr "_Lägg till bokmärke…"
 
 #. Go actions.
-#: ../src/ephy-window.c:156
+#: ../src/ephy-window.c:173
 msgid "_Location…"
-msgstr "_Adress..."
+msgstr "_Adress…"
 
 #. Tabs actions.
-#: ../src/ephy-window.c:161
+#: ../src/ephy-window.c:178
 msgid "_Previous Tab"
 msgstr "_Föregående flik"
 
-#: ../src/ephy-window.c:163
+#: ../src/ephy-window.c:180
 msgid "_Next Tab"
 msgstr "_Nästa flik"
 
-#: ../src/ephy-window.c:165
+#: ../src/ephy-window.c:182
 msgid "Move Tab _Left"
 msgstr "Flytta flik till _vänster"
 
-#: ../src/ephy-window.c:167
+#: ../src/ephy-window.c:184
 msgid "Move Tab _Right"
 msgstr "Flytta flik till _höger"
 
-#: ../src/ephy-window.c:169
+#: ../src/ephy-window.c:186
 msgid "_Detach Tab"
 msgstr "_Ta loss flik"
 
-#. File actions.
-#: ../src/ephy-window.c:177
-msgid "_Work Offline"
-msgstr "_Arbeta frånkopplad"
-
 #. View actions.
-#: ../src/ephy-window.c:182
+#: ../src/ephy-window.c:201
 msgid "_Downloads Bar"
 msgstr "Hä_mtningsrad"
 
-#: ../src/ephy-window.c:185
+#: ../src/ephy-window.c:204
 msgid "_Fullscreen"
 msgstr "_Helskärm"
 
-#: ../src/ephy-window.c:187
+#: ../src/ephy-window.c:206
 msgid "Popup _Windows"
 msgstr "Popup_fönster"
 
-#: ../src/ephy-window.c:189
+#: ../src/ephy-window.c:208
 msgid "Selection Caret"
 msgstr "Markeringsmarkör"
 
 #. Document.
-#: ../src/ephy-window.c:196
+#: ../src/ephy-window.c:215
 msgid "Add Boo_kmark…"
-msgstr "Lägg till bo_kmärke..."
+msgstr "Lägg till bo_kmärke…"
 
 #. Links.
-#: ../src/ephy-window.c:201
-msgid "_Open Link"
-msgstr "_Öppna länk"
-
-#: ../src/ephy-window.c:203
+#: ../src/ephy-window.c:220
 msgid "Open Link in New _Window"
 msgstr "Öppna länk i n_ytt fönster"
 
-#: ../src/ephy-window.c:205
+#: ../src/ephy-window.c:222
 msgid "Open Link in New _Tab"
 msgstr "Öppna länk i ny _flik"
 
-#: ../src/ephy-window.c:207
-msgid "_Download Link"
-msgstr "_Hämta länk"
-
-#: ../src/ephy-window.c:209
+#: ../src/ephy-window.c:224
 msgid "_Save Link As…"
-msgstr "_Spara länk som..."
-
-#: ../src/ephy-window.c:211
-msgid "_Bookmark Link…"
-msgstr "Lägg till b_okmärke för länk..."
+msgstr "_Spara länk som…"
 
-#: ../src/ephy-window.c:213
+#: ../src/ephy-window.c:226
 msgid "_Copy Link Address"
 msgstr "_Kopiera länkadress"
 
-#. Images.
-#: ../src/ephy-window.c:218
-msgid "Open _Image"
-msgstr "Öppna bi_ld"
-
-#: ../src/ephy-window.c:220
-msgid "_Save Image As…"
-msgstr "Spara bil_d som..."
+#: ../src/ephy-window.c:228
+#| msgid "_Copy Email Address"
+msgid "_Copy E-mail Address"
+msgstr "_Kopiera e-postadress"
 
-#: ../src/ephy-window.c:222
-msgid "_Use Image As Background"
-msgstr "_Använd bild som bakgrund"
+#. Images.
+#: ../src/ephy-window.c:233
+#| msgid "Open _Image"
+msgid "View _Image"
+msgstr "Visa bi_ld"
 
-#: ../src/ephy-window.c:224
+#: ../src/ephy-window.c:235
 msgid "Copy I_mage Address"
 msgstr "Kopiera b_ildadress"
 
-#: ../src/ephy-window.c:226
+#: ../src/ephy-window.c:237
+msgid "_Save Image As…"
+msgstr "Spara bil_d som…"
+
+#: ../src/ephy-window.c:239
+msgid "Set as _Wallpaper"
+msgstr "Använd som sk_rivbordsbakgrund"
+
+#: ../src/ephy-window.c:241
 msgid "St_art Animation"
 msgstr "St_arta animering"
 
-#: ../src/ephy-window.c:228
+#: ../src/ephy-window.c:243
 msgid "St_op Animation"
 msgstr "St_oppa animering"
 
-#. Inspector.
-#: ../src/ephy-window.c:244
-msgid "Inspect _Element"
-msgstr "Inspektera _element"
-
-#: ../src/ephy-window.c:449
+#: ../src/ephy-window.c:451
 msgid "There are unsubmitted changes to form elements"
-msgstr "Det finns oskickade ändringar i formulärelement"
+msgstr "Det finns ändringar i formulärelement som inte skickats"
 
-#: ../src/ephy-window.c:450
+#: ../src/ephy-window.c:452
 msgid "If you close the document anyway, you will lose that information."
 msgstr "Om du ändå stänger dokumentet kommer du att förlora den informationen."
 
-#: ../src/ephy-window.c:452
+#: ../src/ephy-window.c:454
 msgid "Close _Document"
 msgstr "Stäng _dokument"
 
-#: ../src/ephy-window.c:470
+#: ../src/ephy-window.c:469
 msgid "There are ongoing downloads in this window"
 msgstr "Det pågår fortfarande hämtningar i detta fönster"
 
-#: ../src/ephy-window.c:471
+#: ../src/ephy-window.c:470
 msgid "If you close this window, the downloads will be cancelled"
 msgstr "Om du stänger detta fönster så kommer hämtningarna att avbrytas"
 
-#: ../src/ephy-window.c:472
+#: ../src/ephy-window.c:471
 msgid "Close window and cancel downloads"
 msgstr "Stäng fönstret och avbryt hämtningar"
 
-#: ../src/ephy-window.c:1278
+#: ../src/ephy-window.c:1148
 msgid "Save As"
 msgstr "Spara som"
 
-#: ../src/ephy-window.c:1280
+#: ../src/ephy-window.c:1150
 msgid "Save As Application"
 msgstr "Spara som applikation"
 
-#: ../src/ephy-window.c:1282
+#: ../src/ephy-window.c:1152
 msgid "Print"
 msgstr "Skriv ut"
 
-#: ../src/ephy-window.c:1284
+#: ../src/ephy-window.c:1154
 msgid "Bookmark"
 msgstr "Bokmärke"
 
-#: ../src/ephy-window.c:1286
+#: ../src/ephy-window.c:1156
 msgid "Find"
 msgstr "Sök"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1295
+#: ../src/ephy-window.c:1165
 msgid "Larger"
 msgstr "Större"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1298
+#: ../src/ephy-window.c:1168
 msgid "Smaller"
 msgstr "Mindre"
 
-#: ../src/ephy-window.c:1318
+#: ../src/ephy-window.c:1196
 msgid "Back"
 msgstr "Bakåt"
 
-#: ../src/ephy-window.c:1330
+#: ../src/ephy-window.c:1208
 msgid "Forward"
 msgstr "Framåt"
 
-#: ../src/ephy-window.c:1342
+#: ../src/ephy-window.c:1220
 msgid "Zoom"
 msgstr "Zooma"
 
-#: ../src/ephy-window.c:1350
+#: ../src/ephy-window.c:1229
 msgid "New _Tab"
 msgstr "Ny _flik"
 
-#: ../src/pdm-dialog.c:336
-msgid "<b>Select the personal data you want to clear</b>"
-msgstr "<b>Välj det personliga data som du vill tömma</b>"
-
-#: ../src/pdm-dialog.c:339
-msgid "You are about to clear personal data that is stored about the web pages you have visited. Before proceeding, check the types of information that you want to remove:"
-msgstr "Du är på väg att tömma personlig data som lagrats om de webbsidor som du har besökt. Innan du fortsätter bör du kryssa för de typer av information som du vill ta bort:"
-
-#: ../src/pdm-dialog.c:344
-msgid "Clear All Personal Data"
-msgstr "Töm all personlig data"
-
-#. Cookies
-#: ../src/pdm-dialog.c:378
-msgid "C_ookies"
-msgstr "Ka_kor"
-
-#. Passwords
-#: ../src/pdm-dialog.c:390
-msgid "Saved _passwords"
-msgstr "Sparade _lösenord"
-
-#. History
-#: ../src/pdm-dialog.c:402
-msgid "Hi_story"
-msgstr "Hi_storik"
-
-#. Cache
-#: ../src/pdm-dialog.c:414
-msgid "_Temporary files"
-msgstr "_Temporära filer"
-
-#: ../src/pdm-dialog.c:430
-msgid "<small><i><b>Note:</b> You cannot undo this action. The data you are choosing to clear will be deleted forever.</i></small>"
-msgstr "<small><i><b>Observera:</b> Du kan inte ångra denna åtgärd. Det data som du väljer att tömma går inte att återställa.</i></small>"
-
-#: ../src/pdm-dialog.c:649
-msgid "Encrypted connections only"
-msgstr "Endast krypterade anslutningar"
-
-#: ../src/pdm-dialog.c:650
-msgid "Any type of connection"
-msgstr "Alla typer av anslutningar"
+#: ../src/ephy-window.c:1237
+#| msgid "Go to the next visited page"
+msgid "Go to most visited"
+msgstr "Gå till mest besökta"
 
-#. Session cookie
-#: ../src/pdm-dialog.c:655
-msgid "End of current session"
-msgstr "slut på aktuell session"
-
-#: ../src/pdm-dialog.c:774
-msgid "Domain"
-msgstr "Domän"
-
-#: ../src/pdm-dialog.c:786
-msgid "Name"
-msgstr "Namn"
-
-#: ../src/pdm-dialog.c:1200
-msgid "Host"
-msgstr "Värd"
-
-#: ../src/pdm-dialog.c:1213
-msgid "User Name"
-msgstr "Användarnamn"
-
-#: ../src/pdm-dialog.c:1226
-msgid "User Password"
-msgstr "Användarlösenord"
-
-#: ../src/popup-commands.c:273
-msgid "Download Link"
-msgstr "Hämta länk"
-
-#: ../src/popup-commands.c:281
+#: ../src/popup-commands.c:237
 msgid "Save Link As"
 msgstr "Spara länk som"
 
-#: ../src/popup-commands.c:288
+#: ../src/popup-commands.c:243
 msgid "Save Image As"
 msgstr "Spara bild som"
 
@@ -2151,8 +2605,7 @@ msgstr "Spara bild som"
 #. * second %s is the locale name. Example:
 #. * "French (France)"
 #.
-#: ../src/prefs-dialog.c:468
-#: ../src/prefs-dialog.c:474
+#: ../src/prefs-dialog.c:553 ../src/prefs-dialog.c:559
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
@@ -2161,96 +2614,120 @@ 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:483
+#: ../src/prefs-dialog.c:568
 #, c-format
 msgctxt "language"
 msgid "User defined (%s)"
 msgstr "Användardefinierat (%s)"
 
-#: ../src/prefs-dialog.c:505
+#: ../src/prefs-dialog.c:590
 #, 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:863
+#: ../src/prefs-dialog.c:922
 msgid "Select a Directory"
 msgstr "Välj en katalog"
 
-#: ../src/window-commands.c:316
-msgid "Save"
-msgstr "Spara"
+#. Search engine option in the preferences dialog
+#: ../src/prefs-dialog.c:1017
+msgid "DuckDuckGo"
+msgstr "DuckDuckGo"
+
+#. For the preferences dialog. Must exactly match the URL
+#. * you chose in the gschema, but with & instead of &amp;
+#. * If the match is not exact, there will be a spurious, ugly
+#. * entry in the preferences combo, so please test this.
+#: ../src/prefs-dialog.c:1022
+#, c-format
+msgid "https://duckduckgo.com/?q=%s&t=epiphany"
+msgstr "https://duckduckgo.com/?q=%s&t=epiphany&kl=se-sv&kad=sv_SE"
 
-#: ../src/window-commands.c:479
+#. Search engine option in the preferences dialog
+#: ../src/prefs-dialog.c:1024
+msgid "Google"
+msgstr "Google"
+
+#. For the preferences dialog. Consider a regional variant, like google.co.uk
+#: ../src/prefs-dialog.c:1026
+#, c-format
+#| msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8"
+msgid "https://google.com/search?q=%s"
+msgstr "http://www.google.se/search?q=%s"
+
+#. Search engine option in the preferences dialog
+#: ../src/prefs-dialog.c:1028
+msgid "Bing"
+msgstr "Bing"
+
+#. For the preferences dialog. Consider a regional variant, like uk.bing.com
+#: ../src/prefs-dialog.c:1030
+#, c-format
+#| msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8"
+msgid "http://www.bing.com/search?q=%s"
+msgstr "http://www.bing.com/search?q=%s"
+
+#: ../src/window-commands.c:709
 #, c-format
 msgid "A web application named '%s' already exists. Do you want to replace it?"
-msgstr "En webbapplikation med namnet \"%s\" finns redan. Vill du ersätta den?"
+msgstr "En webbapplikation med namnet ”%s” finns redan. Vill du ersätta den?"
 
-#: ../src/window-commands.c:484
+#: ../src/window-commands.c:714
 msgid "Replace"
 msgstr "Ersätt"
 
-#: ../src/window-commands.c:488
-msgid "An application with the same name already exists. Replacing it will overwrite it."
-msgstr "Det finns redan en applikation med detta namn. Om du ersätter den så skrivs den gamla över."
+#: ../src/window-commands.c:718
+msgid ""
+"An application with the same name already exists. Replacing it will "
+"overwrite it."
+msgstr ""
+"Det finns redan en applikation med detta namn. Om du ersätter den så skrivs "
+"den gamla över."
 
-#: ../src/window-commands.c:530
+#: ../src/window-commands.c:754
 #, c-format
 msgid "The application '%s' is ready to be used"
-msgstr "Applikationen \"%s\" är redo att användas"
+msgstr "Applikationen ”%s” är redo att användas"
 
-#: ../src/window-commands.c:533
+#: ../src/window-commands.c:757
 #, c-format
 msgid "The application '%s' could not be created"
-msgstr "Applikationen \"%s\" kunde inte skapas"
+msgstr "Applikationen ”%s” kunde inte skapas"
 
-#: ../src/window-commands.c:541
+#: ../src/window-commands.c:765
 msgid "Launch"
 msgstr "Starta"
 
 #. Show dialog with icon, title.
-#: ../src/window-commands.c:574
+#: ../src/window-commands.c:805
 msgid "Create Web Application"
 msgstr "Skapa webbapplikation"
 
-#: ../src/window-commands.c:579
+#: ../src/window-commands.c:810
 msgid "C_reate"
 msgstr "S_kapa"
 
-#: ../src/window-commands.c:1125
-msgid "Web is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
-msgstr "Webb är fri programvara; du kan distribuera det och/eller modifiera det under villkoren i GNU General Public License, publicerad av Free Software Foundation, antingen version 2 eller (om du så vill) någon senare version."
-
-#: ../src/window-commands.c:1129
-msgid "The GNOME Web Browser is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
-msgstr "GNOME-webbläsaren distribueras i hopp om att den ska vara användbart, men UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för ytterligare information."
-
-#: ../src/window-commands.c:1133
-msgid "You should have received a copy of the GNU General Public License along with the GNOME Web Browser; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA"
-msgstr "Du bör ha fått en kopia av GNU General Public License tillsammans med GNOME-webbläsaren. Om inte, skriv till Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA"
-
-#: ../src/window-commands.c:1179
-#: ../src/window-commands.c:1195
-#: ../src/window-commands.c:1206
+#: ../src/window-commands.c:1473 ../src/window-commands.c:1496
 msgid "Contact us at:"
 msgstr "Kontakta oss på:"
 
-#: ../src/window-commands.c:1182
+#: ../src/window-commands.c:1476
 msgid "Contributors:"
 msgstr "Bidragsgivare:"
 
-#: ../src/window-commands.c:1185
+#: ../src/window-commands.c:1479
 msgid "Past developers:"
 msgstr "Tidigare utvecklare:"
 
-#: ../src/window-commands.c:1215
+#: ../src/window-commands.c:1505
 #, c-format
 msgid ""
-"Lets you view web pages and find information on the internet.\n"
+"A simple, clean, beautiful view of the web.\n"
 "Powered by WebKit %d.%d.%d"
 msgstr ""
-"Låter dig surfa på webbsidor och hitta information på Internet.\n"
+"Ett enkelt, stilrent och vackert sätt att se webben.\n"
 "Drivs av WebKit %d.%d.%d"
 
 #. Translators: This is a special message that shouldn't be translated
@@ -2261,1343 +2738,79 @@ msgstr ""
 #. * this translation; in that case, please write each of them on a separate
 #. * line seperated by newlines (\n).
 #.
-#: ../src/window-commands.c:1244
+#: ../src/window-commands.c:1528
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander <po@danielnylander.se>\n"
 "Christian Rose\n"
 "Dennis Persson\n"
+"Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "\n"
 "Skicka synpunkter på översättningen till\n"
 "<tp-sv@listor.tp-sv.se>."
 
-#: ../src/window-commands.c:1247
+#: ../src/window-commands.c:1531
 msgid "Web Website"
 msgstr "Webbplatsen för Webb"
 
-#: ../src/window-commands.c:1389
+#: ../src/window-commands.c:1670
 msgid "Enable caret browsing mode?"
 msgstr "Aktivera markörläge?"
 
-#: ../src/window-commands.c:1392
-msgid "Pressing F7 turns caret browsing on or off. This feature places a moveable cursor in web pages, allowing you to move around with your keyboard. Do you want to enable caret browsing on?"
-msgstr "Tryck F7 för att aktivera markörläge. Denna funktion placerar en flyttbar markör i webbsidor, vilket gör att du kan flytta runt den med ditt tangentbord. Vill du aktivera markörläge?"
+#: ../src/window-commands.c:1673
+#| msgid ""
+#| "Pressing F7 turns caret browsing on or off. This feature places a "
+#| "moveable cursor in web pages, allowing you to move around with your "
+#| "keyboard. Do you want to enable caret browsing on?"
+msgid ""
+"Pressing F7 turns caret browsing on or off. This feature places a moveable "
+"cursor in web pages, allowing you to move around with your keyboard. Do you "
+"want to enable caret browsing?"
+msgstr ""
+"Tryck F7 för att aktivera markörläge. Denna funktion placerar en flyttbar "
+"markör i webbsidor, vilket gör att du kan flytta runt med ditt tangentbord. "
+"Vill du aktivera markörläge?"
 
-#: ../src/window-commands.c:1395
+#: ../src/window-commands.c:1676
 msgid "_Enable"
 msgstr "_Aktivera"
 
-#~ msgid "Update bookmark “%s”?"
-#~ msgstr "Uppdatera bokmärket \"%s\"?"
-
-#~ msgid "The bookmarked page has moved to “%s”."
-#~ msgstr "Sidan i bokmärket har flyttat till \"%s\"."
-
-#~ msgid "_Don't Update"
-#~ msgstr "Uppdatera _inte"
-
-#~ msgid "_Update"
-#~ msgstr "_Uppdatera"
-
-#~ msgid "Update Bookmark?"
-#~ msgstr "Uppdatera bokmärke?"
-#~ msgctxt "bookmarks"
-
-#~ msgid "Most Visited"
-#~ msgstr "Mest besökta"
-
-#~ msgid "Browse and organize your bookmarks"
-#~ msgstr "Bläddra bland och organisera dina bokmärken"
-
-#~ msgid "Epiphany Web Bookmarks"
-#~ msgstr "Epiphany-webbokmärken"
-
-#~ msgid "Web Bookmarks"
-#~ msgstr "Webbokmärken"
-
-#~ msgid "Epiphany"
-#~ msgstr "Epiphany"
-
-#~ msgid "Certificate _Fields"
-#~ msgstr "Certifikat_fält"
-
-#~ msgid "Certificate _Hierarchy"
-#~ msgstr "Certifikat_hierarki"
-
-#~ msgid "Common Name:"
-#~ msgstr "Tilltalsnamn:"
-
-#~ msgid "Details"
-#~ msgstr "Detaljer"
-
-#~ msgid "Expires On:"
-#~ msgstr "Går ut:"
-
-#~ msgid "Field _Value"
-#~ msgstr "Fält_värde"
-
-#~ msgid "Fingerprints"
-#~ msgstr "Fingeravtryck"
-
-#~ msgid "Issued By"
-#~ msgstr "Utfärdat av"
-
-#~ msgid "Issued On:"
-#~ msgstr "Utfärdat:"
-
-#~ msgid "Issued To"
-#~ msgstr "Utfärdat till"
-
-#~ msgid "MD5 Fingerprint:"
-#~ msgstr "MD5-fingeravtryck:"
-
-#~ msgid "Organization:"
-#~ msgstr "Organisation:"
-
-#~ msgid "Organizational Unit:"
-#~ msgstr "Organisationsenhet:"
-
-#~ msgid "SHA1 Fingerprint:"
-#~ msgstr "SHA1-fingeravtryck:"
-
-#~ msgid "Serial Number:"
-#~ msgstr "Serienummer:"
-
-#~ msgid "Validity"
-#~ msgstr "Giltighet"
-
-#~ msgid "Clear _All..."
-#~ msgstr "Töm _allt..."
-
-#~ msgid "Sign Text"
-#~ msgstr "Signera text"
-
-#~ msgid ""
-#~ "To confirm that you want to sign the above text, choose a certificate to "
-#~ "sign the text with and enter its password below."
-#~ msgstr ""
-#~ "För att bekräfta att du vill signera ovanstående text, välj ett "
-#~ "certifikat att signera texten med och ange dess lösenord nedan."
-
-#~ msgid "_Certificate:"
-#~ msgstr "_Certifikat:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Lösenord:"
-
-#~ msgid "_View Certificate&#x2026;"
-#~ msgstr "_Visa certifikat&#x2026;"
-
-#~ msgid "Home page"
-#~ msgstr "Hemsida"
+#~ msgid "http://www.google.com"
+#~ msgstr "http://www.google.se"
 
-#~ msgid "Set to Current _Page"
-#~ msgstr "Ställ in till aktuell _sida"
+#~ msgid "http://www.google.com/search?q=%s&amp;ie=UTF-8&amp;oe=UTF-8"
+#~ msgstr "http://www.google.se/search?q=%s&amp;ie=UTF-8&amp;oe=UTF-8"
 
-#~ msgid "Set to _Blank Page"
-#~ msgstr "Ställ in till _tom sida"
+#~ msgid "Personal Data"
+#~ msgstr "Personlig data"
 
-#~ msgid "_Address:"
-#~ msgstr "_Adress:"
+#~ msgid "Cookie properties"
+#~ msgstr "Kakegenskaper"
 
-#~ msgid "As laid out on the _screen"
-#~ msgstr "Som visas på _skärmen"
+#~ msgid "Content:"
+#~ msgstr "Innehåll:"
 
-#~ msgid "Background"
-#~ msgstr "Bakgrund"
+#~ msgid "Path:"
+#~ msgstr "Sökväg:"
 
-#~ msgid "Footers"
-#~ msgstr "Sidfötter"
+#~ msgid "Send for:"
+#~ msgstr "Skicka för:"
 
-#~ msgid "Frames"
-#~ msgstr "Ramar"
+#~ msgid "Expires:"
+#~ msgstr "Utgår:"
 
-#~ msgid "Headers"
-#~ msgstr "Sidhuvuden"
+#~ msgid "<b>_Automatic</b>"
+#~ msgstr "<b>_Automatisk</b>"
 
-#~ msgid "O_nly the selected frame"
-#~ msgstr "Endast den _markerade ramen"
-
-#~ msgid "P_age title"
-#~ msgstr "_Sidtitel"
-
-#~ msgid "Page _numbers"
-#~ msgstr "Sidnu_mmer"
-
-#~ msgid "Print background c_olors"
-#~ msgstr "Skriv ut ba_kgrundsfärger"
-
-#~ msgid "Print background i_mages"
-#~ msgstr "Skriv ut bak_grundsbilder"
-
-#~ msgid "_Date"
-#~ msgstr "_Datum"
-
-#~ msgid "_Each frame separately"
-#~ msgstr "_Varje ram separat"
-
-#~ msgid "_Page address"
-#~ msgstr "_Sidadress"
-
-#~ msgid ""
-#~ "CA Certificates file we should use was not found, all SSL sites will be "
-#~ "considered to have a broken certificate."
-#~ msgstr ""
-#~ "Filen för CA-certifikat som vi ska använda hittades inte. Alla SSL-"
-#~ "webbplatser kommer att anses ha ett trasigt certifikat."
-
-#~ msgid "Show “_%s”"
-#~ msgstr "Visa \"_%s\""
-
-#~ msgid "_Move on Toolbar"
-#~ msgstr "_Flytta på verktygsrad"
-
-#~ msgid "Move the selected item on the toolbar"
-#~ msgstr "Flytta den markerade posten på verktygsraden"
-
-#~ msgid "_Remove from Toolbar"
-#~ msgstr "_Ta bort från verktygsrad"
-
-#~ msgid "Remove the selected item from the toolbar"
-#~ msgstr "Ta bort den markerade posten på verktygsraden"
-
-#~ msgid "_Delete Toolbar"
-#~ msgstr "_Ta bort verktygsrad"
-
-#~ msgid "Remove the selected toolbar"
-#~ msgstr "Ta bort den markerade verktygsraden"
-
-#~ msgid "Separator"
-#~ msgstr "Avskiljare"
-
-#~ msgid "Popup Windows"
-#~ msgstr "Popupfönster"
-
-#~ msgid "Address Entry"
-#~ msgstr "Adressfält"
-
-#~ msgid "_Download"
-#~ msgstr "_Hämta"
-
-#~ msgid "%s:"
-#~ msgstr "%s:"
-
-#~ msgid "Executes the script “%s”"
-#~ msgstr "Kör skriptet \"%s\""
-
-#~ msgid "_Show on Toolbar"
-#~ msgstr "_Visa i verktygsraden"
-
-#~ msgid "Show the selected bookmark on a toolbar"
-#~ msgstr "Visa det markerade bokmärket i en verktygsrad"
-
-#~ msgid "Show properties for this bookmark"
-#~ msgstr "Visa egenskaper för detta bokmärke"
-
-#~ msgid "Open this bookmark in a new tab"
-#~ msgstr "Öppna detta bokmärke i en ny flik"
-
-#~ msgid "Open this bookmark in a new window"
-#~ msgstr "Öppna detta bokmärke i ett nytt fönster"
-
-#~ msgid "Related"
-#~ msgstr "Relaterad"
-
-#~ msgid "Topic"
-#~ msgstr "Ämne"
-
-#~ msgid "Go"
-#~ msgstr "Gå"
-
-#~ msgid "GNOME Web Browser"
-#~ msgstr "GNOME-webbläsaren"
-
-#~ msgid "GNOME Web Browser options"
-#~ msgstr "Alternativ för GNOME-webbläsaren"
-
-#~ msgid "Switch to this tab"
-#~ msgstr "Växla till denna flik"
-
-#~ msgid "Go to the previous visited page"
-#~ msgstr "Gå till till den tidigare besökta sidan"
-
-#~ msgid "Go to the next visited page"
-#~ msgstr "Gå till den nästa besökta sidan"
-
-#~ msgid "Forward history"
-#~ msgstr "Framåthistorik"
-
-#~ msgid "_Up"
-#~ msgstr "_Upp"
-
-#~ msgid "Go up one level"
-#~ msgstr "Gå upp en nivå"
-
-#~ msgid "List of upper levels"
-#~ msgstr "Lista med övre nivåer"
-
-#~ msgid "Enter a web address to open, or a phrase to search for"
-#~ msgstr "Ange en webbadress att öppna eller en fras att söka efter"
-
-#~ msgid "Adjust the text size"
-#~ msgstr "Justera textstorleken"
-
-#~ msgid "Go to the address entered in the address entry"
-#~ msgstr "Gå till adressen som är angiven i adressfältet"
-
-#~ msgid "_Home"
-#~ msgstr "_Hem"
-
-#~ msgid "Go to the home page"
-#~ msgstr "Gå till hemsidan"
-
-#~ msgid "Open a new tab"
-#~ msgstr "Öppna en ny flik"
-
-#~ msgid "Open a new window"
-#~ msgstr "Öppna ett nytt fönster"
-#~ msgctxt "toolbar style"
-
-#~ msgid "Default"
-#~ msgstr "Standard"
-#~ msgctxt "toolbar style"
-
-#~ msgid "Text below icons"
-#~ msgstr "Text under ikoner"
-#~ msgctxt "toolbar style"
-
-#~ msgid "Text beside icons"
-#~ msgstr "Text bredvid ikoner"
-#~ msgctxt "toolbar style"
-
-#~ msgid "Icons only"
-#~ msgstr "Endast ikoner"
-#~ msgctxt "toolbar style"
-
-#~ msgid "Text only"
-#~ msgstr "Endast text"
-
-#~ msgid "Toolbar Editor"
-#~ msgstr "Verktygsradsredigerare"
-
-#~ msgid "Toolbar _button labels:"
-#~ msgstr "Etiketter för verktygsrads_knappar:"
-
-#~ msgid "_Add a New Toolbar"
-#~ msgstr "_Lägg till en ny verktygsrad"
-
-#~ msgid "_Go"
-#~ msgstr "_Gå"
-
-#~ msgid "T_ools"
-#~ msgstr "V_erktyg"
-
-#~ msgid "_Tabs"
-#~ msgstr "_Flikar"
-
-#~ msgid "_Toolbars"
-#~ msgstr "_Verktygsrader"
-
-#~ msgid "Open a file"
-#~ msgstr "Öppna en fil"
-
-#~ msgid "Save the current page"
-#~ msgstr "Spara den aktuella sidan"
-
-#~ msgid "Save the current page as a Web Application"
-#~ msgstr "Spara den aktuella sidan som en webbapplikation"
-
-#~ msgid "Page Set_up"
-#~ msgstr "Sidkonfig_uration"
-
-#~ msgid "Setup the page settings for printing"
-#~ msgstr "Konfigurera sidinställningarna för utskrift"
-
-#~ msgid "Print Pre_view"
-#~ msgstr "Förhands_granskning"
-
-#~ msgid "Print preview"
-#~ msgstr "Förhandsgranskning"
-
-#~ msgid "Print the current page"
-#~ msgstr "Skriv ut den aktuella sidan"
-
-#~ msgid "Send a link of the current page"
-#~ msgstr "Skicka en länk till den aktuella sidan"
-
-#~ msgid "Close this tab"
-#~ msgstr "Stäng denna flik"
-
-#~ msgid "Undo the last action"
-#~ msgstr "Ångra den senaste åtgärden"
-
-#~ msgid "Redo the last undone action"
-#~ msgstr "Gör om den senast ångrade åtgärden"
-
-#~ msgid "Paste clipboard"
-#~ msgstr "Klistra in urklipp"
-
-#~ msgid "Delete text"
-#~ msgstr "Ta bort text"
-
-#~ msgid "Select the entire page"
-#~ msgstr "Markera hela sidan"
-
-#~ msgid "Find a word or phrase in the page"
-#~ msgstr "Sök efter ett ord eller ett uttryck på sidan"
-
-#~ msgid "Find next occurrence of the word or phrase"
-#~ msgstr "Sök nästa förekomst av strängen eller uttrycket"
-
-#~ msgid "Find previous occurrence of the word or phrase"
-#~ msgstr "Sök föregående förekomst av strängen eller uttrycket"
-
-#~ msgid "P_ersonal Data"
-#~ msgstr "_Personlig data"
-
-#~ msgid "View and remove cookies and passwords"
-#~ msgstr "Visa och ta bort kakor och lösenord"
-
-#~ msgid "Certificate_s"
-#~ msgstr "Certifi_kat"
-
-#~ msgid "Manage Certificates"
-#~ msgstr "Hantera certifikat"
-
-#~ msgid "P_references"
-#~ msgstr "I_nställningar"
-
-#~ msgid "Configure the web browser"
-#~ msgstr "Konfigurera webbläsaren"
-
-#~ msgid "_Customize Toolbars…"
-#~ msgstr "Anpassa _verktygsrader..."
-
-#~ msgid "Customize toolbars"
-#~ msgstr "Anpassa verktygsrader"
-
-#~ msgid "Increase the text size"
-#~ msgstr "Öka textstorleken"
-
-#~ msgid "Decrease the text size"
-#~ msgstr "Minska textstorleken"
-
-#~ msgid "Use the normal text size"
-#~ msgstr "Använd den normala textstorleken"
-
-#~ msgid "Change the text encoding"
-#~ msgstr "Ändra textkodningen"
-
-#~ msgid "View the source code of the page"
-#~ msgstr "Visa källkoden för sidan"
-
-#~ msgid "Page _Security Information"
-#~ msgstr "_Säkerhetsinformation för sidan"
-
-#~ msgid "Display security information for the web page"
-#~ msgstr "Visa säkerhetsinformation för webbsidan"
-
-#~ msgid "Add a bookmark for the current page"
-#~ msgstr "Lägg till bokmärke för den aktuella sidan"
-
-#~ msgid "_Edit Bookmarks"
-#~ msgstr "_Redigera bokmärken"
-
-#~ msgid "Open the bookmarks window"
-#~ msgstr "Öppna bokmärkesfönstret"
-
-#~ msgid "Go to a specified location"
-#~ msgstr "Gå till en angiven adress"
-
-#~ msgid "Open the history window"
-#~ msgstr "Öppna historikfönstret"
-
-#~ msgid "Activate previous tab"
-#~ msgstr "Aktivera föregående flik"
-
-#~ msgid "Activate next tab"
-#~ msgstr "Aktivera nästa flik"
-
-#~ msgid "Move current tab to left"
-#~ msgstr "Flytta den aktuella fliken till vänster"
-
-#~ msgid "Move current tab to right"
-#~ msgstr "Flytta den aktuella fliken till höger"
-
-#~ msgid "Detach current tab"
-#~ msgstr "Ta loss den aktuella fliken"
-
-#~ msgid "Display web browser help"
-#~ msgstr "Visa hjälp för webbläsaren"
-
-#~ msgid "Switch to offline mode"
-#~ msgstr "Växla till frånkopplat läge"
-
-#~ msgid "_Hide Toolbars"
-#~ msgstr "_Dölj verktygsrader"
-
-#~ msgid "Show or hide toolbar"
-#~ msgstr "Visa eller dölj verktygsrad"
-
-#~ msgid "Show the active downloads for this window"
-#~ msgstr "Visa aktiva hämtningar för detta fönster"
-
-#~ msgid "Men_ubar"
-#~ msgstr "Men_yrad"
-
-#~ msgid "Browse at full screen"
-#~ msgstr "Surfa i helskärmsläge"
-
-#~ msgid "Show or hide unrequested popup windows from this site"
-#~ msgstr "Visa eller dölj popupfönster som inte begärts från denna webbplats"
-
-#~ msgid "Show Only _This Frame"
-#~ msgstr "Visa endast denna _ram"
-
-#~ msgid "Show only this frame in this window"
-#~ msgstr "Visa endast denna ram i detta fönster"
-
-#~ msgid "Open link in this window"
-#~ msgstr "Öppna länk i detta fönster"
-
-#~ msgid "Open link in a new window"
-#~ msgstr "Öppna i ett nytt fönster"
-
-#~ msgid "Open link in a new tab"
-#~ msgstr "Öppna länk i en ny flik"
-
-#~ msgid "Save link with a different name"
-#~ msgstr "Spara länk med ett annat namn"
-
-#~ msgid "_Send Email…"
-#~ msgstr "_Skicka e-post..."
-
-#~ msgid "_Copy Email Address"
-#~ msgstr "_Kopiera e-postadress"
-
-#~ msgid "Insecure"
-#~ msgstr "Osäker"
-
-#~ msgid "Broken"
-#~ msgstr "Trasig"
-
-#~ msgid "Low"
-#~ msgstr "Låg"
-
-#~ msgid "High"
-#~ msgstr "Hög"
-
-#~ msgid "Security level: %s"
-#~ msgstr "Säkerhetsnivå: %s"
-
-#~ msgid "Open image “%s”"
-#~ msgstr "Öppna bilden \"%s\""
-
-#~ msgid "Use as desktop background “%s”"
-#~ msgstr "Använd som skrivbordsbakgrund \"%s\""
-
-#~ msgid "Save image “%s”"
-#~ msgstr "Spara bilden \"%s\""
-
-#~ msgid "Copy image address “%s”"
-#~ msgstr "Kopiera bildadressen \"%s\""
-
-#~ msgid "Send email to address “%s”"
-#~ msgstr "Skicka e-post till adressen \"%s\""
-
-#~ msgid "Copy email address “%s”"
-#~ msgstr "Kopiera e-postadressen \"%s\""
-
-#~ msgid "Save link “%s”"
-#~ msgstr "Spara länken \"%s\""
-
-#~ msgid "Bookmark link “%s”"
-#~ msgstr "Lägg till bokmärke för länken \"%s\""
-
-#~ msgid "Copy link's address “%s”"
-#~ msgstr "Kopiera länkens adress \"%s\""
-
-#~ msgid "<b>Fingerprints</b>"
-#~ msgstr "<b>Fingeravtryck</b>"
-
-#~ msgid "<b>Issued By</b>"
-#~ msgstr "<b>Utfärdat av</b>"
-
-#~ msgid "<b>Issued To</b>"
-#~ msgstr "<b>Utfärdat till</b>"
-
-#~ msgid "<b>Cookies</b>"
-#~ msgstr "<b>Kakor</b>"
-
-#~ msgid "<b>Downloads</b>"
-#~ msgstr "<b>Hämtningar</b>"
-
-#~ msgid "<b>Encodings</b>"
-#~ msgstr "<b>Teckenkodningar</b>"
-
-#~ msgid "<b>Fonts</b>"
-#~ msgstr "<b>Typsnitt</b>"
-
-#~ msgid "<b>Home page</b>"
-#~ msgstr "<b>Hemsida</b>"
-
-#~ msgid "<b>Languages</b>"
-#~ msgstr "<b>Språk</b>"
-
-#~ msgid "<b>Passwords</b>"
-#~ msgstr "<b>Lösenord</b>"
-
-#~ msgid "<b>Style</b>"
-#~ msgstr "<b>Stil</b>"
-
-#~ msgid "<b>Temporary Files</b>"
-#~ msgstr "<b>Temporära filer</b>"
-
-#~ msgid "_Minimum font size:"
-#~ msgstr "_Minsta typsnittsstorlek"
-
-#~ msgid "_Show Downloads"
-#~ msgstr "_Visa hämtningar"
-
-#~ msgid "%u:%02u.%02u"
-#~ msgstr "%u.%02u.%02u"
-
-#~ msgid "%02u.%02u"
-#~ msgstr "%02u.%02u"
-
-#~ msgid "_Pause"
-#~ msgstr "_Paus"
-
-#~ msgid "_Resume"
-#~ msgstr "_Återuppta"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "%s of %s"
-#~ msgstr ""
-#~ "%s\n"
-#~ "%s av %s"
-
-#~ msgid "%d download"
-
-#~ msgid_plural "%d downloads"
-#~ msgstr[0] "%d hämtning"
-#~ msgstr[1] "%d hämtningar"
-#~ msgctxt "download status"
+#~ msgid "Enable Java_Script"
+#~ msgstr "Använd Java_Script"
 
+#~ msgctxt "file type"
 #~ msgid "Unknown"
 #~ msgstr "Okänd"
-#~ msgctxt "download status"
-
-#~ msgid "Failed"
-#~ msgstr "Misslyckades"
-
-#~ msgid "%"
-#~ msgstr "%"
-
-#~ msgid "Remaining"
-#~ msgstr "Återstår"
-
-#~ msgid "Download this potentially unsafe file?"
-#~ msgstr "Hämta denna möjligen osäkra fil?"
-
-#~ msgid ""
-#~ "File Type: “%s”.\n"
-#~ "\n"
-#~ "It is unsafe to open “%s” as it could potentially damage your documents "
-#~ "or invade your privacy. You can download it instead."
-#~ msgstr ""
-#~ "Filtyp: \"%s\".\n"
-#~ "\n"
-#~ "Det är osäkert att öppna \"%s\" eftersom den möjligen kan skada dina "
-#~ "dokument eller inkräkta på din integritet. Du kan hämta ner den istället."
-
-#~ msgid "Open this file?"
-#~ msgstr "Öppna denna fil?"
-
-#~ msgid ""
-#~ "File Type: “%s”.\n"
-#~ "\n"
-#~ "You can open “%s” using “%s” or save it."
-#~ msgstr ""
-#~ "Filtyp: \"%s\".\n"
-#~ "\n"
-#~ "Du kan öppna \"%s\" med hjälp av \"%s\" eller spara den."
-
-#~ msgid "Download this file?"
-#~ msgstr "Hämta denna fil?"
-
-#~ msgid ""
-#~ "File Type: “%s”.\n"
-#~ "\n"
-#~ "You have no application able to open “%s”. You can download it instead."
-#~ msgstr ""
-#~ "Filtyp: \"%s\".\n"
-#~ "\n"
-#~ "Du har inget program som kan öppna \"%s\". Du kan hämta ner den istället."
-
-#~ msgid "Let web pages specify their own _fonts"
-#~ msgstr "Låt webbsidor ange sina egna _typsnitt"
-
-#~ msgid "Let web pages specify their own c_olors"
-#~ msgstr "Låt webbsidor ange sina egna _färger"
-
-#~ msgid "_Minimum size:"
-#~ msgstr "_Minsta storlek:"
-
-#~ msgid "A problem occurred while loading %s"
-#~ msgstr "Ett problem inträffade vid inläsning av %s"
-
-#~ msgid "Failed to read latest migration marker, aborting profile migration."
-#~ msgstr ""
-#~ "Misslyckades med att läsa senaste migreringsmarkeringen, avbryter "
-#~ "profilmigreringen."
-
-#~ msgid ""
-#~ "A list of protocols to be considered safe in addition to the default, "
-#~ "when disable_unsafe_protocols is enabled."
-#~ msgstr ""
-#~ "En lista med protokoll som kan betraktas som säkra förutom "
-#~ "standardalternativet, då disable_unsafe_protocols är aktiverat."
-
-#~ msgid "Additional safe protocols"
-#~ msgstr "Ytterligare säkra protokoll"
-
-#~ msgid "Disable JavaScript chrome control"
-#~ msgstr "Inaktivera JavaScript-kromstyrning"
-
-#~ msgid "Disable JavaScript's control over window chrome."
-#~ msgstr "Inaktivera JavaScripts kontroll över fönsterkrom."
-
-#~ msgid ""
-#~ "Disable all historical information by disabling back and forward "
-#~ "navigation, not allowing the history dialog and hiding the most used "
-#~ "bookmarks list."
-#~ msgstr ""
-#~ "Inaktivera all historisk information genom att inaktivera bakåt- och "
-#~ "framåtnavigeringen, inte tillåta historikdialogen och dölja listan över "
-#~ "mest använda bokmärken."
-
-#~ msgid "Disable arbitrary URLs"
-#~ msgstr "Inaktivera godtyckliga URL:er"
-
-#~ msgid "Disable bookmark editing"
-#~ msgstr "Inaktivera bokmärkesredigering"
-
-#~ msgid "Disable history"
-#~ msgstr "Inaktivera historik"
-
-#~ msgid "Disable the user's ability to add or edit bookmarks."
-#~ msgstr ""
-#~ "Inaktivera användarens förmåga att lägga till eller redigera bokmärken."
-
-#~ msgid "Disable the user's ability to edit toolbars."
-#~ msgstr "Inaktivera användarens förmåga att redigera sina verktygsrader."
-
-#~ msgid "Disable the user's ability to type in a URL to Epiphany."
-#~ msgstr "Inaktivera användarens förmåga att skriva in en URL i Epiphany."
-
-#~ msgid "Disable toolbar editing"
-#~ msgstr "Inaktivera verktygsradsredigering"
-
-#~ msgid "Disable unsafe protocols"
-#~ msgstr "Inaktivera osäkra protokoll"
-
-#~ msgid ""
-#~ "Disables loading of content from unsafe protocols. Safe protocols are "
-#~ "http and https."
-#~ msgstr ""
-#~ "Inaktiverar inläsning av innehåll från osäkra protokoll. Säkra protokoll "
-#~ "är http och https."
-
-#~ msgid "Epiphany cannot quit"
-#~ msgstr "Epiphany kan inte avsluta"
-
-#~ msgid "Hide menubar by default"
-#~ msgstr "Dölj menyrad som standard"
-
-#~ msgid "Hide the menubar by default."
-#~ msgstr "Dölj menyraden som standard."
-
-#~ msgid "Lock in fullscreen mode"
-#~ msgstr "Lås i helskärmsläge"
-
-#~ msgid "Locks Epiphany in fullscreen mode."
-#~ msgstr "Låser Epiphany i helskärmsläge."
-
-#~ msgid "User is not allowed to close Epiphany"
-#~ msgstr "Användaren tillåts inte stänga Epiphany"
-
-#~ msgid "Address of the user's home page."
-#~ msgstr "Adress till användarens hemsida."
-
-#~ msgid "Allow popups"
-#~ msgstr "Tillåt popupfönster"
-
-#~ msgid ""
-#~ "Allow sites to open new windows using JavaScript (if JavaScript is "
-#~ "enabled)."
-#~ msgstr ""
-#~ "Tillåt webbplatser att öppna nya fönster med hjälp av JavaScript (om "
-#~ "JavaScript är aktiverat)."
-
-#~ msgid "Always show the tab bar"
-#~ msgstr "Visa alltid flikraden"
-
-#~ msgid "Automatic downloads"
-#~ msgstr "Automatiska hämtningar"
-
-#~ msgid "Automatically manage offline status with NetworkManager"
-#~ msgstr "Hantera automatiskt frånkopplad status med NetworkManager"
-
-#~ msgid "Browse with caret"
-#~ msgstr "Navigera med markör"
-
-#~ msgid "Cookie accept"
-#~ msgstr "Accepterande av kakor"
-
-#~ msgid "Default encoding"
-#~ msgstr "Standardkodning"
-
-#~ msgid ""
-#~ "Default encoding. Accepted values are: \"armscii-8\", \"Big5\", \"Big5-"
-#~ "HKSCS\", \"EUC-JP\", \"EUC-KR\", \"gb18030\", \"GB2312\", \"geostd8\", "
-#~ "\"HZ-GB-2312\", \"IBM850\", \"IBM852\", \"IBM855\", \"IBM857\", "
-#~ "\"IBM862\", \"IBM864\", \"IBM866\", \"ISO-2022-CN\", \"ISO-2022-JP\", "
-#~ "\"ISO-2022-KR\", \"ISO-8859-1\", \"ISO-8859-2\", \"ISO-8859-3\", "
-#~ "\"ISO-8859-4\", \"ISO-8859-5\", \"ISO-8859-6\", \"ISO-8859-7\", "
-#~ "\"ISO-8859-8\", \"ISO-8859-8-I\", \"ISO-8859-9\", \"ISO-8859-10\", "
-#~ "\"ISO-8859-11\", \"ISO-8859-13\", \"ISO-8859-14\", \"ISO-8859-15\", "
-#~ "\"ISO-8859-16\", \"ISO-IR-111\", \"KOI8-R\", \"KOI8-U\", \"Shift_JIS\", "
-#~ "\"TIS-620\", \"UTF-7\", \"UTF-8\", \"VISCII\", \"windows-874\", "
-#~ "\"windows-1250\", \"windows-1251\", \"windows-1252\", \"windows-1253\", "
-#~ "\"windows-1254\", \"windows-1255\", \"windows-1256\", \"windows-1257\", "
-#~ "\"windows-1258\", \"x-euc-tw\", \"x-gbk\", \"x-johab\", \"x-mac-arabic\", "
-#~ "\"x-mac-ce\", \"x-mac-croatian\", \"x-mac-cyrillic\", \"x-mac-devanagari"
-#~ "\", \"x-mac-farsi\", \"x-mac-greek\", \"x-mac-gujarati\", \"x-mac-gurmukhi"
-#~ "\", \"x-mac-hebrew\", \"x-mac-icelandic\", \"x-mac-roman\", \"x-mac-"
-#~ "romanian\", \"x-mac-turkish\", \"x-mac-ukrainian\", \"x-user-defined\", "
-#~ "\"x-viet-tcvn5712\", \"x-viet-vps\" and \"x-windows-949\"."
-#~ msgstr ""
-#~ "Standardkodning. Accepterade värden är: \"armscii-8\", \"Big5\", \"Big5-"
-#~ "HKSCS\", \"EUC-JP\", \"EUC-KR\", \"gb18030\", \"GB2312\", \"geostd8\", "
-#~ "\"HZ-GB-2312\", \"IBM850\", \"IBM852\", \"IBM855\", \"IBM857\", "
-#~ "\"IBM862\", \"IBM864\", \"IBM866\", \"ISO-2022-CN\", \"ISO-2022-JP\", "
-#~ "\"ISO-2022-KR\", \"ISO-8859-1\", \"ISO-8859-2\", \"ISO-8859-3\", "
-#~ "\"ISO-8859-4\", \"ISO-8859-5\", \"ISO-8859-6\", \"ISO-8859-7\", "
-#~ "\"ISO-8859-8\", \"ISO-8859-8-I\", \"ISO-8859-9\", \"ISO-8859-10\", "
-#~ "\"ISO-8859-11\", \"ISO-8859-13\", \"ISO-8859-14\", \"ISO-8859-15\", "
-#~ "\"ISO-8859-16\", \"ISO-IR-111\", \"KOI8-R\", \"KOI8-U\", \"Shift_JIS\", "
-#~ "\"TIS-620\", \"UTF-7\", \"UTF-8\", \"VISCII\", \"windows-874\", "
-#~ "\"windows-1250\", \"windows-1251\", \"windows-1252\", \"windows-1253\", "
-#~ "\"windows-1254\", \"windows-1255\", \"windows-1256\", \"windows-1257\", "
-#~ "\"windows-1258\", \"x-euc-tw\", \"x-gbk\", \"x-johab\", \"x-mac-arabic\", "
-#~ "\"x-mac-ce\", \"x-mac-croatian\", \"x-mac-cyrillic\", \"x-mac-devanagari"
-#~ "\", \"x-mac-farsi\", \"x-mac-greek\", \"x-mac-gujarati\", \"x-mac-gurmukhi"
-#~ "\", \"x-mac-hebrew\", \"x-mac-icelandic\", \"x-mac-roman\", \"x-mac-"
-#~ "romanian\", \"x-mac-turkish\", \"x-mac-ukrainian\", \"x-user-defined\", "
-#~ "\"x-viet-tcvn5712\", \"x-viet-vps\" och \"x-windows-949\"."
-
-#~ msgid "Enable JavaScript"
-#~ msgstr "Använd JavaScript"
-
-#~ msgid "Enable Web Inspector"
-#~ msgstr "Aktivera webbinspektör"
-
-#~ msgid "Enable smooth scrolling"
-#~ msgstr "Aktivera mjuk rullning"
-
-#~ msgid ""
-#~ "Force new window requests to be opened in tabs instead of using a new "
-#~ "window."
-#~ msgstr ""
-#~ "Tvinga ny fönsterbegäran att öppnas i flik istället för att använda nytt "
-#~ "fönster."
-
-#~ msgid "Force new windows to be opened in tabs"
-#~ msgstr "Tvinga nya fönster att öppnas i flikar."
-
-#~ msgid ""
-#~ "Hide or show the downloads window. When hidden, a notification will be "
-#~ "shown when new downloads are started."
-#~ msgstr ""
-#~ "Dölj eller visa hämtningsfönstret. När dolt kommer en notifiering att "
-#~ "visas när nya hämtningar startas."
-
-#~ msgid "History pages time range"
-#~ msgstr "Tidsintervall för historiksidor"
-
-#~ msgid ""
-#~ "How to present animated images. Possible values are \"normal\", \"once\" "
-#~ "and \"disabled\"."
-#~ msgstr ""
-#~ "Hur animerade bilder ska presenteras. Möjliga värden är \"normal\", \"once"
-#~ "\" och \"disabled\"."
-
-#~ msgid "How to print frames"
-#~ msgstr "Hur ramar ska skrivas ut"
-
-#~ msgid ""
-#~ "How to print pages containing frames. Allowed values are \"normal\", "
-#~ "\"separately\" and \"selected\"."
-#~ msgstr ""
-#~ "Hur sidor som innehåller ramar ska skrivas ut. Tillåtna värden är \"normal"
-#~ "\", \"separately\" och \"selected\"."
-
-#~ msgid "ISO-8859-1"
-#~ msgstr "ISO-8859-1"
-
-#~ msgid "Image animation mode"
-#~ msgstr "Bildanimeringsläge"
-
-#~ msgid "Lists the active extensions."
-#~ msgstr "Listar de aktiva tilläggen."
-
-#~ msgid ""
-#~ "Middle click to open the web page pointed to by the currently selected "
-#~ "text"
-#~ msgstr ""
-#~ "Mittklick för att öppna webbsidan som pekas till av den för tillfället "
-#~ "markerade texten"
-
-#~ msgid ""
-#~ "Middle clicking on the main view pane will open the web page pointed to "
-#~ "by the currently selected text."
-#~ msgstr ""
-#~ "Mittklick på huvudvisningsytan kommer att öppna den webbsida som pekas "
-#~ "till av den för tillfället markerade texten."
-
-#~ msgid "Preferred languages, two letter codes."
-#~ msgstr "Föredragna språk, tvåbokstavskoder."
-
-#~ msgid "Remember passwords"
-#~ msgstr "Kom ihåg lösenord"
-
-#~ msgid "Search string for keywords entered in the URL bar."
-#~ msgstr "Söksträng för nyckelord angivna i adressfältet."
-
-#~ msgid "Show bookmarks bar by default"
-#~ msgstr "Visa bokmärkesrad som standard"
-
-#~ msgid "Show statusbar by default"
-#~ msgstr "Visa statusrad som standard"
-
-#~ msgid ""
-#~ "Show the history pages visited \"ever\", \"last_two_days\", "
-#~ "\"last_three_days\", \"today\"."
-#~ msgstr ""
-#~ "Visa historiksidorna som besökts \"ever\" (alltid), \"last_two_days"
-#~ "\" (senaste två dagarna), \"last_three_days\" (senaste tre dagarna), "
-#~ "\"today\" (idag)."
-
-#~ msgid "Show the tab bar also when there is only one tab open."
-#~ msgstr "Visa flikraden även när endast en flik är öppen."
-
-#~ msgid "Show toolbars by default"
-#~ msgstr "Visa verktygsrader som standard"
-
-#~ msgid "Size of disk cache"
-#~ msgstr "Storlek på diskcache"
-
-#~ msgid "Size of disk cache, in MB."
-#~ msgstr "Storlek på diskcache, i MB."
-
-#~ msgid ""
-#~ "String that will be used as user agent, to identify the browser to the "
-#~ "web servers."
-#~ msgstr ""
-#~ "Sträng som ska användas som användaragent för att identifiera webbläsaren "
-#~ "till webbservrarna."
-
-#~ msgid "The bookmark information shown in the editor view"
-#~ msgstr "Bokmärkesinformationen som visas i redigerarvyn"
-
-#~ msgid ""
-#~ "The bookmark information shown in the editor view. Valid values in the "
-#~ "list are \"address\" and \"title\"."
-#~ msgstr ""
-#~ "Bokmärkesinformationen som visas i redigerarvyn. Giltiga värden i listan "
-#~ "är \"address\" och \"title\"."
-
-#~ msgid "The currently selected fonts language"
-#~ msgstr "Språket för det för tillfället valda typsnittet"
-
-#~ msgid ""
-#~ "The currently selected fonts language. Valid values are \"ar\" (arabic), "
-#~ "\"x-baltic\" (baltic languages), \"x-central-euro\" (central european "
-#~ "languages), \"x-cyrillic\" (languages written with cyrillic alphabet), "
-#~ "\"el\" (greek), \"he\" (hebrew), \"ja\" (japanese), \"ko\" (korean), \"zh-"
-#~ "CN\" (simplified chinese), \"th\" (thai), \"zh-TW\" (traditional "
-#~ "chinese), \"tr\" (turkish), \"x-unicode\" (other languages), \"x-western"
-#~ "\" (languages written in latin script), \"x-tamil\" (tamil) and \"x-"
-#~ "devanagari\" (devanagari)."
-#~ msgstr ""
-#~ "Språket för det för tillfället valda typsnittet. Giltiga värden är \"ar"
-#~ "\" (arabiska), \"x-baltic\" (baltiska språk), \"x-central-euro"
-#~ "\" (centraleuropeiska språk), \"x-cyrillic\" (språk som skrivs med "
-#~ "kyrilliskt alfabet), \"el\" (grekiska), \"he\" (hebreiska), \"ja"
-#~ "\" (japanska), \"ko\" (koreanska), \"zh-CN\" (förenklad kinesiska), \"th"
-#~ "\" (thailändska), \"zh-TW\" (traditionell kinesiska), \"tr\" (turkiska), "
-#~ "\"x-unicode\" (andra språk), \"x-western\" (språk som skrivs med latinskt "
-#~ "skript), \"x-tamil\" (tamil) och \"x-devanagari\" (devanagari)."
-
-#~ msgid "The downloads folder"
-#~ msgstr "Hämtningsmappen"
-
-#~ msgid "The page information shown in the history view"
-#~ msgstr "Sidinformationen som visas i historikvyn"
-
-#~ msgid ""
-#~ "The page information shown in the history view. Valid values in the list "
-#~ "are \"ViewTitle\", \"ViewAddress\" and \"ViewDateTime\"."
-#~ msgstr ""
-#~ "Sidinformationen som visas i historikvyn. Giltiga värden i listan är "
-#~ "\"ViewTitle\", \"ViewAddress\" och \"ViewDateTime\"."
-
-#~ 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."
-#~ msgstr ""
-#~ "Sökvägen till mappen som filer ska hämtas till, eller \"Downloads\" för "
-#~ "att använda standardhämtningsmappen, eller \"Desktop\" för att använda "
-#~ "skrivbordsmappen."
-
-#~ msgid "Toolbar style"
-#~ msgstr "Stil på verktygsrad"
-
-#~ msgid ""
-#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both"
-#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and "
-#~ "\"text\"."
-#~ msgstr ""
-#~ "Stil på verktygsraden. Tillåtna värden är \"\" (använd standardstilen i "
-#~ "GNOME), \"both\" (både text och ikoner), \"both-horiz\" (text bredvid "
-#~ "ikoner), \"icons\" och \"text\"."
-
-#~ msgid "URL Search"
-#~ msgstr "URL-sökning"
-
-#~ msgid "Use own colors"
-#~ msgstr "Använd egna färger"
-
-#~ msgid "Use your own colors instead of the colors the page requests."
-#~ msgstr "Använd dina egna färger istället för de färger som sidan begär."
-
-#~ msgid "Use your own fonts instead of the fonts the page requests."
-#~ msgstr "Använd dina egna typsnitt istället för de typsnitt som sidan begär."
-
-#~ msgid "User agent"
-#~ msgstr "Användaragent"
-
-#~ msgid "Visibility of the downloads window"
-#~ msgstr "Synlighet för hämtningsfönstret"
-
-#~ msgid ""
-#~ "When files cannot be opened by the browser they are automatically "
-#~ "downloaded to the download folder and opened with the appropriate "
-#~ "application."
-#~ msgstr ""
-#~ "När filer inte kan öppnas av webbläsaren hämtas de automatiskt till "
-#~ "hämtningskatalogen och öppnas med lämpligt program."
-
-#~ msgid ""
-#~ "Where to accept cookies from. Possible values are \"anywhere\", \"current "
-#~ "site\" and \"nowhere\"."
-#~ msgstr ""
-#~ "Var kakor ska accepteras ifrån. Möjliga värden är \"anywhere"
-#~ "\" (varsomhelst), \"current site\" (aktuell server) och \"nowhere"
-#~ "\" (ingenstans ifrån)."
-
-#~ msgid "Whether to print the background color"
-#~ msgstr "Huruvida bakgrundfärgen ska skrivas ut"
-
-#~ msgid "Whether to print the background images"
-#~ msgstr "Huruvida bakgrundsbilder ska skrivas ut"
-
-#~ msgid "Whether to print the date in the footer"
-#~ msgstr "Huruvida datumet ska skrivas ut i sidfoten"
-
-#~ msgid "Whether to print the page address in the header"
-#~ msgstr "Huruvida sidans adress ska skrivas ut i sidhuvudet"
-
-#~ msgid "Whether to print the page numbers (x of total) in the footer"
-#~ msgstr "Huruvida sidnumren (x av totalt) ska skrivas ut i sidfoten"
-
-#~ msgid "Whether to print the page title in the header"
-#~ msgstr "Huruvida sidans titel ska skrivas ut i sidhuvudet"
-
-#~ msgid "Whether to store and prefill passwords in web sites."
-#~ msgstr "Huruvida lösenord ska lagras och på förhand matas in på webbsidor."
-
-#~ msgid "x-western"
-#~ msgstr "x-western"
-
-#~ msgid "<b>Web Development</b>"
-#~ msgstr "<b>Webbutveckling</b>"
-
-#~ msgid "The file “%s” has been downloaded."
-#~ msgstr "Filen \"%s\" har hämtats."
-
-#~ msgid "Download finished"
-#~ msgstr "Hämtningen är färdig"
-
-#~ msgid "The file “%s” has been added to the downloads queue."
-#~ msgstr "Filen \"%s\" har lagts till i hämtningskön."
-
-#~ msgid "Download started"
-#~ msgstr "Hämtningen har startats"
-
-#~ msgid ""
-#~ "GConf error:\n"
-#~ "  %s"
-#~ msgstr ""
-#~ "GConf-fel:\n"
-#~ "  %s"
-
-#~ msgid "Show only the title column"
-#~ msgstr "Visa endast titelkolumnen"
-
-#~ msgid "T_itle and Address"
-#~ msgstr "T_itel och adress"
-
-#~ msgid "Show both the title and address columns"
-#~ msgstr "Visa både titel- och adresskolumnerna"
-
-#~ msgid "Default font type"
-#~ msgstr "Standardtypsnittstyp"
-
-#~ msgid "Default font type. Possible values are \"serif\" and \"sans-serif\"."
-#~ msgstr ""
-#~ "Standardtypsnittstyp. Möjliga värden är \"serif\" och \"sans-serif\"."
-
-#~ msgid "Use s_mooth scrolling"
-#~ msgstr "Aktivera _mjuk rullning"
-
-#~ msgid "_Save As..."
-#~ msgstr "Spara so_m..."
-
-#~ msgid "Redirecting to “%s”…"
-#~ msgstr "Omdirigerar till \"%s\"..."
-
-#~ msgid "Transferring data from “%s”…"
-#~ msgstr "Överför data från \"%s\"..."
-
-#~ msgid "Waiting for authorization from “%s”…"
-#~ msgstr "Väntar på auktorisering från \"%s\"..."
-
-#~ msgid ""
-#~ "Epiphany appears to have exited unexpectedly the last time it was run. "
-#~ "You can recover the opened windows and tabs."
-#~ msgstr ""
-#~ "Epiphany verkar ha avslutats oväntat den senaste gången det kördes. Du "
-#~ "kan återställa de öppnade fönstren och flikarna."
-
-#~ msgid "Crash Recovery"
-#~ msgstr "Kraschåterställning"
-
-#~ msgid "Sidebar extension required"
-#~ msgstr "Sidopanelstillägg krävs"
-
-#~ msgid "Sidebar Extension Required"
-#~ msgstr "Sidopanelstillägg krävs"
-
-#~ msgid "The link you clicked needs the sidebar extension to be installed."
-#~ msgstr ""
-#~ "Den länk du klickade på kräver att sidopanelstillägget är installerat."
-
-#~ msgid "Caret"
-#~ msgstr "Markör"
-
-#~ msgid "In keyboard selection mode, press F7 to exit"
-#~ msgstr "I läget för tangentbordsval, tryck F7 för att avsluta"
-
-#~ msgid "St_atusbar"
-#~ msgstr "St_atusrad"
-
-#~ msgid "Show or hide statusbar"
-#~ msgstr "Visa eller dölj statusrad"
-
-#~ msgid "%d hidden popup window"
-
-#~ msgid_plural "%d hidden popup windows"
-#~ msgstr[0] "%d dolt popupfönster"
-#~ msgstr[1] "%d dolda popupfönster"
-
-#~ msgid "First"
-#~ msgstr "Första"
-
-#~ msgid "Go to the first page"
-#~ msgstr "Gå till första sidan"
-
-#~ msgid "Last"
-#~ msgstr "Sista"
-
-#~ msgid "Go to the last page"
-#~ msgstr "Gå till sista sidan"
-
-#~ msgid "Previous"
-#~ msgstr "Föregående"
-
-#~ msgid "Go to the previous page"
-#~ msgstr "Gå till föregående sida"
-
-#~ msgid "Next"
-#~ msgstr "Nästa"
-
-#~ msgid "Go to next page"
-#~ msgstr "Gå till nästa sida"
-
-#~ msgid "Close"
-#~ msgstr "Stäng"
-
-#~ msgid "Close print preview"
-#~ msgstr "Stäng förhandsgranskning"
-
-#~ msgid "Enable _Java"
-#~ msgstr "Använd _Java"
-
-#~ msgid "_Username:"
-#~ msgstr "_Användarnamn:"
-
-#~ msgid "_Domain:"
-#~ msgstr "_Domän:"
-
-#~ msgid "_New password:"
-#~ msgstr "_Nytt lösenord:"
-
-#~ msgid "Con_firm password:"
-#~ msgstr "_Bekräfta lösenord:"
-
-#~ msgid "Password quality:"
-#~ msgstr "Lösenordskvalitet:"
-
-#~ msgid "Do not remember this password"
-#~ msgstr "Kom inte ihåg detta lösenord"
-
-#~ msgid "_Remember password for this session"
-#~ msgstr "_Kom ihåg lösenordet för denna session"
-
-#~ msgid "Save password in _keyring"
-#~ msgstr "Spara lösenord i _nyckelring"
-
-#~ msgid "The encoding autodetector. Empty string means autodetect is off"
-#~ msgstr ""
-#~ "Autodetekteraren för kodning. Tom sträng betyder att automatisk "
-#~ "detektering är av"
-
-#~ msgid ""
-#~ "The encoding autodetector. Valid entries are \"\" (autodetectors off), "
-#~ "\"cjk_parallel_state_machine\" (autodetect east asian encodings), "
-#~ "\"ja_parallel_state_machine\" (autodetect japanese encodings), "
-#~ "\"ko_parallel_state_machine\" (autodetect korean encodings), \"ruprob"
-#~ "\" (autodetect russian encodings), \"ukprob\" (autodetect ukrainian "
-#~ "encodings), \"zh_parallel_state_machine\" (autodetect chinese encodings), "
-#~ "\"zhcn_parallel_state_machine\" (autodetect simplified chinese "
-#~ "encodings), \"zhtw_parallel_state_machine\" (autodetect traditional "
-#~ "chinese encodings) and \"universal_charset_detector\" (autodetect most "
-#~ "encodings)."
-#~ msgstr ""
-#~ "Autodetekteraren för teckenkodning. Giltiga poster är "
-#~ "\"\" (autodetektorer av), \"cjk_parallel_state_machine\" (detektera "
-#~ "automatiskt östasiatiska teckenkodningar), \"ja_parallel_state_machine"
-#~ "\" (detektera automatiskt japanska teckenkodningar), "
-#~ "\"ko_parallel_state_machine\" (detektera automatiskt koreanska "
-#~ "teckenkodningar), \"ruprob\" (detektera automatiskt ryska "
-#~ "teckenkodningar), \"ukprob\" (detektera automatiskt ukrainska "
-#~ "teckenkodningar), \"zh_parallel_state_machine\" (detektera automatiskt "
-#~ "kinesiska teckenkodningar), \"zhcn_parallel_state_machine\" (detektera "
-#~ "automatiskt teckenkodningar för förenklad kinesiska), "
-#~ "\"zhtw_parallel_state_machine\" (detektera automatiskt teckenkodningar "
-#~ "för traditionell kinesiska) och \"universal_charset_detector\" (detektera "
-#~ "automatiskt alla teckenkodningar)."
-
-#~ msgid "Au_todetect:"
-#~ msgstr "_Upptäck automatiskt:"
-
-#~ msgid "download status|Unknown"
-#~ msgstr "Okänd"
-
-#~ msgid "download status|Failed"
-#~ msgstr "Misslyckades"
-
-#~ msgid "autodetectors|Off"
-#~ msgstr "Av"
-
-#~ msgid "automatically detect ... character encodings|Chinese"
-#~ msgstr "Kinesiska"
-
-#~ msgid "automatically detect ... character encodings|Simplified Chinese"
-#~ msgstr "Förenklad kinesiska"
-
-#~ msgid "automatically detect ... character encodings|Traditional Chinese"
-#~ msgstr "Traditionell kinesiska"
-
-#~ msgid "automatically detect ... character encodings|East Asian"
-#~ msgstr "Östasiatiska"
-
-#~ msgid "automatically detect ... character encodings|Japanese"
-#~ msgstr "Japanska"
-
-#~ msgid "automatically detect ... character encodings|Korean"
-#~ msgstr "Koreanska"
-
-#~ msgid "automatically detect ... character encodings|Russian"
-#~ msgstr "Ryska"
-
-#~ msgid "automatically detect ... character encodings|Universal"
-#~ msgstr "Universell"
-
-#~ msgid "automatically detect ... character encodings|Ukrainian"
-#~ msgstr "Ukrainska"
-
-#~ msgid "select fonts for|Arabic"
-#~ msgstr "arabiska"
-
-#~ msgid "select fonts for|Baltic"
-#~ msgstr "baltiska"
-
-#~ msgid "select fonts for|Central European"
-#~ msgstr "centraleuropeiska"
-
-#~ msgid "select fonts for|Cyrillic"
-#~ msgstr "kyrilliska"
-
-#~ msgid "select fonts for|Devanagari"
-#~ msgstr "devanagari"
-
-#~ msgid "select fonts for|Greek"
-#~ msgstr "grekiska"
-
-#~ msgid "select fonts for|Hebrew"
-#~ msgstr "hebreiska"
-
-#~ msgid "select fonts for|Japanese"
-#~ msgstr "japanska"
-
-#~ msgid "select fonts for|Korean"
-#~ msgstr "koreanska"
-
-#~ msgid "select fonts for|Simplified Chinese"
-#~ msgstr "förenklad kinesiska"
-
-#~ msgid "select fonts for|Tamil"
-#~ msgstr "tamilska"
-
-#~ msgid "select fonts for|Thai"
-#~ msgstr "thailändska"
-
-#~ msgid "select fonts for|Traditional Chinese"
-#~ msgstr "traditionell kinesiska"
-
-#~ msgid "select fonts for|Traditional Chinese (Hong Kong)"
-#~ msgstr "traditionell kinesiska (Hong Kong)"
-
-#~ msgid "select fonts for|Turkish"
-#~ msgstr "turkiska"
 
-#~ msgid "select fonts for|Armenian"
-#~ msgstr "armeniska"
+#~ msgid "Web Inspector"
+#~ msgstr "Webbinspektör"
 
-#~ msgid "select fonts for|Bengali"
-#~ msgstr "bengali"
+#~ msgid "Epiphany can't be used now. Initialization failed."
+#~ msgstr "Epiphany kan inte användas nu. Initiering misslyckades."
diff --git a/src/ephy-title-box.c b/src/ephy-title-box.c
index d08c5a8..821b16c 100644
--- a/src/ephy-title-box.c
+++ b/src/ephy-title-box.c
@@ -62,8 +62,6 @@ typedef struct
   guint location_disabled;
   guint button_down : 1;
   guint switch_to_entry_timeout_id;
-
-  gulong title_sig_id;
 } EphyTitleBoxPrivate;
 
 G_DEFINE_TYPE_WITH_PRIVATE (EphyTitleBox, ephy_title_box, GTK_TYPE_STACK)
@@ -516,6 +514,36 @@ ephy_title_box_new (EphyWindow *window)
                        NULL);
 }
 
+static void
+ephy_title_box_title_binding_destroyed_cb (gpointer data)
+{
+  EphyTitleBox        *title_box;
+  EphyTitleBoxPrivate *priv;
+
+  title_box = EPHY_TITLE_BOX (data);
+  priv = ephy_title_box_get_instance_private (title_box);
+
+  LOG ("title_binding_destroyed_cb title_box %p", title_box);
+
+  /* Indicate that we do not need to unbind this binding */
+  priv->title_binding = NULL;
+}
+
+static void
+ephy_title_box_uri_binding_destroyed_cb (gpointer data)
+{
+  EphyTitleBox        *title_box;
+  EphyTitleBoxPrivate *priv;
+
+  title_box = EPHY_TITLE_BOX (data);
+  priv = ephy_title_box_get_instance_private (title_box);
+
+  LOG ("uri_binding_destroyed_cb title_box %p", title_box);
+
+  /* Indicate that we do not need to unbind this binding */
+  priv->uri_binding = NULL;
+}
+
 /**
  * ephy_title_box_set_web_view:
  * @title_box: an #EphyTitleBox
@@ -546,11 +574,14 @@ ephy_title_box_set_web_view (EphyTitleBox  *title_box,
     g_signal_handlers_disconnect_by_func (priv->web_view,
                                           G_CALLBACK (ephy_title_box_view_focus_in_cb),
                                           title_box);
-    if (priv->title_sig_id > 0)
-      g_signal_handler_disconnect (priv->web_view, priv->title_sig_id);
+    g_signal_handlers_disconnect_by_func (priv->web_view,
+                                          G_CALLBACK (ephy_title_box_title_changed_cb),
+                                          title_box);
 
-    g_clear_object (&priv->title_binding);
-    g_clear_object (&priv->uri_binding);
+    if (priv->title_binding != NULL)
+      g_clear_object (&priv->title_binding);
+    if (priv->uri_binding != NULL)
+      g_clear_object (&priv->uri_binding);
 
     g_object_unref (priv->web_view);
   }
@@ -567,19 +598,20 @@ ephy_title_box_set_web_view (EphyTitleBox  *title_box,
   ephy_title_box_set_mode (title_box, title && *title != '\0' ?
                                       EPHY_TITLE_BOX_MODE_TITLE : EPHY_TITLE_BOX_MODE_LOCATION_ENTRY);
 
-  priv->title_binding = g_object_bind_property (priv->web_view, "title",
-                                                priv->title, "label",
-                                                G_BINDING_SYNC_CREATE);
+  priv->title_binding = g_object_bind_property_full (priv->web_view, "title",
+                                                     priv->title, "label",
+                                                     G_BINDING_SYNC_CREATE,
+                                                     NULL, NULL,
+                                                     title_box, ephy_title_box_title_binding_destroyed_cb);
 
   priv->uri_binding = g_object_bind_property_full (priv->web_view, "uri",
                                                    priv->uri, "label",
                                                    G_BINDING_SYNC_CREATE,
-                                                   ephy_title_box_transform_uri_to_label,
-                                                   NULL, NULL, NULL);
+                                                   ephy_title_box_transform_uri_to_label, NULL,
+                                                   title_box, ephy_title_box_uri_binding_destroyed_cb);
 
-  priv->title_sig_id = g_signal_connect (priv->web_view, "notify::title",
-                                         G_CALLBACK (ephy_title_box_title_changed_cb),
-                                         title_box);
+  g_signal_connect (priv->web_view, "notify::title",
+                    G_CALLBACK (ephy_title_box_title_changed_cb), title_box);
   g_signal_connect (priv->entry, "key-press-event",
                     G_CALLBACK (ephy_title_box_entry_key_press_cb), title_box);
   g_signal_connect (priv->web_view, "focus-in-event",
diff --git a/tests/ephy-uri-helpers-test.c b/tests/ephy-uri-helpers-test.c
index b17334b..0052671 100644
--- a/tests/ephy-uri-helpers-test.c
+++ b/tests/ephy-uri-helpers-test.c
@@ -47,6 +47,13 @@ test_ephy_uri_helpers_remove_tracking (void)
     /* https://bugzilla.gnome.org/show_bug.cgi?id=724724 */
     { "http://git.savannah.gnu.org/gitweb/?p=grep.git;a=commit;h=97318f5e59a1ef6feb8a378434a00932a3fc1e0b",
       "http://git.savannah.gnu.org/gitweb/?p=grep.git;a=commit;h=97318f5e59a1ef6feb8a378434a00932a3fc1e0b"},
+    /* https://bugzilla.gnome.org/show_bug.cgi?id=730464 */
+    { "https://mail.google.com/mail/u/0/?ui=2&ik=37373eb942&rid=7cea..&auto=1&view=lno&_reqid=1168127&pcd=1&mb=0&rt=j",
+      "https://mail.google.com/mail/u/0/?ui=2&ik=37373eb942&rid=7cea..&auto=1&view=lno&_reqid=1168127&pcd=1&mb=0&rt=j" },
+    { "http://www.test.com/?utm_source=feedburner&view=lno&_reqid=1234", "http://www.test.com/?view=lno&_reqid=1234" },
+    { "http://www.test.com/?some&valid&query", "http://www.test.com/?some&valid&query" },
+    { "http://www.test.com/?utm_source=feedburner&some&valid&query", "http://www.test.com/?some&valid&query" },
+
   };
   guint i;