[epiphany] Finnish translation update by Jiri Grönroos

[Ville-Pekka Vainio <vpv src gnome org>]

commit 64877a204a726f8847d9ca97f3f2732fc36ed7b5
Author: Ville-Pekka Vainio <vpvainio iki fi>
Date:   Sun Mar 16 20:32:26 2014 +0200

    Finnish translation update by Jiri Grönroos

 po/fi.po | 1391 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 744 insertions(+), 647 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 82ee17d..706040a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,15 +9,15 @@
 # Ilkka Tuohela <hile iki fi>, 2005-2009.
 # Timo Jyrinki <timo jyrinki iki fi>, 2008.
 # Tommi Vainikainen <thv iki fi>, 2009-2011, 2012.
-# Jiri Grönroos <jiri gronroos+l10n iki fi>, 2012, 2013.
+# Jiri Grönroos <jiri gronroos+l10n iki fi>, 2012, 2013, 2014.
 #
 msgid ""
 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: 2013-12-11 14:25+0000\n"
-"PO-Revision-Date: 2013-12-11 22:02+0200\n"
+"POT-Creation-Date: 2014-03-03 16:39+0000\n"
+"PO-Revision-Date: 2014-03-03 21:37+0200\n"
 "Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
 "Language-Team: suomi <gnome-fi-laatu lists sourceforge net>\n"
 "Language: fi\n"
@@ -41,11 +41,12 @@ msgstr "Etsi internetistä"
 #. duckduckgo must be translated. So, for a Finnish localized
 #. version of duckduckgo that will render results tailored for
 #. Finland, the string would be:
-#. http://duckduckgo.com/?t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI
+#. https://duckduckgo.com/?t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI
 #.
 #: ../data/default-bookmarks.rdf.in.h:13
-msgid "http://duckduckgo.com/?t=epiphany";
-msgstr "http://duckduckgo.com/?t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI";
+#| msgid "http://duckduckgo.com/?t=epiphany";
+msgid "https://duckduckgo.com/?t=epiphany";
+msgstr "https://duckduckgo.com/?t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI";
 
 #. Translators: you can use the regions listed in
 #. https://duckduckgo.com/params to boost a particular region
@@ -55,25 +56,29 @@ msgstr "http://duckduckgo.com/?t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI";
 #. 'kad' parameter can be used to specify the locale in which
 #. duckduckgo must be translated. For such case, the search url
 #. would be
-#. http://duckduckgo.com/?q=%s&amp;t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI
-#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-web-view.c:2086
-#: ../src/ephy-search-provider.c:287
+#. 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://duckduckgo.com/?q=%s&amp;t=epiphany";
-msgstr "http://duckduckgo.com/?q=%s&amp;t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI";
+#| msgid "http://duckduckgo.com/?q=%s&amp;t=epiphany";
+msgid "https://duckduckgo.com/?q=%s&amp;t=epiphany";
+msgstr "https://duckduckgo.com/?q=%s&amp;t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI";
 
 #: ../data/epiphany.appdata.xml.in.h:1
+#| msgid ""
+#| "The web browser for the GNOME desktop, featuring tight integration with "
+#| "the desktop and a simple and intuitive user interface that allows you to "
+#| "focus on your web pages."
 msgid ""
-"The web browser for the GNOME desktop, featuring tight integration with the "
-"desktop and a simple and intuitive user interface that allows you to focus "
-"on your web pages."
+"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 ""
-"Nettiselain Gnome-työpöydälle, jonka minimalistisen käyttöliittymän avulla "
-"pystyt keskittyä sivujen sisältöön."
+"Nettiselain Gnome-työpöydälle, jonka selkeän käyttöliittymän avustuksella "
+"pystyt keskittyä tärkeimpään, eli sivujen sisältöön."
 
-#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:281
-#: ../src/ephy-main.c:67 ../src/ephy-main.c:314 ../src/ephy-main.c:472
-#: ../src/window-commands.c:1594
+#: ../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 "Verkko"
 
@@ -97,29 +102,42 @@ msgstr "web;browser;internet;netti;selain;"
 msgid "Browse with caret"
 msgstr "Selaa kohdistinselaustilassa"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:2
+#. 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 "http://duckduckgo.com/?q=%s&amp;t=epiphany";
+msgid "'https://duckduckgo.com/?q=%s&amp;t=epiphany'"
+msgstr "https://duckduckgo.com/?q=%s&amp;t=epiphany&amp;kl=fi-fi&amp;kad=fi_FI";
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:11
 msgid "URL Search"
 msgstr "URL-haku"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:3
+#: ../data/org.gnome.epiphany.gschema.xml.h:12
 msgid "Search string for keywords entered in the URL bar."
 msgstr ""
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:4
+#: ../data/org.gnome.epiphany.gschema.xml.h:13
 msgid "User agent"
 msgstr "Käyttäjätunniste (user-agent)"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:5
+#: ../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 "Selaimen tunniste, jonka avulla verkkopalvelimet tunnistavat selaimen."
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:6
+#: ../data/org.gnome.epiphany.gschema.xml.h:15
 msgid "Automatic downloads"
 msgstr "Automaattiset lataukset"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:7
+#: ../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."
@@ -127,46 +145,46 @@ msgstr ""
 "Kun selain ei pysty avata tiedostoja, ne ladataan automaattisesti "
 "latauskansioon ja avataan sopivalla sovelluksella."
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:8
+#: ../data/org.gnome.epiphany.gschema.xml.h:17
 msgid "Force new windows to be opened in tabs"
 msgstr "Pakota uudet ikkunat avautumaan välilehtiin"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:9
+#: ../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 ""
 "Pakota uusien ikkunoiden avauspyynnöt avaamaan välilehden uuden ikkunan "
 "sijaan."
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:10
+#: ../data/org.gnome.epiphany.gschema.xml.h:19
 msgid "Remember passwords"
 msgstr "Muista salasanat"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:11
+#: ../data/org.gnome.epiphany.gschema.xml.h:20
 msgid "Whether to store and prefill passwords in web sites."
 msgstr ""
 "Tallennetaanko sivustojen salasanat ja käytetäänkö salasanakenttien "
 "automaattitäyttöä."
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:12
+#: ../data/org.gnome.epiphany.gschema.xml.h:21
 msgid "Automatically manage offline status with NetworkManager"
 msgstr ""
 "Hallitse automaattisesti yhteydetöntä tilaa käyttäen NetworkManagerin "
 "tuottamaa tietoa"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:13
+#: ../data/org.gnome.epiphany.gschema.xml.h:22
 msgid "Enable smooth scrolling"
 msgstr "Käytä tasaista vierityistä"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:14
+#: ../data/org.gnome.epiphany.gschema.xml.h:23
 msgid "Don't use an external application to view page source."
 msgstr "Älä käytä erillistä sovellusta sivujen lähdekoodin katseluun."
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:15
+#: ../data/org.gnome.epiphany.gschema.xml.h:24
 msgid "Whether to automatically restore the last session"
 msgstr "Palautetaanko viimeisin istunto automaattisesti"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:16
+#: ../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), "
@@ -174,7 +192,7 @@ msgid ""
 "'never' (the homepage is always shown)."
 msgstr ""
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:17
+#: ../data/org.gnome.epiphany.gschema.xml.h:26
 msgid ""
 "Whether to delay loading of tabs that are not immediately visible on session "
 "restore"
@@ -182,21 +200,28 @@ msgstr ""
 "Viivästetäänkö niiden välilehtien lataamista, jotka eivät ole välittömästi "
 "nähtävissä istunnon palautuksen jälkeen"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:18
+#: ../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 ""
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:19
-msgid "Show toolbars by default"
-msgstr "Näytä työkalupalkit oletuksena"
+#: ../data/org.gnome.epiphany.gschema.xml.h:28
+msgid "Process model"
+msgstr "Prosessimalli"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:20
+#: ../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 ""
+
+#: ../data/org.gnome.epiphany.gschema.xml.h:30
 msgid "Toolbar style"
 msgstr "Työkalupalkin tyyli"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:21
+#: ../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 "
@@ -206,11 +231,11 @@ msgstr ""
 "\"both\" (teksti ja kuvakkeet), \"both-horiz\" (text kuvakkeiden vieressä), "
 "\"icons\", ja \"text\"."
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:22
+#: ../data/org.gnome.epiphany.gschema.xml.h:32
 msgid "[Deprecated]"
 msgstr "[Vanhennettu]"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:23
+#: ../data/org.gnome.epiphany.gschema.xml.h:33
 msgid ""
 "[Deprecated] This setting is deprecated, use 'tabs-bar-visibility-policy' "
 "instead."
@@ -218,11 +243,11 @@ msgstr ""
 "[Vanhennettu] Tämä asetus on vanhennettu, käytä asetusta 'tabs-bar-"
 "visibility-policy' sen sijaan."
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:24
+#: ../data/org.gnome.epiphany.gschema.xml.h:34
 msgid "Visibility of the downloads window"
 msgstr "Latausikkunan näkyvyys"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:25
+#: ../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."
@@ -230,180 +255,181 @@ msgstr ""
 "Piilota tai näytä latausikkuna. Kun ikkuna on piilotettu, näytetään ilmoitus "
 "aina kun lataus aloitetaan."
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:26
+#: ../data/org.gnome.epiphany.gschema.xml.h:36
 msgid "The visibility policy for the tabs bar."
 msgstr "Välilehtipalkin näkyvyyskäytäntö."
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:27
+#: ../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 ""
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:28
+#: ../data/org.gnome.epiphany.gschema.xml.h:38
 msgid "Minimum font size"
 msgstr "Kirjasimen vähimmäiskoko"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:29
+#: ../data/org.gnome.epiphany.gschema.xml.h:39
 msgid "Use GNOME fonts"
 msgstr "Käytä järjestelmän kirjasimia"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:30
-msgid "Use GNOME desktop wide font configuration."
-msgstr "Käytä Gnome-työpöydän kirjasinasetuksia."
+#: ../data/org.gnome.epiphany.gschema.xml.h:40
+#| msgid "Use GNOME fonts"
+msgid "Use GNOME font settings."
+msgstr "Käytä Gnomen kirjasinasetuksia"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:31
+#: ../data/org.gnome.epiphany.gschema.xml.h:41
 msgid "Custom sans-serif font"
 msgstr "Omavalintainen pääteviivaton kirjasin"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:32
+#: ../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 ""
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:33
+#: ../data/org.gnome.epiphany.gschema.xml.h:43
 msgid "Custom serif font"
 msgstr "Omavalintainen päätteellinen kirjasin"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:34
+#: ../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 ""
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:35
+#: ../data/org.gnome.epiphany.gschema.xml.h:45
 msgid "Custom monospace font"
 msgstr "Omavalintainen tasalevyinen kirjasin"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:36
+#: ../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 ""
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:37
+#: ../data/org.gnome.epiphany.gschema.xml.h:47
 msgid "Use own colors"
 msgstr "Käytä omavalintaisia värejä"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:38
+#: ../data/org.gnome.epiphany.gschema.xml.h:48
 msgid "Use your own colors instead of the colors the page requests."
 msgstr "Käytä omavalintaisia värejä verkkosivuston ehdottamien värien sijaan."
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:39
+#: ../data/org.gnome.epiphany.gschema.xml.h:49
 msgid "Use own fonts"
 msgstr "Käytä omavalintaisia kirjasimia"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:40
+#: ../data/org.gnome.epiphany.gschema.xml.h:50
 msgid "Use your own fonts instead of the fonts the page requests."
 msgstr ""
 "Käytä omavalintaista kirjasinta verkkosivuston ehdottaman kirjasimen sijaan."
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:41
+#: ../data/org.gnome.epiphany.gschema.xml.h:51
 msgid "Use a custom CSS"
 msgstr "Käytä omavalintaisia tyylejä"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:42
+#: ../data/org.gnome.epiphany.gschema.xml.h:52
 msgid "Use a custom CSS file to modify websites own CSS."
 msgstr ""
 "Käytä omavalintaista CSS-tiedostoa verkkosivuston CSS-tiedoston lisäksi."
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:43
+#: ../data/org.gnome.epiphany.gschema.xml.h:53
 msgid "Enable spell checking"
 msgstr "Ota oikoluku käyttöön"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:44
+#: ../data/org.gnome.epiphany.gschema.xml.h:54
 msgid "Spell check any text typed in editable areas."
 msgstr "Oikolue mikä tahansa muokattaville alueille kirjoitettu teksti."
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:45
+#: ../data/org.gnome.epiphany.gschema.xml.h:55
 msgid "Default encoding"
 msgstr "Oletusmerkistö"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:46
+#: ../data/org.gnome.epiphany.gschema.xml.h:56
 msgid ""
 "Default encoding. Accepted values are the ones WebKitGTK+ can understand."
 msgstr ""
 "Oletusmerkistökoodaus. Hyväkstytyt arvot ovat ne, joita WebKitGTK+ ymmärtää."
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:47
+#: ../data/org.gnome.epiphany.gschema.xml.h:57
 msgid "Size of disk cache"
 msgstr "Levyvälimuistin koko"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:48
+#: ../data/org.gnome.epiphany.gschema.xml.h:58
 msgid "Size of disk cache, in MB."
 msgstr "Levyvälimuistin koko megatavuissa."
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:49
-#: ../src/resources/prefs-dialog.ui.h:38
+#: ../data/org.gnome.epiphany.gschema.xml.h:59
+#: ../src/resources/prefs-dialog.ui.h:40
 msgid "Languages"
 msgstr "Kielet"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:50
+#: ../data/org.gnome.epiphany.gschema.xml.h:60
 msgid "Preferred languages, two letter codes."
 msgstr "Ensisijaiset kielet, kaksimerkkiset koodit."
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:51
+#: ../data/org.gnome.epiphany.gschema.xml.h:61
 msgid "Cookie accept"
 msgstr "Evästeiden hyväksyntä"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:52
+#: ../data/org.gnome.epiphany.gschema.xml.h:62
 msgid ""
 "Where to accept cookies from. Possible values are \"anywhere\", \"current "
 "site\" and \"nowhere\"."
 msgstr ""
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:53
+#: ../data/org.gnome.epiphany.gschema.xml.h:63
 msgid "Image animation mode"
 msgstr "Kuvien animointitila"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:54
+#: ../data/org.gnome.epiphany.gschema.xml.h:64
 msgid ""
 "How to present animated images. Possible values are \"normal\", \"once\" and "
 "\"disabled\"."
 msgstr ""
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:55
+#: ../data/org.gnome.epiphany.gschema.xml.h:65
 msgid "Allow popups"
 msgstr "Salli ponnahdusikkunat"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:56
+#: ../data/org.gnome.epiphany.gschema.xml.h:66
 msgid ""
 "Allow sites to open new windows using JavaScript (if JavaScript is enabled)."
 msgstr ""
 "Salli sivustojen avata ponnahdusikkunoita JavaScriptiä käyttäen (jos "
 "JavaScript on sallittu)"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:57
+#: ../data/org.gnome.epiphany.gschema.xml.h:67
 msgid "Enable Plugins"
 msgstr "Käytä liitännäisiä"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:58
+#: ../data/org.gnome.epiphany.gschema.xml.h:68
 msgid "Enable JavaScript"
 msgstr "Käytä JavaScriptiä"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:59
+#: ../data/org.gnome.epiphany.gschema.xml.h:69
 msgid "Enable WebGL"
 msgstr "Käytä WebGL:ää"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:60
+#: ../data/org.gnome.epiphany.gschema.xml.h:70
 msgid "Whether to enable support for WebGL contexts."
 msgstr "Sallitaanko tuki WebGL-sisällölle."
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:61
+#: ../data/org.gnome.epiphany.gschema.xml.h:71
 msgid "Enable WebAudio"
 msgstr "Käytä WebAudiota"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:62
+#: ../data/org.gnome.epiphany.gschema.xml.h:72
 msgid "Whether to enable support for WebAudio."
 msgstr "Onko tuki WebAudiolle käytössä."
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:63
+#: ../data/org.gnome.epiphany.gschema.xml.h:73
 msgid "Do Not Track"
 msgstr "Älä seuraa (DNT)"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:64
+#: ../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."
@@ -411,101 +437,119 @@ msgstr ""
 "Pyydetäänkö verkkosivustoja olemaan seuraamatta selaimen käyttöä. Otatha "
 "huomioon, etteivät sivustot välttämättä noudata tätä pyyntöä."
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:65
+#: ../data/org.gnome.epiphany.gschema.xml.h:75
 msgid "Enable Adblock"
 msgstr "Käytä mainossuodatusta (Adblock)"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:66
+#: ../data/org.gnome.epiphany.gschema.xml.h:76
 msgid ""
 "Whether to block the embedded advertisements that web pages might want to "
 "show."
 msgstr ""
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:67
+#: ../data/org.gnome.epiphany.gschema.xml.h:77
 msgid "The downloads folder"
 msgstr "Latauskansio"
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:68
+#: ../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 ""
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:69
-msgid "History pages time range"
-msgstr ""
-
-#: ../data/org.gnome.epiphany.gschema.xml.h:70
-msgid "Whether to show the title column in the history window."
-msgstr "Näytetäänkö Otsikko-sarake historiaikkunassa."
-
-#: ../data/org.gnome.epiphany.gschema.xml.h:71
-msgid "Whether to show the address column in the history window."
-msgstr "Näytetäänkö Osoite-sarake historiaikkunassa."
-
-#: ../data/org.gnome.epiphany.gschema.xml.h:72
-msgid "Whether to show the date-time column in the history window."
-msgstr "Näytetäänkö Päiväys-sarake kirjanmerkkien ikkunassa."
-
-#: ../data/org.gnome.epiphany.gschema.xml.h:73
+#: ../data/org.gnome.epiphany.gschema.xml.h:79
 msgid "Whether to show the title column in the bookmarks window."
 msgstr "Näytetäänkö Otsikko-sarake kirjanmerkkien ikkunassa."
 
-#: ../data/org.gnome.epiphany.gschema.xml.h:74
+#: ../data/org.gnome.epiphany.gschema.xml.h:80
 msgid "Whether to show the address column in the bookmarks window."
 msgstr "Näytetäänkö Osoite-sarake kirjanmerkkien ikkunassa."
 
-#: ../embed/ephy-about-handler.c:144 ../embed/ephy-about-handler.c:146
+#: ../embed/ephy-about-handler.c:141
 msgid "Installed plugins"
 msgstr "Asennetut liitännäiset"
 
-#: ../embed/ephy-about-handler.c:159
+#: ../embed/ephy-about-handler.c:142
+msgid "Plugins"
+msgstr "Liitännäiset"
+
+#: ../embed/ephy-about-handler.c:145
+msgid "Plugins are disabled in the preferences"
+msgstr ""
+
+#: ../embed/ephy-about-handler.c:158
 msgid "Enabled"
 msgstr "Käytössä"
 
-#. webkit_plugin_get_enabled (plugin)
-#: ../embed/ephy-about-handler.c:159
+#. webkit_plugin_get_enabled (plugin) &&
+#: ../embed/ephy-about-handler.c:158
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../embed/ephy-about-handler.c:159
+#: ../embed/ephy-about-handler.c:158
 msgid "No"
 msgstr "Ei"
 
-#: ../embed/ephy-about-handler.c:160
+#: ../embed/ephy-about-handler.c:159
 msgid "MIME type"
 msgstr "MIME-tyyppi"
 
-#: ../embed/ephy-about-handler.c:160
+#: ../embed/ephy-about-handler.c:159
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../embed/ephy-about-handler.c:160
+#: ../embed/ephy-about-handler.c:159
 msgid "Suffixes"
 msgstr "Päätteet"
 
-#: ../embed/ephy-about-handler.c:220 ../embed/ephy-about-handler.c:223
+#: ../embed/ephy-about-handler.c:220 ../embed/ephy-about-handler.c:222
 msgid "Memory usage"
 msgstr "Muistinkulutus"
 
-#: ../embed/ephy-about-handler.c:304 ../embed/ephy-about-handler.c:306
+#: ../embed/ephy-about-handler.c:270
+#, c-format
+msgid "Version %s"
+msgstr "Versio %s"
+
+#: ../embed/ephy-about-handler.c:290
+#| msgid "_About"
+msgid "About Web"
+msgstr "Tietoja"
+
+#: ../embed/ephy-about-handler.c:294
+#| msgid ""
+#| "A simple, clean, beautiful view of the web.\n"
+#| "Powered by WebKit %d.%d.%d"
+msgid "A simple, clean, beautiful view of the web"
+msgstr "Selkeä ja nätti näkymä internetiin"
+
+#: ../embed/ephy-about-handler.c:345 ../embed/ephy-about-handler.c:346
 msgid "Applications"
 msgstr "Sovellukset"
 
-#: ../embed/ephy-about-handler.c:307
+#: ../embed/ephy-about-handler.c:347
 msgid "List of installed web applications"
 msgstr "Luettelo asennetuista www-sovelluksista"
 
 #. Note for translators: this refers to the installation date.
-#: ../embed/ephy-about-handler.c:328
+#: ../embed/ephy-about-handler.c:364
 msgid "Installed on:"
 msgstr "Asennettu:"
 
-#: ../embed/ephy-about-handler.c:401 ../embed/ephy-about-handler.c:404
+#: ../embed/ephy-about-handler.c:468
+#| msgid "Remove from this topic"
+msgid "Remove from overview"
+msgstr "Poista yleisnäkymästä"
+
+#: ../embed/ephy-about-handler.c:483 ../embed/ephy-web-view.c:781
+msgid "Most Visited"
+msgstr "Useimmin vieraillut"
+
+#: ../embed/ephy-about-handler.c:542 ../embed/ephy-about-handler.c:543
 msgid "Private Browsing"
 msgstr "Yksityinen selaus"
 
-#: ../embed/ephy-about-handler.c:405
+#: ../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 "
@@ -515,25 +559,30 @@ msgstr ""
 "sivut eivät näy selaushistoriassa, ja kaikki selaukseen liittyvät tiedot "
 "katoavat sulkiessasi selainikkunan."
 
-#: ../embed/ephy-embed.c:500
+#: ../embed/ephy-embed.c:473
 #, c-format
 msgid "Press %s to exit fullscreen"
 msgstr "Paina %s poistuaksesi koko näytön tilasta"
 
 #. Translators: 'ESC' and 'F11' are keyboard keys.
-#: ../embed/ephy-embed.c:503
+#: ../embed/ephy-embed.c:476
 msgid "ESC"
 msgstr "ESC"
 
-#: ../embed/ephy-embed.c:503
+#: ../embed/ephy-embed.c:476
 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 "Lähetä sähköposti osoitteeseen ”%s”"
 
+#: ../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=fi-fi&amp;kad=fi_FI";
+
 #: ../embed/ephy-encodings.c:54
 msgid "Arabic (_IBM-864)"
 msgstr "Arabialainen (_IBM-864)"
@@ -858,121 +907,128 @@ msgstr "Unicode (UTF-3_2 LE)"
 msgid "Unknown (%s)"
 msgstr "Tuntematon (%s)"
 
-#: ../embed/ephy-find-toolbar.c:103
+#: ../embed/ephy-find-toolbar.c:105
 msgid "Text not found"
 msgstr "Tekstiä ei löytynyt"
 
-#: ../embed/ephy-find-toolbar.c:110
+#: ../embed/ephy-find-toolbar.c:112
 msgid "Search wrapped back to the top"
 msgstr "Haku palautui takaisin sivun yläosaan"
 
-#: ../embed/ephy-find-toolbar.c:462
+#: ../embed/ephy-find-toolbar.c:456
 msgid "Type to search…"
 msgstr "Kirjoita hakeaksesi…"
 
-#: ../embed/ephy-find-toolbar.c:468
+#: ../embed/ephy-find-toolbar.c:462
 msgid "Find previous occurrence of the search string"
 msgstr "Etsi haettavan merkkijonon edellinen esiintymä"
 
-#: ../embed/ephy-find-toolbar.c:476
+#: ../embed/ephy-find-toolbar.c:470
 msgid "Find next occurrence of the search string"
 msgstr "Etsi haettavan merkkijonon seuraava esiintymä"
 
-#: ../embed/ephy-overview.h:53
-msgid "Most Visited"
-msgstr "Useimmin vieraillut"
-
 #. characters
-#: ../embed/ephy-web-view.c:64 ../embed/ephy-web-view.c:2774
+#: ../embed/ephy-web-view.c:65 ../embed/ephy-web-view.c:2807
 msgid "Blank page"
 msgstr "Tyhjä sivu"
 
-#: ../embed/ephy-web-view.c:495 ../src/window-commands.c:329
+#: ../embed/ephy-web-view.c:497 ../src/window-commands.c:329
 msgid "Save"
 msgstr "Tallenna"
 
-#. 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:508
+#: ../embed/ephy-web-view.c:509
 #, c-format
 msgid "Do you want to save your password for “%s”?"
-msgstr ""
+msgstr "Haluatko tallentaa salasanasi sivustolle \"%s\"?"
 
-#: ../embed/ephy-web-view.c:1380
+#: ../embed/ephy-web-view.c:1442
 msgid "Deny"
 msgstr "Älä salli"
 
-#: ../embed/ephy-web-view.c:1381
+#: ../embed/ephy-web-view.c:1443
 msgid "Allow"
 msgstr "Salli"
 
-#: ../embed/ephy-web-view.c:1391
+#: ../embed/ephy-web-view.c:1453
 #, c-format
 msgid "The page at <b>%s</b> wants to know your location."
 msgstr "Sivu <b>%s</b> haluaa tietää sijaintisi."
 
-#: ../embed/ephy-web-view.c:1724
+#: ../embed/ephy-web-view.c:1759
 msgid "None specified"
 msgstr "Ei määritetty"
 
-#: ../embed/ephy-web-view.c:1733 ../embed/ephy-web-view.c:1751
+#: ../embed/ephy-web-view.c:1772 ../embed/ephy-web-view.c:1787
 #, c-format
-msgid "Oops! Error loading %s"
-msgstr "Oho! Virhe ladattaessa kohteesta %s"
+#| msgid "Loading “%s”…"
+msgid "Problem loading “%s”"
+msgstr "Virhe ladatessa “%s”"
 
-#: ../embed/ephy-web-view.c:1735
-msgid "Oops! It was not possible to show this website"
-msgstr "Oho! Ei ollut mahdollista näyttää tätä www-sivua"
+#: ../embed/ephy-web-view.c:1774
+#| msgid "Oops! It was not possible to show this website"
+msgid "Oops! Unable to display this website."
+msgstr "Oho! Tämän sivun esittäminen epäonnistui"
 
-#: ../embed/ephy-web-view.c:1736
+#: ../embed/ephy-web-view.c:1775
 #, 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>"
 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>"
+"<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>WWW-sivusto osoitteessa <strong>%s</strong> ei vaikuta olevan saatavilla. "
-"Tarkka virhe oli:</p><p><em>%s</em></p><p>Sivusto voi olla tilapäisesti "
-"kytketty pois päältä tai siirretty uuteen osoitteeseen. Ethän unohda "
-"tarkistaa, että Internet-yhteytesi toimii oikein.</p>"
+"<p>Sivusto osoitteessa %s ei vaikuta olevan saatavilla. Tarkka virhe oli:</"
+"p><p><code>%s</code></p><p>Sivusto voi olla tilapäisesti pois käytöstä tai "
+"siirretty uuteen osoitteeseen. Varmistathan, että Internet-yhteytesi toimii "
+"oikein.</p>"
 
-#: ../embed/ephy-web-view.c:1745
+#: ../embed/ephy-web-view.c:1783
 msgid "Try again"
 msgstr "Yritä uudelleen"
 
-#: ../embed/ephy-web-view.c:1753
-msgid "Oops! This site might have caused the web browser to close unexpectedly"
-msgstr ""
-"Oho! Tämä sivusto taisi saada selaimen sulkeutumaan odottamattomalla tavalla"
+#: ../embed/ephy-web-view.c:1789
+msgid "Oops! There may be a problem."
+msgstr "Oho! Mahdollinen ongelma."
 
-#: ../embed/ephy-web-view.c:1755
+#: ../embed/ephy-web-view.c:1790
 #, 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>"
 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>"
+"<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>Tätä sivua oltiin lataamassa, kun selain sulkeutui odottamatta.</"
-"p><p>Selain saattaa sulkeutua uudestaan, kun sivu ladataan uudelleen. Jos  "
+"p><p>Selain saattaa sulkeutua uudestaan, kun sivu ladataan uudelleen. Jos "
 "näin tapahtuu, raportoi vika <strong>%s</strong>-kehittäjille.</p>"
 
-#: ../embed/ephy-web-view.c:1763
-msgid "Load again anyway"
-msgstr "Lataa kuitenkin uudelleen"
+#: ../embed/ephy-web-view.c:1795 ../embed/ephy-web-view.c:1802
+#| msgid "Load again anyway"
+msgid "Reload Anyway"
+msgstr "Päivitä silti"
 
-#: ../embed/ephy-web-view.c:1769
+#: ../embed/ephy-web-view.c:1799
 #, c-format
-msgid "Oops! Something went wrong displaying %s"
-msgstr "Hups! Jokin meni pieleen näyttäessä sivua %s"
+#| msgid "Loading “%s”…"
+msgid "Problem displaying “%s”"
+msgstr "Virhe näyttäessä “%s”"
 
-#: ../embed/ephy-web-view.c:1770
+#: ../embed/ephy-web-view.c:1800
 msgid "Oops!"
 msgstr "Hups!"
 
-#: ../embed/ephy-web-view.c:1771
+#: ../embed/ephy-web-view.c:1801
 msgid ""
 "Something went wrong while displaying this page. Please reload or visit a "
 "different page to continue."
@@ -981,27 +1037,28 @@ msgstr ""
 "toiselle sivulle jatkaaksesi."
 
 #. translators: %s here is the address of the web page
-#: ../embed/ephy-web-view.c:2324
+#: ../embed/ephy-web-view.c:2219
 #, c-format
 msgid "Loading “%s”…"
 msgstr "Ladataan ”%s”…"
 
-#: ../embed/ephy-web-view.c:2326
+#: ../embed/ephy-web-view.c:2221
 msgid "Loading…"
 msgstr "Ladataan…"
 
-#: ../embed/ephy-web-view.c:2678 ../src/bookmarks/ephy-bookmarks-editor.c:818
+#: ../embed/ephy-web-view.c:2711
 msgid "_OK"
 msgstr "_OK"
 
 #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193
-#: ../src/bookmarks/ephy-bookmark-properties.c:639
-#: ../src/bookmarks/ephy-bookmarks-editor.c:815
-#: ../src/resources/clear-data-dialog.ui.h:2 ../src/window-commands.c:877
+#: ../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"
 msgstr "_Peru"
 
-#: ../lib/ephy-file-chooser.c:185
+#: ../lib/ephy-file-chooser.c:185 ../src/resources/history-dialog.ui.h:7
 msgid "_Open"
 msgstr "_Avaa"
 
@@ -1021,7 +1078,7 @@ msgstr "WWW-sivut"
 msgid "Images"
 msgstr "Kuvat"
 
-#: ../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 "Kaikki tiedostot"
 
@@ -1054,11 +1111,20 @@ msgstr "Kansiota ”%s” ei voi luoda."
 #. * hostname where this is happening. Example: gnome gmail com and
 #. * mail.google.com.
 #.
-#: ../lib/ephy-form-auth-data.c:126
+#: ../lib/ephy-form-auth-data.c:139
 #, c-format
 msgid "Password for %s in a form in %s"
 msgstr "Käyttäjän %s salasana lomakkeelle sivustolla %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 for %s in a form in %s"
+msgid "Password in a form in %s"
+msgstr "Salasana lomakkeessa sivustolla %s"
+
 #: ../lib/ephy-gui.c:206
 #, c-format
 msgid "Directory “%s” is not writable"
@@ -1099,7 +1165,6 @@ msgid "Master password needed"
 msgstr "Tarvitaan pääsalasana"
 
 #: ../lib/ephy-nss-glue.c:64
-#, fuzzy
 #| 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 "
@@ -1108,8 +1173,8 @@ 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 ""
-"Salasanat aiemmasta versiosta (Gecko) on lukittu pääsalasanalla. Jos tahdot, "
-"että Epiphany tuo ne, syötä tähän pääsalasanasi."
+"Salasanat aiemmasta versiosta on lukittu pääsalasanalla. Jos tahdot tuoda "
+"ne, syötä tähän pääsalasanasi."
 
 #: ../lib/ephy-profile-migrator.c:100
 msgid "Failed to copy cookies file from Mozilla."
@@ -1225,11 +1290,11 @@ msgstr "300 %"
 msgid "400%"
 msgstr "400 %"
 
-#: ../lib/history/ephy-history-service-hosts-table.c:362
+#: ../lib/history/ephy-history-service-hosts-table.c:363
 msgid "Others"
 msgstr "Muut"
 
-#: ../lib/history/ephy-history-service-hosts-table.c:366
+#: ../lib/history/ephy-history-service-hosts-table.c:367
 msgid "Local files"
 msgstr "Paikalliset tiedostot"
 
@@ -1269,171 +1334,149 @@ msgstr "Tämän sivuston identiteetti on vahvistettu"
 msgid "The identity of this website has not been verified"
 msgstr "Tämän sivuston identiteettiä ei ole vahvistettu"
 
-#: ../lib/widgets/ephy-certificate-dialog.c:323
-#: ../src/bookmarks/ephy-bookmark-properties.c:649
-#: ../src/bookmarks/ephy-bookmarks-editor.c:178
-#: ../src/resources/cookies-dialog.ui.h:3
-#: ../src/resources/passwords-dialog.ui.h:3 ../src/ephy-history-window.c:143
-#: ../src/ephy-window.c:114
-msgid "_Close"
-msgstr "_Sulje"
-
-#: ../lib/widgets/ephy-download-widget.c:111
+#: ../lib/widgets/ephy-download-widget.c:107
 #, c-format
-msgid "%u:%02u hour left"
-msgid_plural "%u:%02u hours left"
-msgstr[0] "%u:%02u tuntia jäljellä"
-msgstr[1] "%u:%02u tunti jäljellä"
+#| msgid "%u second left"
+#| msgid_plural "%u seconds left"
+msgid "%d second left"
+msgid_plural "%d seconds left"
+msgstr[0] "%d sekunti jäljellä"
+msgstr[1] "%d sekuntia jäljellä"
 
 #: ../lib/widgets/ephy-download-widget.c:113
 #, c-format
-msgid "%u hour left"
-msgid_plural "%u hours left"
-msgstr[0] "%u tunti jäljellä"
-msgstr[1] "%u tuntia jäljellä"
-
-#: ../lib/widgets/ephy-download-widget.c:116
+#| msgid "%u:%02u minute left"
+#| msgid_plural "%u:%02u minutes left"
+msgid "%d minute left"
+msgid_plural "%d minutes left"
+msgstr[0] "%d minuutti jäljellä"
+msgstr[1] "%d minuuttia jäljellä"
+
+#: ../lib/widgets/ephy-download-widget.c:119
 #, c-format
-msgid "%u:%02u minute left"
-msgid_plural "%u:%02u minutes left"
-msgstr[0] "%u:%02u minuutti jäljellä"
-msgstr[1] "%u:%02u minuuttia jäljellä"
-
-#: ../lib/widgets/ephy-download-widget.c:118
+#| msgid "%u hour left"
+#| msgid_plural "%u hours left"
+msgid "%d hour left"
+msgid_plural "%d hours left"
+msgstr[0] "%d tunti jäljellä"
+msgstr[1] "%d tuntia jäljellä"
+
+#: ../lib/widgets/ephy-download-widget.c:125
 #, c-format
-msgid "%u second left"
-msgid_plural "%u seconds left"
-msgstr[0] "%u sekunti jäljellä"
-msgstr[1] "%u sekuntia jäljellä"
-
-#: ../lib/widgets/ephy-download-widget.c:260
+#| msgid "%u second left"
+#| msgid_plural "%u seconds left"
+msgid "%d day left"
+msgid_plural "%d days left"
+msgstr[0] "%d päivä jäljellä"
+msgstr[1] "%d päivää jäljellä"
+
+#: ../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 viikko jäljellä"
+msgstr[1] "%d viikkoa jäljellä"
+
+#: ../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 kuukausi jäljellä"
+msgstr[1] "%d kuukautta jäljellä"
+
+#: ../lib/widgets/ephy-download-widget.c:293
 msgid "Finished"
 msgstr "Valmis"
 
-#: ../lib/widgets/ephy-download-widget.c:273
+#: ../lib/widgets/ephy-download-widget.c:309
 #, c-format
 msgid "Error downloading: %s"
 msgstr "Virhe ladattaessa: %s"
 
-#: ../lib/widgets/ephy-download-widget.c:330 ../src/window-commands.c:781
+#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:712
 msgid "Cancel"
 msgstr "Peru"
 
-#: ../lib/widgets/ephy-download-widget.c:339 ../src/ephy-window.c:1175
+#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1146
 #: ../src/window-commands.c:275
 msgid "Open"
 msgstr "Avaa"
 
-#: ../lib/widgets/ephy-download-widget.c:345
+#: ../lib/widgets/ephy-download-widget.c:377
 msgid "Show in folder"
 msgstr "Näytä kansiossa"
 
-#: ../lib/widgets/ephy-download-widget.c:538
+#: ../lib/widgets/ephy-download-widget.c:586
 msgid "Starting…"
 msgstr "Käynnistetään…"
 
-#: ../lib/widgets/ephy-hosts-store.c:246
-msgid "All sites"
-msgstr "Kaikki sivustot"
-
-#: ../lib/widgets/ephy-hosts-view.c:46
-msgid "Sites"
-msgstr "Sivustot"
-
 #. 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:608
-#: ../src/resources/prefs-dialog.ui.h:34 ../src/ephy-history-window.c:229
+#: ../lib/widgets/ephy-location-entry.c:618
+#: ../src/resources/prefs-dialog.ui.h:36 ../src/ephy-history-window.c:189
 msgid "Cl_ear"
 msgstr "T_yhjennä"
 
 #. Edit actions.
-#: ../lib/widgets/ephy-location-entry.c:627 ../src/ephy-window.c:121
+#: ../lib/widgets/ephy-location-entry.c:637 ../src/ephy-window.c:121
 msgid "_Undo"
 msgstr "_Kumoa"
 
-#: ../lib/widgets/ephy-location-entry.c:634
+#: ../lib/widgets/ephy-location-entry.c:644
 msgid "_Redo"
 msgstr "_Tee uudelleen"
 
-#: ../lib/widgets/ephy-location-entry.c:890
+#: ../lib/widgets/ephy-location-entry.c:924
 msgid "Drag and drop this icon to create a link to this page"
 msgstr "Vedä ja pudota tämä kuvake tehdäksesi tähän sivuun osoittavan linkin"
 
-#: ../lib/widgets/ephy-urls-view.c:43
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1623
-msgid "Title"
-msgstr "Otsikko"
-
-#: ../lib/widgets/ephy-urls-view.c:51
-#: ../src/bookmarks/ephy-bookmarks-editor.c:212
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1634
-msgid "Address"
-msgstr "Osoite"
-
-#: ../lib/widgets/ephy-urls-view.c:59
-msgid "Date"
-msgstr "Päiväys"
-
 #. 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:610
-#, c-format
-msgid "%d _Similar"
-msgid_plural "%d _Similar"
-msgstr[0] "%d _samanlainen"
-msgstr[1] "%d _samanlaista"
-
-#: ../src/bookmarks/ephy-bookmark-properties.c:256
-#, c-format
-msgid "_Unify With %d Identical Bookmark"
-msgid_plural "_Unify With %d Identical Bookmarks"
-msgstr[0] "_Yhdistä %d identtisen kirjanmerkin kanssa"
-msgstr[1] "_Yhdistä %d identtisen kirjanmerkin kanssa"
-
-#: ../src/bookmarks/ephy-bookmark-properties.c:273
-#: ../src/bookmarks/ephy-bookmark-properties.c:295
 #, c-format
-msgid "Show “%s”"
-msgstr "Näytä ”%s”"
+msgid "%d bookmark is similar"
+msgid_plural "%d bookmarks are similar"
+msgstr[0] "%d kirjanmerkki on samankaltainen"
+msgstr[1] "%d kirjanmerkkiä on samankaltaisia"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:420
+#: ../src/bookmarks/ephy-bookmark-properties.c:234
 #, c-format
 msgid "“%s” Properties"
 msgstr "”%s” ominaisuudet"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:544
+#: ../src/bookmarks/ephy-bookmark-properties.c:358
 msgid "_Title:"
 msgstr "_Otsikko:"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:561
+#: ../src/bookmarks/ephy-bookmark-properties.c:375
 msgid "A_ddress:"
 msgstr "_Osoite:"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:573
+#: ../src/bookmarks/ephy-bookmark-properties.c:387
 msgid "T_opics:"
 msgstr "_Aiheet:"
 
-#: ../src/bookmarks/ephy-bookmark-properties.c:596
+#: ../src/bookmarks/ephy-bookmark-properties.c:410
 msgid "Sho_w all topics"
 msgstr "Näy_tä kaikki aiheet"
 
-#. Help.
-#: ../src/bookmarks/ephy-bookmark-properties.c:626
-#: ../src/bookmarks/ephy-bookmarks-editor.c:154
-#: ../src/resources/epiphany-application-menu.ui.h:7
-#: ../src/ephy-history-window.c:130 ../src/ephy-window.c:191
-msgid "_Help"
-msgstr "O_hje"
-
-#: ../src/bookmarks/ephy-bookmark-properties.c:642
-#: ../src/resources/prefs-dialog.ui.h:39
+#: ../src/bookmarks/ephy-bookmark-properties.c:431
+#: ../src/resources/prefs-dialog.ui.h:41
+#: ../src/resources/prefs-lang-dialog.ui.h:3
 msgid "_Add"
 msgstr "_Lisää"
 
+#: ../src/bookmarks/ephy-bookmark-properties.c:438
+#: ../src/bookmarks/ephy-bookmarks-editor.c:178 ../src/ephy-window.c:114
+msgid "_Close"
+msgstr "_Sulje"
+
 #: ../src/bookmarks/ephy-bookmarks.c:88
 msgid "Entertainment"
 msgstr "Viihde"
@@ -1459,33 +1502,33 @@ msgid "Work"
 msgstr "Työ"
 
 #. Translators: this topic contains all bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:925
+#: ../src/bookmarks/ephy-bookmarks.c:926
 msgctxt "bookmarks"
 msgid "All"
 msgstr "Kaikki"
 
 #. Translators: this topic contains the not categorized
 #. bookmarks
-#: ../src/bookmarks/ephy-bookmarks.c:929
+#: ../src/bookmarks/ephy-bookmarks.c:930
 msgctxt "bookmarks"
 msgid "Not Categorized"
 msgstr "Luokittelemattomat"
 
 #. Translators: this is an automatic topic containing local
 #. * websites bookmarks autodiscovered with zeroconf.
-#: ../src/bookmarks/ephy-bookmarks.c:933
+#: ../src/bookmarks/ephy-bookmarks.c:934
 msgctxt "bookmarks"
 msgid "Nearby Sites"
 msgstr "Lähiympäristön sivustot"
 
-#: ../src/bookmarks/ephy-bookmarks.c:1147
+#: ../src/bookmarks/ephy-bookmarks.c:1148
 #: ../src/bookmarks/ephy-bookmarks-import.c:270
 msgid "Untitled"
 msgstr "Nimetön"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:75
 msgid "Web (RDF)"
-msgstr ""
+msgstr "Verkko (RDF)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:76
 msgid "Mozilla (HTML)"
@@ -1497,20 +1540,23 @@ msgstr "Poista tästä aiheesta"
 
 #. Toplevel
 #: ../src/bookmarks/ephy-bookmarks-editor.c:151
-#: ../src/ephy-history-window.c:127
 msgid "_File"
 msgstr "_Tiedosto"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:152
-#: ../src/ephy-history-window.c:128
 msgid "_Edit"
 msgstr "_Muokkaa"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:153
-#: ../src/ephy-history-window.c:129
 msgid "_View"
 msgstr "_Näytä"
 
+#. Help.
+#: ../src/bookmarks/ephy-bookmarks-editor.c:154
+#: ../src/resources/epiphany-application-menu.ui.h:7 ../src/ephy-window.c:191
+msgid "_Help"
+msgstr "O_hje"
+
 #. File Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:158
 msgid "_New Topic"
@@ -1520,10 +1566,8 @@ msgstr "_Uusi aihe"
 msgid "Create a new topic"
 msgstr "Luo uusi aihe"
 
-#. File Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:161
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1158
-#: ../src/ephy-history-window.c:134 ../src/ephy-history-window.c:636
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1154
 msgid "Open in New _Window"
 msgid_plural "Open in New _Windows"
 msgstr[0] "Avaa uudessa _ikkunassa"
@@ -1534,8 +1578,7 @@ msgid "Open the selected bookmark in a new window"
 msgstr "Avaa valittu kirjanmerkki uuteen ikkunaan"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:164
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1161
-#: ../src/ephy-history-window.c:137 ../src/ephy-history-window.c:639
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1157
 msgid "Open in New _Tab"
 msgid_plural "Open in New _Tabs"
 msgstr[0] "Avaa uusissa _välilehdissä"
@@ -1582,40 +1625,33 @@ msgid "Close the bookmarks window"
 msgstr "Sulje kirjanmerkki-ikkuna"
 
 #. Edit Menu
-#: ../src/bookmarks/ephy-bookmarks-editor.c:183
-#: ../src/ephy-history-window.c:148 ../src/ephy-window.c:125
+#: ../src/bookmarks/ephy-bookmarks-editor.c:183 ../src/ephy-window.c:125
 msgid "Cu_t"
 msgstr "_Leikkaa"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:184
-#: ../src/ephy-history-window.c:149
 msgid "Cut the selection"
 msgstr "Leikkaa valinta"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:186
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1171
-#: ../src/ephy-history-window.c:151 ../src/ephy-history-window.c:649
-#: ../src/ephy-window.c:127
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:127
 msgid "_Copy"
 msgstr "_Kopioi"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:187
-#: ../src/ephy-history-window.c:152
 msgid "Copy the selection"
 msgstr "Kopioi valinta"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:189
-#: ../src/ephy-history-window.c:154 ../src/ephy-window.c:129
+#: ../src/bookmarks/ephy-bookmarks-editor.c:189 ../src/ephy-window.c:129
 msgid "_Paste"
 msgstr "L_iitä"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:190
-#: ../src/ephy-history-window.c:155
 msgid "Paste the clipboard"
 msgstr "Liitä leikepöydän sisältö"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:192
-#: ../src/ephy-history-window.c:157
+#: ../src/resources/history-dialog.ui.h:10
 msgid "_Delete"
 msgstr "_Poista"
 
@@ -1623,8 +1659,7 @@ msgstr "_Poista"
 msgid "Delete the selected bookmark or topic"
 msgstr "Poista valittu kirjanmerkki tai aihe"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:195
-#: ../src/ephy-history-window.c:160 ../src/ephy-window.c:133
+#: ../src/bookmarks/ephy-bookmarks-editor.c:195 ../src/ephy-window.c:133
 msgid "Select _All"
 msgstr "Valitse k_aikki"
 
@@ -1634,7 +1669,6 @@ msgstr "Valitse kaikki kirjanmerkit tai kaikki teksti"
 
 #. Help Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:200
-#: ../src/ephy-history-window.c:168
 msgid "_Contents"
 msgstr "_Sisältö"
 
@@ -1643,29 +1677,29 @@ msgid "Display bookmarks help"
 msgstr "Näytä kirjanmerkkiohje"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:203
-#: ../src/resources/epiphany-application-menu.ui.h:8
-#: ../src/ephy-history-window.c:171 ../src/ephy-window.c:193
+#: ../src/resources/epiphany-application-menu.ui.h:8 ../src/ephy-window.c:193
 msgid "_About"
 msgstr "_Tietoja"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:204
-#: ../src/ephy-history-window.c:172
 msgid "Display credits for the web browser creators"
 msgstr "Näytä luettelo tämän WWW-selaimen tekijöistä"
 
 #. View Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:210
-#: ../src/ephy-history-window.c:186
 msgid "_Title"
 msgstr "_Otsikko"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:211
-#: ../src/ephy-history-window.c:187
 msgid "Show the title column"
 msgstr "Näytä otsikkosarake"
 
+#: ../src/bookmarks/ephy-bookmarks-editor.c:212
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1632
+msgid "Address"
+msgstr "Osoite"
+
 #: ../src/bookmarks/ephy-bookmarks-editor.c:213
-#: ../src/ephy-history-window.c:189
 msgid "Show the address column"
 msgstr "Näytä osoitesarake"
 
@@ -1673,16 +1707,16 @@ msgstr "Näytä osoitesarake"
 msgid "Type a topic"
 msgstr "Kirjoita aihe"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:373
+#: ../src/bookmarks/ephy-bookmarks-editor.c:377
 #, c-format
 msgid "Delete topic “%s”?"
 msgstr "Poistetaanko aihe ”%s”?"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:376
+#: ../src/bookmarks/ephy-bookmarks-editor.c:380
 msgid "Delete this topic?"
 msgstr "Poistetaanko tämä aihe?"
 
-#: ../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."
@@ -1691,44 +1725,44 @@ msgstr ""
 "luokittelemattomiksi, jolleivät ne kuulu johonkin toiseen aiheeseen. "
 "Kirjanmerkkejä ei poisteta."
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:381
+#: ../src/bookmarks/ephy-bookmarks-editor.c:385
 msgid "_Delete Topic"
 msgstr "_Poista aihe"
 
 #. 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 "Mozillan ”%s”-profiili"
 
-#: ../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 "Tuonti epäonnistui"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:548
+#: ../src/bookmarks/ephy-bookmarks-editor.c:552
 msgid "Import Failed"
 msgstr "Tuonti epäonnistui"
 
-#: ../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 "
@@ -1737,64 +1771,66 @@ msgstr ""
 "Tiedoston ”%s” sisältämien kirjanmerkkien tuonti ei onnistunut, koska "
 "tiedosto on vioittunut tai tuntematonta tyyppiä."
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:614
+#: ../src/bookmarks/ephy-bookmarks-editor.c:618
 msgid "Import Bookmarks from File"
 msgstr "Tuo kirjanmerkit tiedostosta"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:621
+#: ../src/bookmarks/ephy-bookmarks-editor.c:625
 msgid "Firefox/Mozilla bookmarks"
 msgstr "Firefoxin tai Mozillan kirjanmerkit"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:625
+#: ../src/bookmarks/ephy-bookmarks-editor.c:629
 msgid "Galeon/Konqueror bookmarks"
 msgstr "Galeonin tai Konquerorin kirjanmerkit"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:629
-#, fuzzy
+#: ../src/bookmarks/ephy-bookmarks-editor.c:633
 #| msgid "Bookmarks"
 msgid "Web bookmarks"
 msgstr "Kirjanmerkit"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:753
+#: ../src/bookmarks/ephy-bookmarks-editor.c:757
 msgid "Export Bookmarks"
 msgstr "Tuo kirjanmerkit"
 
-#: ../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 "Kirjanmerkit"
 
 #. 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 "Tiedosto_muoto:"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:812
+#: ../src/bookmarks/ephy-bookmarks-editor.c:816
 msgid "Import Bookmarks"
 msgstr "Tuo kirjanmerkit"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:817
+#: ../src/bookmarks/ephy-bookmarks-editor.c:821
 msgid "I_mport"
 msgstr "T_uo"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:833
+#: ../src/bookmarks/ephy-bookmarks-editor.c:837
 msgid "Import bookmarks from:"
 msgstr "Tuo kirjanmerkit:"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:853
+#: ../src/bookmarks/ephy-bookmarks-editor.c:857
 msgid "File"
 msgstr "Tiedosto"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1167
-#: ../src/ephy-history-window.c:645
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1163
 msgid "_Copy Address"
 msgstr "_Kopioi osoite"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1553
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1551
 msgid "Topics"
 msgstr "Aiheet"
 
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1621
+msgid "Title"
+msgstr "Otsikko"
+
 #. FIXME !!!!
 #: ../src/bookmarks/ephy-open-tabs-action.c:74
 msgid "Open in New _Tabs"
@@ -1810,25 +1846,18 @@ msgid "Create topic “%s”"
 msgstr "Luo aihe ”%s”"
 
 #: ../src/resources/clear-data-dialog.ui.h:1
-#| msgid "Clear All Personal Data"
 msgid "Clear Personal Data"
 msgstr "Tyhjennä yksityiset tiedot"
 
-#: ../src/resources/clear-data-dialog.ui.h:3
-#| msgid "Clear"
+#: ../src/resources/clear-data-dialog.ui.h:2
 msgid "C_lear"
 msgstr "T_yhjennä"
 
 #: ../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 "Valitse poistettavat yksityiset tiedot"
 
 #: ../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:"
@@ -1838,29 +1867,23 @@ msgstr ""
 
 #: ../src/resources/clear-data-dialog.ui.h:6
 #: ../src/resources/cookies-dialog.ui.h:1
-#: ../src/resources/prefs-dialog.ui.h:19
+#: ../src/resources/prefs-dialog.ui.h:21
 msgid "Cookies"
 msgstr "Evästeet"
 
 #: ../src/resources/clear-data-dialog.ui.h:7
-#| msgid "_Temporary files"
 msgid "Cache and temporary files"
 msgstr "Väliaikaistiedostot"
 
 #: ../src/resources/clear-data-dialog.ui.h:8
-#| msgid "Clear browsing history?"
 msgid "Browsing history"
 msgstr "Sivuhistoria"
 
 #: ../src/resources/clear-data-dialog.ui.h:9
-#| msgid "Saved _passwords"
 msgid "Saved passwords"
 msgstr "Tallennetut salasanat"
 
 #: ../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."
@@ -1869,24 +1892,17 @@ msgstr ""
 "poistetaan pysyvästi."
 
 #: ../src/resources/cookies-dialog.ui.h:2
+#: ../src/resources/history-dialog.ui.h:2
 #: ../src/resources/passwords-dialog.ui.h:2
-#| msgid "Clear"
 msgid "C_lear All"
 msgstr "Tyhjenn_ä kaikki"
 
-#: ../src/resources/cookies-dialog.ui.h:4
-#: ../src/resources/passwords-dialog.ui.h:5
-#| msgid "Sites"
+#: ../src/resources/cookies-dialog.ui.h:3
+#: ../src/resources/passwords-dialog.ui.h:4
 msgid "Site"
 msgstr "Sivusto"
 
-#: ../src/resources/cookies-dialog.ui.h:5
-#| msgid "Cookie accept"
-msgid "Cookie Name"
-msgstr "Evästeen nimi"
-
-#: ../src/resources/cookies-dialog.ui.h:6
-#: ../src/resources/passwords-dialog.ui.h:8
+#: ../src/resources/cookies-dialog.ui.h:4
 msgid "Remove"
 msgstr "Poista"
 
@@ -1924,50 +1940,74 @@ msgstr "_Lopeta"
 msgid "Text Encoding"
 msgstr "Tekstin merkistö"
 
-#: ../src/resources/epiphany.ui.h:2
-msgid "<b>_Automatic</b>"
-msgstr "<b>_Automaattinen</b>"
+#: ../src/resources/epiphany.ui.h:2 ../src/ephy-encoding-menu.c:327
+msgid "_Automatic"
+msgstr "_Automaattinen"
 
 #: ../src/resources/epiphany.ui.h:3 ../src/ephy-encoding-menu.c:328
 msgid "Use the encoding specified by the document"
 msgstr "Käytä asiakirjan määrittelemää merkistöä"
 
 #: ../src/resources/epiphany.ui.h:4
-msgid "<b>_Use a different encoding:</b>"
-msgstr "<b>Käytä _eri merkistöä:</b>"
+#| msgid "<b>_Use a different encoding:</b>"
+msgid "_Use a different encoding:"
+msgstr "Käytä _eri merkistöä:"
+
+#: ../src/resources/history-dialog.ui.h:1
+msgid "History"
+msgstr "Sivuhistoria"
+
+#: ../src/resources/history-dialog.ui.h:3
+#| msgid "Clear History"
+msgid "Search history"
+msgstr "Etsi historiasta"
+
+#: ../src/resources/history-dialog.ui.h:4
+msgid "Date"
+msgstr "Päiväys"
+
+#: ../src/resources/history-dialog.ui.h:5
+msgid "Name"
+msgstr "Nimi"
+
+#: ../src/resources/history-dialog.ui.h:6
+#| msgid "_Location…"
+msgid "Location"
+msgstr "Sijainti"
+
+#: ../src/resources/history-dialog.ui.h:8
+#| msgid "_Location…"
+msgid "_Copy Location"
+msgstr "_Kopioi sijainti"
+
+#: ../src/resources/history-dialog.ui.h:9
+#| msgid "Add _Bookmark…"
+msgid "Add _Bookmark"
+msgstr "_Lisää kirjanmerkki"
 
 #: ../src/resources/passwords-dialog.ui.h:1
-#: ../src/resources/prefs-dialog.ui.h:28
+#: ../src/resources/prefs-dialog.ui.h:30
 msgid "Passwords"
 msgstr "Salasanat"
 
-#: ../src/resources/passwords-dialog.ui.h:4
-#, fuzzy
+#: ../src/resources/passwords-dialog.ui.h:3
 #| msgid "_Show passwords"
 msgid "Search passwords"
-msgstr "_Näytä salasanat"
+msgstr "Etsi salasanoja"
 
-#: ../src/resources/passwords-dialog.ui.h:6
+#: ../src/resources/passwords-dialog.ui.h:5
 msgid "User Name"
 msgstr "Tunnus"
 
-#: ../src/resources/passwords-dialog.ui.h:7
-#| msgid "Passwords"
+#: ../src/resources/passwords-dialog.ui.h:6
 msgid "Password"
 msgstr "Salasana"
 
-#: ../src/resources/passwords-dialog.ui.h:9
-#| msgid "_Show passwords"
-msgid "Show Passwords"
-msgstr "Näytä salasanat"
-
-#: ../src/resources/passwords-dialog.ui.h:10
-#| msgid "Passwords"
+#: ../src/resources/passwords-dialog.ui.h:7
 msgid "_Copy Password"
 msgstr "_Kopioi salasana"
 
-#: ../src/resources/passwords-dialog.ui.h:11
-#| msgid "User Name"
+#: ../src/resources/passwords-dialog.ui.h:8
 msgid "C_opy Username"
 msgstr "K_opioi käyttäjätunnus"
 
@@ -1984,146 +2024,152 @@ msgid "A_utomatically open downloaded files"
 msgstr "Avaa ladatut tiedostot a_utomaattisesti"
 
 #: ../src/resources/prefs-dialog.ui.h:5
+#| msgid "_Search:"
+msgid "Search"
+msgstr "Haku"
+
+#: ../src/resources/prefs-dialog.ui.h:6
+msgid "_Engine:"
+msgstr "_Palvelu:"
+
+#: ../src/resources/prefs-dialog.ui.h:7
 msgid "Web Content"
 msgstr "WWW-sisältö"
 
-#: ../src/resources/prefs-dialog.ui.h:6
+#: ../src/resources/prefs-dialog.ui.h:8
 msgid "Allow popup _windows"
 msgstr "Salli _ponnahdusikkunat"
 
-#: ../src/resources/prefs-dialog.ui.h:7
+#: ../src/resources/prefs-dialog.ui.h:9
 msgid "Allow _advertisements"
 msgstr "Salli _mainokset"
 
-#: ../src/resources/prefs-dialog.ui.h:8
+#: ../src/resources/prefs-dialog.ui.h:10
 msgid "Enable _plugins"
 msgstr "Käytä _liitännäisiä"
 
-#: ../src/resources/prefs-dialog.ui.h:9
+#: ../src/resources/prefs-dialog.ui.h:11
 msgid "General"
 msgstr "Yleiset"
 
-#: ../src/resources/prefs-dialog.ui.h:10
+#: ../src/resources/prefs-dialog.ui.h:12
 msgid "Fonts"
 msgstr "Kirjasimet"
 
-#: ../src/resources/prefs-dialog.ui.h:11
+#: ../src/resources/prefs-dialog.ui.h:13
 msgid "_Use system fonts"
 msgstr "_Käytä järjestelmän kirjasimia"
 
-#: ../src/resources/prefs-dialog.ui.h:12
+#: ../src/resources/prefs-dialog.ui.h:14
 msgid "Sans serif font:"
 msgstr "Pääteviivaton kirjasin:"
 
-#: ../src/resources/prefs-dialog.ui.h:13
+#: ../src/resources/prefs-dialog.ui.h:15
 msgid "Serif font:"
 msgstr "Päätteellinen kirjasin:"
 
-#: ../src/resources/prefs-dialog.ui.h:14
+#: ../src/resources/prefs-dialog.ui.h:16
 msgid "Monospace font:"
 msgstr "Tasalevyinen kirjasin:"
 
-#: ../src/resources/prefs-dialog.ui.h:15
+#: ../src/resources/prefs-dialog.ui.h:17
 msgid "Style"
 msgstr "Tyyli"
 
-#: ../src/resources/prefs-dialog.ui.h:16
+#: ../src/resources/prefs-dialog.ui.h:18
 msgid "Use custom _stylesheet"
 msgstr "Käytä omaa _tyylipohjaa"
 
-#: ../src/resources/prefs-dialog.ui.h:17
+#: ../src/resources/prefs-dialog.ui.h:19
 msgid "_Edit Stylesheet…"
 msgstr "_Muokkaa tyylipohjaa…"
 
-#: ../src/resources/prefs-dialog.ui.h:18
+#: ../src/resources/prefs-dialog.ui.h:20
 msgid "Fonts & Style"
 msgstr "Kirjasimet ja tyylit"
 
-#: ../src/resources/prefs-dialog.ui.h:20
-#| msgid "Cookies"
+#: ../src/resources/prefs-dialog.ui.h:22
 msgid "Manage Cookies"
 msgstr "Hallitse evästeitä"
 
-#: ../src/resources/prefs-dialog.ui.h:21
+#: ../src/resources/prefs-dialog.ui.h:23
 msgid "_Always accept"
 msgstr "Hyväksy _aina"
 
-#: ../src/resources/prefs-dialog.ui.h:22
+#: ../src/resources/prefs-dialog.ui.h:24
 msgid "Only _from sites you visit"
 msgstr "Vain _sivustoilta, joilla vieraillaan"
 
 #. Refers to "Only from sites you visit" option under Cookies.
-#: ../src/resources/prefs-dialog.ui.h:24
+#: ../src/resources/prefs-dialog.ui.h:26
 msgid "<small>For example, not from advertisers on these sites</small>"
 msgstr "<small>Esimerkiksi ei mainostajilta näillä sivustoilla</small>"
 
-#: ../src/resources/prefs-dialog.ui.h:25
+#: ../src/resources/prefs-dialog.ui.h:27
 msgid "_Never accept"
 msgstr "_Älä hyväksy koskaan"
 
-#: ../src/resources/prefs-dialog.ui.h:26
+#: ../src/resources/prefs-dialog.ui.h:28
 msgid "Tracking"
 msgstr "Seuranta"
 
-#: ../src/resources/prefs-dialog.ui.h:27
+#: ../src/resources/prefs-dialog.ui.h:29
 msgid "_Tell web sites I do not want to be tracked"
 msgstr "_Pyydä sivustoja olemaan seuraamatta minua"
 
-#: ../src/resources/prefs-dialog.ui.h:29
-#| msgid "Passwords"
+#: ../src/resources/prefs-dialog.ui.h:31
 msgid "Manage Passwords"
 msgstr "Hallitse salasanoja"
 
-#: ../src/resources/prefs-dialog.ui.h:30
+#: ../src/resources/prefs-dialog.ui.h:32
 msgid "_Remember passwords"
 msgstr "_Muista salasanat"
 
-#: ../src/resources/prefs-dialog.ui.h:31
+#: ../src/resources/prefs-dialog.ui.h:33
 msgid "Temporary Files"
 msgstr "Väliaikaistiedostot"
 
-#: ../src/resources/prefs-dialog.ui.h:32
+#: ../src/resources/prefs-dialog.ui.h:34
 msgid "_Disk space:"
 msgstr "_Levytila:"
 
-#: ../src/resources/prefs-dialog.ui.h:33
+#: ../src/resources/prefs-dialog.ui.h:35
 msgid "MB"
 msgstr "Mt"
 
-#: ../src/resources/prefs-dialog.ui.h:35
+#: ../src/resources/prefs-dialog.ui.h:37
 msgid "Privacy"
 msgstr "Yksityisyys"
 
-#: ../src/resources/prefs-dialog.ui.h:36 ../src/ephy-encoding-dialog.c:385
+#: ../src/resources/prefs-dialog.ui.h:38 ../src/ephy-encoding-dialog.c:379
 msgid "Encodings"
 msgstr "Merkistöt"
 
-#: ../src/resources/prefs-dialog.ui.h:37
+#: ../src/resources/prefs-dialog.ui.h:39
 msgid "De_fault:"
 msgstr "_Oletus:"
 
-#: ../src/resources/prefs-dialog.ui.h:40
+#: ../src/resources/prefs-dialog.ui.h:42
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../src/resources/prefs-dialog.ui.h:41
-#| msgid "_Update"
+#: ../src/resources/prefs-dialog.ui.h:43
 msgid "_Up"
 msgstr "_Ylös"
 
-#: ../src/resources/prefs-dialog.ui.h:42
+#: ../src/resources/prefs-dialog.ui.h:44
 msgid "_Down"
 msgstr "_Alas"
 
-#: ../src/resources/prefs-dialog.ui.h:43
+#: ../src/resources/prefs-dialog.ui.h:45
 msgid "Spell checking"
 msgstr "Oikoluku"
 
-#: ../src/resources/prefs-dialog.ui.h:44
+#: ../src/resources/prefs-dialog.ui.h:46
 msgid "_Enable spell checking"
 msgstr "_Ota oikoluku käyttöön"
 
-#: ../src/resources/prefs-dialog.ui.h:45 ../src/prefs-dialog.c:821
+#: ../src/resources/prefs-dialog.ui.h:47 ../src/prefs-dialog.c:839
 msgid "Language"
 msgstr "Kieli"
 
@@ -2131,7 +2177,7 @@ msgstr "Kieli"
 msgid "Add Language"
 msgstr "Lisää kieli"
 
-#: ../src/resources/prefs-lang-dialog.ui.h:2
+#: ../src/resources/prefs-lang-dialog.ui.h:4
 msgid "Choose a l_anguage:"
 msgstr "Valitse k_ieli:"
 
@@ -2159,67 +2205,11 @@ msgstr "_Muut…"
 msgid "Other encodings"
 msgstr "Muut merkistöt"
 
-#: ../src/ephy-encoding-menu.c:327
-msgid "_Automatic"
-msgstr "_Automaattinen"
-
-#: ../src/ephy-history-window.c:135
-msgid "Open the selected history link in a new window"
-msgstr "Avaa valittu linkki sivuhistoriasta uuteen ikkunaan"
-
-#: ../src/ephy-history-window.c:138
-msgid "Open the selected history link in a new tab"
-msgstr "Avaa valittu linkki sivuhistoriasta uuteen välilehteen"
-
-#: ../src/ephy-history-window.c:140
-msgid "Add _Bookmark…"
-msgstr "_Lisää kirjanmerkki…"
-
-#: ../src/ephy-history-window.c:141
-msgid "Bookmark the selected history link"
-msgstr "Lisää kirjamerkki valitulle sivuhistorian linkille"
-
-#: ../src/ephy-history-window.c:144
-msgid "Close the history window"
-msgstr "Sulje sivuhistoria"
-
-#: ../src/ephy-history-window.c:158
-msgid "Delete the selected history link"
-msgstr "Poista valittu linkki sivuhistoriasta"
-
-#: ../src/ephy-history-window.c:161
-msgid "Select all history links or text"
-msgstr "Valitse kaikki linkit tai teksti sivuhistoriasta"
-
-#: ../src/ephy-history-window.c:163
-msgid "Clear _History"
-msgstr "Tyhjennä sivu_historia"
-
-#: ../src/ephy-history-window.c:164
-msgid "Clear your browsing history"
-msgstr "Tyhjentää aiemmin selattujen sivujen historian"
-
-#: ../src/ephy-history-window.c:169
-msgid "Display history help"
-msgstr "Näytä sivuhistorian ohje"
-
-#: ../src/ephy-history-window.c:188
-msgid "_Address"
-msgstr "_Osoite"
-
-#: ../src/ephy-history-window.c:190
-msgid "_Date and Time"
-msgstr "_Päiväys ja aika"
-
-#: ../src/ephy-history-window.c:191
-msgid "Show the date and time column"
-msgstr "Näytä päiväys- ja aikasarake"
-
-#: ../src/ephy-history-window.c:219
+#: ../src/ephy-history-window.c:179
 msgid "Clear browsing history?"
 msgstr "Tyhjennä sivuhistoria?"
 
-#: ../src/ephy-history-window.c:223
+#: ../src/ephy-history-window.c:183
 msgid ""
 "Clearing the browsing history will cause all history links to be permanently "
 "deleted."
@@ -2227,36 +2217,6 @@ msgstr ""
 "Sivuhistorian tyhjentämisen seurauksena kaikki linkit poistetaan "
 "sivuhistoriasta pysyvästi."
 
-#: ../src/ephy-history-window.c:235
-msgid "Clear History"
-msgstr "Tyhjennä sivuhistoria"
-
-#: ../src/ephy-history-window.c:799
-msgid "Last 30 minutes"
-msgstr "Viimeiset 30 minuuttia"
-
-#: ../src/ephy-history-window.c:800
-msgid "Today"
-msgstr "Tänään"
-
-#. keep this in sync with embed/ephy-history.c's
-#. * HISTORY_PAGE_OBSOLETE_DAYS
-#: ../src/ephy-history-window.c:802 ../src/ephy-history-window.c:806
-#: ../src/ephy-history-window.c:812
-#, c-format
-msgid "Last %d day"
-msgid_plural "Last %d days"
-msgstr[0] "Viimeisin %d päivä"
-msgstr[1] "Viimeisimmät %d päivää"
-
-#: ../src/ephy-history-window.c:816
-msgid "All history"
-msgstr "Koko historia"
-
-#: ../src/ephy-history-window.c:1107
-msgid "History"
-msgstr "Sivuhistoria"
-
 #: ../src/ephy-main.c:76
 msgid "Open a new tab in an existing browser window"
 msgstr "Avaa uusi välilehti olemassa olevaan selainikkunaan"
@@ -2330,7 +2290,7 @@ msgstr ""
 msgid "Web options"
 msgstr "Verkkoasetukset"
 
-#: ../src/ephy-notebook.c:602
+#: ../src/ephy-notebook.c:606
 msgid "Close tab"
 msgstr "Sulje välilehti"
 
@@ -2459,145 +2419,130 @@ msgstr "Lisää _kirjanmerkki…"
 
 #. Links.
 #: ../src/ephy-window.c:220
-msgid "_Open Link"
-msgstr "_Avaa linkki"
-
-#: ../src/ephy-window.c:222
 msgid "Open Link in New _Window"
 msgstr "Avaa linkki _uudessa ikkunassa"
 
-#: ../src/ephy-window.c:224
+#: ../src/ephy-window.c:222
 msgid "Open Link in New _Tab"
 msgstr "Avaa linkki uudessa _välilehdessä"
 
-#: ../src/ephy-window.c:226
-msgid "_Download Link"
-msgstr "_Tallenna linkki"
-
-#: ../src/ephy-window.c:228
+#: ../src/ephy-window.c:224
 msgid "_Save Link As…"
 msgstr "Tallenna linkki _nimellä…"
 
-#: ../src/ephy-window.c:230
-msgid "_Bookmark Link…"
-msgstr "_Lisää linkki kirjanmerkkeihin…"
-
-#: ../src/ephy-window.c:232
+#: ../src/ephy-window.c:226
 msgid "_Copy Link Address"
 msgstr "_Kopioi linkin osoite"
 
-#: ../src/ephy-window.c:234
+#: ../src/ephy-window.c:228
 msgid "_Copy E-mail Address"
 msgstr "Kopioi  s_ähköpostiosoite"
 
 #. Images.
-#: ../src/ephy-window.c:239
-msgid "Open _Image"
-msgstr "Avaa _kuva"
+#: ../src/ephy-window.c:233
+#| msgid "Open _Image"
+msgid "View _Image"
+msgstr "Näytä _kuva"
 
-#: ../src/ephy-window.c:241
+#: ../src/ephy-window.c:235
+msgid "Copy I_mage Address"
+msgstr "Kopioi kuvan _osoite"
+
+#: ../src/ephy-window.c:237
 msgid "_Save Image As…"
 msgstr "_Tallenna kuva nimellä…"
 
-#: ../src/ephy-window.c:243
-msgid "_Use Image As Background"
-msgstr "_Käytä kuvaa taustana"
-
-#: ../src/ephy-window.c:245
-msgid "Copy I_mage Address"
-msgstr "Kopioi kuvan _osoite"
+#: ../src/ephy-window.c:239
+msgid "Set as _Wallpaper"
+msgstr "Aseta ta_ustakuvaksi"
 
-#: ../src/ephy-window.c:247
+#: ../src/ephy-window.c:241
 msgid "St_art Animation"
 msgstr "_Käynnistä animaatio"
 
-#: ../src/ephy-window.c:249
+#: ../src/ephy-window.c:243
 msgid "St_op Animation"
 msgstr "_Pysäytä animaatio"
 
-#: ../src/ephy-window.c:455
+#: ../src/ephy-window.c:451
 msgid "There are unsubmitted changes to form elements"
 msgstr "Lähettämättömän lomakkeen kenttiä on muutettu"
 
-#: ../src/ephy-window.c:456
+#: ../src/ephy-window.c:452
 msgid "If you close the document anyway, you will lose that information."
 msgstr "Jos suljet asiakirjan tästä huolimatta, menetät nämä tiedot."
 
-#: ../src/ephy-window.c:458
+#: ../src/ephy-window.c:454
 msgid "Close _Document"
 msgstr "_Sulje asiakirja"
 
-#: ../src/ephy-window.c:473
+#: ../src/ephy-window.c:469
 msgid "There are ongoing downloads in this window"
 msgstr "Tässä ikkunassa on latauksia meneillään"
 
-#: ../src/ephy-window.c:474
+#: ../src/ephy-window.c:470
 msgid "If you close this window, the downloads will be cancelled"
 msgstr "Jos suljet tämän ikkunan, lataukset perutaan"
 
-#: ../src/ephy-window.c:475
+#: ../src/ephy-window.c:471
 msgid "Close window and cancel downloads"
 msgstr "Sulje ikkuna ja peru lataukset"
 
-#: ../src/ephy-window.c:1177
+#: ../src/ephy-window.c:1148
 msgid "Save As"
 msgstr "Tallenna nimellä"
 
-#: ../src/ephy-window.c:1179
+#: ../src/ephy-window.c:1150
 msgid "Save As Application"
 msgstr "Tallenna sovelluksena"
 
-#: ../src/ephy-window.c:1181
+#: ../src/ephy-window.c:1152
 msgid "Print"
 msgstr "Tulosta"
 
-#: ../src/ephy-window.c:1183
+#: ../src/ephy-window.c:1154
 msgid "Bookmark"
 msgstr "Kirjanmerkki"
 
-#: ../src/ephy-window.c:1185
+#: ../src/ephy-window.c:1156
 msgid "Find"
 msgstr "Etsi"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1194
+#: ../src/ephy-window.c:1165
 msgid "Larger"
 msgstr "Suurempi"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1197
+#: ../src/ephy-window.c:1168
 msgid "Smaller"
 msgstr "Pienempi"
 
-#: ../src/ephy-window.c:1225
+#: ../src/ephy-window.c:1196
 msgid "Back"
 msgstr "Edellinen"
 
-#: ../src/ephy-window.c:1237
+#: ../src/ephy-window.c:1208
 msgid "Forward"
 msgstr "Seuraava"
 
-#: ../src/ephy-window.c:1249
+#: ../src/ephy-window.c:1220
 msgid "Zoom"
 msgstr "Mittakaava"
 
-#: ../src/ephy-window.c:1258
+#: ../src/ephy-window.c:1229
 msgid "New _Tab"
 msgstr "Uusi _välilehti"
 
-#: ../src/ephy-window.c:1266
+#: ../src/ephy-window.c:1237
 msgid "Go to most visited"
 msgstr "Siirry useimmin vierailtuihin"
 
-#: ../src/popup-commands.c:258
-msgid "Download Link"
-msgstr "Tallenna linkki"
-
-#: ../src/popup-commands.c:266
+#: ../src/popup-commands.c:237
 msgid "Save Link As"
 msgstr "Tallenna linkki _nimellä"
 
-#: ../src/popup-commands.c:273
+#: ../src/popup-commands.c:243
 msgid "Save Image As"
 msgstr "Tallenna kuva nimellä"
 
@@ -2605,7 +2550,7 @@ msgstr "Tallenna kuva nimellä"
 #. * second %s is the locale name. Example:
 #. * "French (France)"
 #.
-#: ../src/prefs-dialog.c:535 ../src/prefs-dialog.c:541
+#: ../src/prefs-dialog.c:553 ../src/prefs-dialog.c:559
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
@@ -2614,109 +2559,114 @@ 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:550
+#: ../src/prefs-dialog.c:568
 #, c-format
 msgctxt "language"
 msgid "User defined (%s)"
 msgstr "Käyttäjän määrittelemä (%s)"
 
-#: ../src/prefs-dialog.c:572
+#: ../src/prefs-dialog.c:590
 #, c-format
 msgid "System language (%s)"
 msgid_plural "System languages (%s)"
 msgstr[0] "Järjestelmän kieli (%s)"
 msgstr[1] "Järjestelmän kielet (%s)"
 
-#: ../src/prefs-dialog.c:904
+#: ../src/prefs-dialog.c:922
 msgid "Select a Directory"
 msgstr "Valitse kansio"
 
-#: ../src/window-commands.c:778
+#. 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 "http://duckduckgo.com/?q=%s&amp;t=epiphany";
+msgid "https://duckduckgo.com/?q=%s&t=epiphany";
+msgstr "https://duckduckgo.com/?q=%s&t=epiphany";
+
+#. 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 "https://google.fi/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 "Verkkosovellus nimeltä ”%s” on jo olemassa. Korvataanko se?"
 
-#: ../src/window-commands.c:783
+#: ../src/window-commands.c:714
 msgid "Replace"
 msgstr "Korvaa"
 
-#: ../src/window-commands.c:787
+#: ../src/window-commands.c:718
 msgid ""
 "An application with the same name already exists. Replacing it will "
 "overwrite it."
 msgstr ""
 "Tämän niminen sovellus on jo olemassa. Sen korvaaminen ylikirjoittaa sen."
 
-#: ../src/window-commands.c:823
+#: ../src/window-commands.c:754
 #, c-format
 msgid "The application '%s' is ready to be used"
 msgstr "Sovellus ”%s” on valmiina käyttöön"
 
-#: ../src/window-commands.c:826
+#: ../src/window-commands.c:757
 #, c-format
 msgid "The application '%s' could not be created"
 msgstr "Sovellusta ”%s” ei voitu luoda"
 
-#: ../src/window-commands.c:834
+#: ../src/window-commands.c:765
 msgid "Launch"
 msgstr "Käynnistä"
 
 #. Show dialog with icon, title.
-#: ../src/window-commands.c:874
+#: ../src/window-commands.c:805
 msgid "Create Web Application"
 msgstr "Luo verkkosovellus"
 
-#: ../src/window-commands.c:879
+#: ../src/window-commands.c:810
 msgid "C_reate"
 msgstr "_Luo"
 
-#: ../src/window-commands.c:1495
-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 ""
-"Gnomen www-selain on vapaa ohjelma; sitä on sallittu levittää edelleen ja "
-"muuttaa GNU yleisen lisenssin (GPL lisenssin) ehtojen mukaan sellaisina kuin "
-"Free Software Foundation on ne julkaissut; joko Lisenssin version 2, tai "
-"(valinnan mukaan) minkä tahansa myöhemmän version mukaisesti."
-
-#: ../src/window-commands.c:1499
-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 ""
-"Gnomen WWW-selainta levitetään siinä toivossa, että se olisi hyödyllinen, "
-"mutta ilman mitään takuuta; ilman edes hiljaista takuuta kaupallisesti "
-"hyväksyttävästä laadusta tai soveltuvuudesta tiettyyn tarkoitukseen. Katso "
-"GPL lisenssistä lisää yksityiskohtia."
-
-#: ../src/window-commands.c:1503
-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 ""
-"Tämän ohjelman mukana pitäisi tulla kopio GPL lisenssistä; jos näin ei ole, "
-"kirjoita osoitteeseen Free Software Foundation Inc., 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-1301, USA."
-
-#: ../src/window-commands.c:1549 ../src/window-commands.c:1572
+#: ../src/window-commands.c:1473 ../src/window-commands.c:1496
 msgid "Contact us at:"
 msgstr "Ota yhteyttä osoitteessa:"
 
-#: ../src/window-commands.c:1552
+#: ../src/window-commands.c:1476
 msgid "Contributors:"
 msgstr "Avustajat:"
 
-#: ../src/window-commands.c:1555
+#: ../src/window-commands.c:1479
 msgid "Past developers:"
 msgstr "Aikaisemmat kehittäjät:"
 
-#: ../src/window-commands.c:1581
+#: ../src/window-commands.c:1505
 #, c-format
 msgid ""
 "A simple, clean, beautiful view of the web.\n"
@@ -2733,7 +2683,7 @@ msgstr ""
 #. * this translation; in that case, please write each of them on a separate
 #. * line seperated by newlines (\n).
 #.
-#: ../src/window-commands.c:1610
+#: ../src/window-commands.c:1528
 msgid "translator-credits"
 msgstr ""
 "Jiri Grönroos, 2012\n"
@@ -2743,15 +2693,15 @@ msgstr ""
 "\n"
 "http://gnome.fi/";
 
-#: ../src/window-commands.c:1613
+#: ../src/window-commands.c:1531
 msgid "Web Website"
 msgstr "Gnomen WWW-selaimen WWW-sivut"
 
-#: ../src/window-commands.c:1753
+#: ../src/window-commands.c:1670
 msgid "Enable caret browsing mode?"
 msgstr "Käytetäänkö kohdistinselaintilaa?"
 
-#: ../src/window-commands.c:1756
+#: ../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 "
@@ -2761,10 +2711,169 @@ msgstr ""
 "käytöstä. Näin sivuille asetetaan liikuteltava kursori, jonka avulla sivulla "
 "on mahdollista liikkua. Haluatko ottaa nuolilla liikkumisen käyttöön?"
 
-#: ../src/window-commands.c:1759
+#: ../src/window-commands.c:1676
 msgid "_Enable"
 msgstr "_Käytä"
 
+#~ msgid "Show toolbars by default"
+#~ msgstr "Näytä työkalupalkit oletuksena"
+
+#~ msgid "Use GNOME desktop wide font configuration."
+#~ msgstr "Käytä Gnome-työpöydän kirjasinasetuksia."
+
+#~ msgid "Whether to show the title column in the history window."
+#~ msgstr "Näytetäänkö Otsikko-sarake historiaikkunassa."
+
+#~ msgid "Whether to show the address column in the history window."
+#~ msgstr "Näytetäänkö Osoite-sarake historiaikkunassa."
+
+#~ msgid "Whether to show the date-time column in the history window."
+#~ msgstr "Näytetäänkö Päiväys-sarake kirjanmerkkien ikkunassa."
+
+#~ msgid "Oops! Error loading %s"
+#~ msgstr "Oho! Virhe ladattaessa kohteesta %s"
+
+#~ msgid ""
+#~ "Oops! This site might have caused the web browser to close unexpectedly"
+#~ msgstr ""
+#~ "Oho! Tämä sivusto taisi saada selaimen sulkeutumaan odottamattomalla "
+#~ "tavalla"
+
+#~ msgid "Oops! Something went wrong displaying %s"
+#~ msgstr "Hups! Jokin meni pieleen näyttäessä sivua %s"
+
+#~ msgid "%u:%02u hour left"
+#~ msgid_plural "%u:%02u hours left"
+#~ msgstr[0] "%u:%02u tuntia jäljellä"
+#~ msgstr[1] "%u:%02u tunti jäljellä"
+
+#~ msgid "All sites"
+#~ msgstr "Kaikki sivustot"
+
+#~ msgid "Sites"
+#~ msgstr "Sivustot"
+
+#~ msgid "%d _Similar"
+#~ msgid_plural "%d _Similar"
+#~ msgstr[0] "%d _samanlainen"
+#~ msgstr[1] "%d _samanlaista"
+
+#~ msgid "_Unify With %d Identical Bookmark"
+#~ msgid_plural "_Unify With %d Identical Bookmarks"
+#~ msgstr[0] "_Yhdistä %d identtisen kirjanmerkin kanssa"
+#~ msgstr[1] "_Yhdistä %d identtisen kirjanmerkin kanssa"
+
+#~ msgid "Show “%s”"
+#~ msgstr "Näytä ”%s”"
+
+#~| msgid "Cookie accept"
+#~ msgid "Cookie Name"
+#~ msgstr "Evästeen nimi"
+
+#~ msgid "<b>_Automatic</b>"
+#~ msgstr "<b>_Automaattinen</b>"
+
+#~| msgid "_Show passwords"
+#~ msgid "Show Passwords"
+#~ msgstr "Näytä salasanat"
+
+#~ msgid "Open the selected history link in a new window"
+#~ msgstr "Avaa valittu linkki sivuhistoriasta uuteen ikkunaan"
+
+#~ msgid "Open the selected history link in a new tab"
+#~ msgstr "Avaa valittu linkki sivuhistoriasta uuteen välilehteen"
+
+#~ msgid "Bookmark the selected history link"
+#~ msgstr "Lisää kirjamerkki valitulle sivuhistorian linkille"
+
+#~ msgid "Close the history window"
+#~ msgstr "Sulje sivuhistoria"
+
+#~ msgid "Delete the selected history link"
+#~ msgstr "Poista valittu linkki sivuhistoriasta"
+
+#~ msgid "Select all history links or text"
+#~ msgstr "Valitse kaikki linkit tai teksti sivuhistoriasta"
+
+#~ msgid "Clear _History"
+#~ msgstr "Tyhjennä sivu_historia"
+
+#~ msgid "Clear your browsing history"
+#~ msgstr "Tyhjentää aiemmin selattujen sivujen historian"
+
+#~ msgid "Display history help"
+#~ msgstr "Näytä sivuhistorian ohje"
+
+#~ msgid "_Address"
+#~ msgstr "_Osoite"
+
+#~ msgid "_Date and Time"
+#~ msgstr "_Päiväys ja aika"
+
+#~ msgid "Show the date and time column"
+#~ msgstr "Näytä päiväys- ja aikasarake"
+
+#~ msgid "Last 30 minutes"
+#~ msgstr "Viimeiset 30 minuuttia"
+
+#~ msgid "Today"
+#~ msgstr "Tänään"
+
+#~ msgid "Last %d day"
+#~ msgid_plural "Last %d days"
+#~ msgstr[0] "Viimeisin %d päivä"
+#~ msgstr[1] "Viimeisimmät %d päivää"
+
+#~ msgid "All history"
+#~ msgstr "Koko historia"
+
+#~ msgid "_Open Link"
+#~ msgstr "_Avaa linkki"
+
+#~ msgid "_Download Link"
+#~ msgstr "_Tallenna linkki"
+
+#~ msgid "_Bookmark Link…"
+#~ msgstr "_Lisää linkki kirjanmerkkeihin…"
+
+#~ msgid "_Use Image As Background"
+#~ msgstr "_Käytä kuvaa taustana"
+
+#~ msgid "Download Link"
+#~ msgstr "Tallenna linkki"
+
+#~ 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 ""
+#~ "Gnomen www-selain on vapaa ohjelma; sitä on sallittu levittää edelleen ja "
+#~ "muuttaa GNU yleisen lisenssin (GPL lisenssin) ehtojen mukaan sellaisina "
+#~ "kuin Free Software Foundation on ne julkaissut; joko Lisenssin version 2, "
+#~ "tai (valinnan mukaan) minkä tahansa myöhemmän version mukaisesti."
+
+#~ 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 ""
+#~ "Gnomen WWW-selainta levitetään siinä toivossa, että se olisi hyödyllinen, "
+#~ "mutta ilman mitään takuuta; ilman edes hiljaista takuuta kaupallisesti "
+#~ "hyväksyttävästä laadusta tai soveltuvuudesta tiettyyn tarkoitukseen. "
+#~ "Katso GPL lisenssistä lisää yksityiskohtia."
+
+#~ 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 ""
+#~ "Tämän ohjelman mukana pitäisi tulla kopio GPL lisenssistä; jos näin ei "
+#~ "ole, kirjoita osoitteeseen Free Software Foundation Inc., 51 Franklin "
+#~ "Street, Fifth Floor, Boston, MA 02110-1301, USA."
+
 #~ msgid "Not now"
 #~ msgstr "Ei nyt"
 
@@ -2830,9 +2939,6 @@ msgstr "_Käytä"
 #~ msgid "Domain"
 #~ msgstr "Verkkoalue"
 
-#~ msgid "Name"
-#~ msgstr "Nimi"
-
 #~ msgid "Host"
 #~ msgstr "Verkkonimi"
 
@@ -2851,9 +2957,6 @@ msgstr "_Käytä"
 #~ msgid "Epiphany can't be used now. Initialization failed."
 #~ msgstr "Epiphanya ei voi käyttää nyt: Alustus epäonnistui."
 
-#~ msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8";
-#~ msgstr "http://www.google.fi/search?q=%s&ie=UTF-8&oe=UTF-8";
-
 #~ msgid "%s Files"
 #~ msgstr "%s tiedostoa"
 
@@ -2866,9 +2969,6 @@ msgstr "_Käytä"
 #~ msgid "Lists the active extensions."
 #~ msgstr "Luettelo aktiivista laajennuksista."
 
-#~ msgid "Plugins"
-#~ msgstr "Liitännäiset"
-
 #~ msgid "File is not a valid .desktop file"
 #~ msgstr "Tiedosto ei ole kelvollinen .desktop-tiedosto"
 
@@ -2892,9 +2992,6 @@ msgstr "_Käytä"
 #~ msgid "Not a launchable item"
 #~ msgstr "Ei ole käynnistettävä kohde"
 
-#~ msgid "_Search:"
-#~ msgstr "_Etsi:"
-
 #~ msgid "Enable Java_Script"
 #~ msgstr "Käytä Java_Scriptiä"