diff --git a/po/en_GB.po b/po/en_GB.po
index 0a928471..84b14b36 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: midori 0.1.2\n"
+"Project-Id-Version: midori 0.1.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-01 20:25+0100\n"
+"POT-Creation-Date: 2009-07-20 01:57+0200\n"
 "PO-Revision-Date: 2008-11-29 23:39+0100\n"
 "Last-Translator: Abigail Brady <morwen@evilmagic.org>\n"
 "Language-Team: British English <en_GB@li.org>\n"
@@ -20,9 +20,9 @@ msgstr ""
 msgid "Lightweight web browser"
 msgstr "Lightweight web browser"
 
-#: ../data/midori.desktop.in.h:2 ../midori/main.c:1950 ../midori/main.c:2056
-#: ../midori/main.c:2065 ../midori/main.c:2076
-#: ../midori/midori-websettings.c:259
+#: ../data/midori.desktop.in.h:2 ../midori/main.c:1344 ../midori/main.c:1498
+#: ../midori/main.c:1506 ../midori/main.c:1517
+#: ../midori/midori-websettings.c:285
 msgid "Midori"
 msgstr "Midori"
 
@@ -30,1446 +30,1733 @@ msgstr "Midori"
 msgid "Web Browser"
 msgstr "Web Browser"
 
-#: ../midori/main.c:90
-msgid "_Bookmark"
-msgstr "_Bookmark"
-
-#: ../midori/main.c:91 ../midori/midori-browser.c:3830
-msgid "_Bookmarks"
-msgstr "_Bookmarks"
-
-#: ../midori/main.c:92
-msgid "_Add Bookmark"
-msgstr "_Add Bookmark"
-
-#: ../midori/main.c:93
-msgid "_Console"
-msgstr "_Console"
-
-#: ../midori/main.c:94
-msgid "_Extensions"
-msgstr "_Extensions"
-
-#: ../midori/main.c:95
-msgid "_History"
-msgstr "_History"
-
 #: ../midori/main.c:96
-msgid "_Homepage"
-msgstr "_Homepage"
-
-#: ../midori/main.c:97
-msgid "_Userscripts"
-msgstr "_Userscripts"
-
-#: ../midori/main.c:98
-msgid "User_styles"
-msgstr "User_styles"
-
-#: ../midori/main.c:99
-msgid "New _Tab"
-msgstr "New _Tab"
-
-#: ../midori/main.c:100
-msgid "_Transfers"
-msgstr "_Transfers"
-
-#: ../midori/main.c:101
-msgid "_Closed Tabs and Windows"
-msgstr "_Closed Tabs and Windows"
-
-#: ../midori/main.c:102
-msgid "New _Window"
-msgstr "New _Window"
-
-#: ../midori/main.c:158
 #, c-format
 msgid "The configuration couldn't be loaded: %s\n"
 msgstr "The configuration couldn't be loaded: %s\n"
 
-#: ../midori/main.c:213
+#: ../midori/main.c:151
 #, c-format
 msgid "Value '%s' is invalid for %s"
 msgstr "Value '%s' is invalid for %s"
 
-#: ../midori/main.c:220 ../midori/main.c:290
+#: ../midori/main.c:158 ../midori/main.c:238
 #, c-format
 msgid "Invalid configuration value '%s'"
 msgstr "Invalid configuration value '%s'"
 
-#: ../midori/main.c:532
-msgid "File not found."
-msgstr "File not found."
-
-#: ../midori/main.c:540 ../midori/main.c:549
-msgid "Malformed document."
-msgstr "Malformed document."
-
-#: ../midori/main.c:571
+#: ../midori/main.c:350
 #, c-format
 msgid "Failed to open database: %s\n"
 msgstr "Failed to open database: %s\n"
 
-#: ../midori/main.c:603
-#, fuzzy, c-format
+#: ../midori/main.c:382
+#, c-format
 msgid "Failed to execute database statement: %s\n"
-msgstr "Failed to open database: %s\n"
+msgstr ""
 
-#: ../midori/main.c:657
+#: ../midori/main.c:436
 #, c-format
 msgid "Failed to remove history item: %s\n"
 msgstr "Failed to remove history item: %s\n"
 
-#: ../midori/main.c:681
+#: ../midori/main.c:460
 #, c-format
 msgid "Failed to clear history: %s\n"
 msgstr "Failed to clear history: %s\n"
 
-#: ../midori/main.c:704 ../midori/main.c:738 ../midori/main.c:754
+#: ../midori/main.c:483 ../midori/main.c:517 ../midori/main.c:533
 #, c-format
 msgid "Failed to add history item: %s\n"
 msgstr "Failed to add history item: %s\n"
 
 #. i18n: Couldn't remove items that are older than n days
-#: ../midori/main.c:934
+#: ../midori/main.c:712
 #, c-format
 msgid "Failed to remove old history items: %s\n"
 msgstr "Failed to remove old history items: %s\n"
 
-#: ../midori/main.c:962
+#: ../midori/main.c:741
 #, c-format
 msgid "The configuration couldn't be saved. %s"
 msgstr "The configuration couldn't be saved. %s"
 
-#: ../midori/main.c:991
+#: ../midori/main.c:779
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr "The search engines couldn't be saved. %s"
 
-#: ../midori/main.c:1121 ../midori/sokoke.c:531
-#, c-format
-msgid "Writing failed."
-msgstr "Writing failed."
-
-#: ../midori/main.c:1142 ../midori/main.c:1169 ../midori/main.c:1197
+#: ../midori/main.c:798 ../midori/main.c:826 ../midori/main.c:855
 #, c-format
 msgid "The bookmarks couldn't be saved. %s"
 msgstr "The bookmarks couldn't be saved. %s"
 
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:1221 ../midori/main.c:1245
+#: ../midori/main.c:878 ../midori/main.c:901
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr "The wastebasket couldn't be saved. %s"
 
-#: ../midori/main.c:1271 ../midori/midori-preferences.c:386
-msgid "Transfers"
-msgstr "Transfers"
-
-#: ../midori/main.c:1312
+#: ../midori/main.c:974
 #, c-format
 msgid "The session couldn't be saved. %s"
 msgstr "The session couldn't be saved. %s"
 
-#: ../midori/main.c:1636
-msgid "Authentication Required"
-msgstr "Authentication Required"
-
-#: ../midori/main.c:1652
+#: ../midori/main.c:1101
 msgid ""
-"A username and a password are required\n"
-"to open this location:"
+"Midori seems to have crashed the last time it was opened. If this happened "
+"repeatedly, try one of the following options to solve the problem."
 msgstr ""
-"A username and a password are required\n"
-"to open this location:"
+"Midori seems to have crashed the last time it was opened. If this happened "
+"repeatedly, try one of the following options to solve the problem."
 
-#: ../midori/main.c:1666
-msgid "Username"
-msgstr "Username"
-
-#: ../midori/main.c:1677
-msgid "Password"
-msgstr "Password"
-
-#: ../midori/main.c:1783
-msgid ""
-"Midori seems to have crashed the last time it was opened. If this "
-"happened repeatedly, try one of the following options to solve the problem."
-msgstr ""
-"Midori seems to have crashed the last time it was opened. If this "
-"happened repeatedly, try one of the following options to solve the problem."
-
-#: ../midori/main.c:1798
+#: ../midori/main.c:1116
 msgid "Modify _preferences"
 msgstr "Modify _preferences"
 
-#: ../midori/main.c:1802
+#: ../midori/main.c:1120
 msgid "Reset the last _session"
 msgstr "Reset the last _session"
 
-#: ../midori/main.c:1807
+#: ../midori/main.c:1125
 msgid "Disable all _extensions"
 msgstr "Disable all _extensions"
 
-#: ../midori/main.c:1950
+#: ../midori/main.c:1344
 msgid "No filename specified"
 msgstr "No filename specified"
 
-#: ../midori/main.c:1982 ../midori/gjs.c:514
+#: ../midori/main.c:1367
 msgid "An unknown error occured."
 msgstr "An unknown error occured."
 
-#: ../midori/main.c:2005
+#: ../midori/main.c:1400
+#, c-format
+msgid "Snapshot saved to: %s\n"
+msgstr ""
+
+#: ../midori/main.c:1435
+msgid "Run ADDRESS as a web application"
+msgstr ""
+
+#: ../midori/main.c:1435
+msgid "ADDRESS"
+msgstr ""
+
+#: ../midori/main.c:1437
+msgid "Use FOLDER as configuration folder"
+msgstr ""
+
+#: ../midori/main.c:1437
+msgid "FOLDER"
+msgstr ""
+
+#: ../midori/main.c:1440
 msgid "Run the specified filename as javascript"
 msgstr "Run the specified filename as javascript"
 
-#: ../midori/main.c:2007
+#: ../midori/main.c:1444
+msgid "Take a snapshot of the specified URI"
+msgstr ""
+
+#: ../midori/main.c:1447
+msgid "Execute the specified command"
+msgstr ""
+
+#: ../midori/main.c:1449
 msgid "Display program version"
 msgstr "Display program version"
 
-#: ../midori/main.c:2009
+#: ../midori/main.c:1451
 msgid "Addresses"
 msgstr "Addresses"
 
-#: ../midori/main.c:2053
+#: ../midori/main.c:1495
 msgid "[Addresses]"
 msgstr "[Addresses]"
 
-#: ../midori/main.c:2077
+#: ../midori/main.c:1518
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Please report comments, suggestions and bugs to:"
 
-#: ../midori/main.c:2079
+#: ../midori/main.c:1520
 msgid "Check for new versions at:"
 msgstr "Check for new versions at:"
 
-#: ../midori/main.c:2106
+#: ../midori/main.c:1602
+msgid "The specified configuration folder is invalid."
+msgstr "The specified configuration folder is invalid."
+
+#: ../midori/main.c:1638
 msgid "An instance of Midori is already running but not responding.\n"
 msgstr "An instance of Midori is already running but not responding.\n"
 
-#: ../midori/main.c:2184
-#, fuzzy, c-format
+#: ../midori/main.c:1688
+#, c-format
 msgid "The search engines couldn't be loaded. %s\n"
-msgstr "The search engines couldn't be saved. %s"
+msgstr "The search engines couldn't be loaded. %s\n"
 
-#: ../midori/main.c:2196
+#: ../midori/main.c:1700
 #, c-format
 msgid "The bookmarks couldn't be loaded: %s\n"
 msgstr "The bookmarks couldn't be loaded: %s\n"
 
-#: ../midori/main.c:2211
+#: ../midori/main.c:1715
 #, c-format
 msgid "The session couldn't be loaded: %s\n"
 msgstr "The session couldn't be loaded: %s\n"
 
-#: ../midori/main.c:2224
+#: ../midori/main.c:1728
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "The wastebasket couldn't be loaded: %s\n"
 
-#: ../midori/main.c:2237
+#: ../midori/main.c:1741
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "The history couldn't be loaded: %s\n"
 
-#: ../midori/main.c:2249
+#: ../midori/main.c:1753
 msgid "The following errors occured:"
 msgstr "The following errors occured:"
 
-#: ../midori/main.c:2265
+#: ../midori/main.c:1769
 msgid "_Ignore"
 msgstr "_Ignore"
 
-#: ../midori/midori-browser.c:258 ../midori/midori-browser.c:3164
-#: ../midori/midori-browser.c:3170
+#: ../midori/midori-array.c:250
+msgid "File not found."
+msgstr "File not found."
+
+#: ../midori/midori-array.c:258 ../midori/midori-array.c:267
+msgid "Malformed document."
+msgstr "Malformed document."
+
+#: ../midori/midori-array.c:429 ../midori/sokoke.c:700
+#, c-format
+msgid "Writing failed."
+msgstr "Writing failed."
+
+#: ../midori/midori-browser.c:304 ../midori/midori-browser.c:4177
+#: ../midori/midori-browser.c:4183
 msgid "Reload the current page"
 msgstr "Reload the current page"
 
-#: ../midori/midori-browser.c:270 ../midori/midori-browser.c:3167
+#: ../midori/midori-browser.c:315 ../midori/midori-browser.c:4180
 msgid "Stop loading the current page"
 msgstr "Stop loading the current page"
 
-#: ../midori/midori-browser.c:328
+#: ../midori/midori-browser.c:410
 #, c-format
 msgid "%d%% loaded"
 msgstr "%d%% loaded"
 
-#: ../midori/midori-browser.c:351
+#: ../midori/midori-browser.c:435
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "Unexpected action '%s'."
 
-#: ../midori/midori-browser.c:524
+#: ../midori/midori-browser.c:617
+msgid "New folder"
+msgstr "New folder"
+
+#: ../midori/midori-browser.c:617
+msgid "Edit folder"
+msgstr ""
+
+#: ../midori/midori-browser.c:619
 msgid "New bookmark"
 msgstr "New bookmark"
 
-#: ../midori/midori-browser.c:524
+#: ../midori/midori-browser.c:619
 msgid "Edit bookmark"
 msgstr "Edit bookmark"
 
-#: ../midori/midori-browser.c:546
+#: ../midori/midori-browser.c:649
 msgid "_Title:"
 msgstr "_Title:"
 
-#: ../midori/midori-browser.c:559 ../midori/midori-searchaction.c:836
+#: ../midori/midori-browser.c:662 ../midori/midori-searchaction.c:948
 msgid "_Description:"
 msgstr "_Description:"
 
-#: ../midori/midori-browser.c:578 ../midori/midori-searchaction.c:850
+#: ../midori/midori-browser.c:681 ../midori/midori-searchaction.c:962
+#: ../extensions/feed-panel/main.c:343
 msgid "_Address:"
 msgstr "_Address:"
 
-#: ../midori/midori-browser.c:596
+#: ../midori/midori-browser.c:700
 msgid "_Folder:"
 msgstr "_Folder:"
 
-#: ../midori/midori-browser.c:601 ../midori/midori-browser.c:638
+#: ../midori/midori-browser.c:705 ../midori/midori-browser.c:746
 msgid "Toplevel folder"
 msgstr "Toplevel folder"
 
-#: ../midori/midori-browser.c:713
+#: ../midori/midori-browser.c:822
 msgid "Save file as"
 msgstr "Save file as"
 
-#: ../midori/midori-browser.c:1302
+#: ../midori/midori-browser.c:1169
+#, c-format
+msgid "The file <b>%s</b> has been downloaded."
+msgstr ""
+
+#: ../midori/midori-browser.c:1173
+msgid "Transfer completed"
+msgstr ""
+
+#: ../midori/midori-browser.c:1314
+msgid "Save file"
+msgstr "Save file"
+
+#: ../midori/midori-browser.c:1960
 msgid "Open file"
 msgstr "Open file"
 
-#: ../midori/midori-browser.c:2524 ../panels/midori-bookmarks.c:690
+#: ../midori/midori-browser.c:3429 ../panels/midori-bookmarks.c:781
+#: ../panels/midori-history.c:812
+msgid "Open all in _Tabs"
+msgstr "Open all in _Tabs"
+
+#: ../midori/midori-browser.c:3436 ../panels/midori-bookmarks.c:787
+#: ../panels/midori-history.c:818 ../extensions/feed-panel/feed-panel.c:542
 msgid "Open in New _Tab"
 msgstr "Open in New _Tab"
 
-#: ../midori/midori-browser.c:2526 ../panels/midori-bookmarks.c:692
+#: ../midori/midori-browser.c:3439 ../panels/midori-bookmarks.c:789
+#: ../panels/midori-history.c:820 ../extensions/feed-panel/feed-panel.c:544
 msgid "Open in New _Window"
 msgstr "Open in New _Window"
 
-#: ../midori/midori-browser.c:2788
-#, c-format
-msgid "A week ago"
-msgstr "A week ago"
+#: ../midori/midori-browser.c:3739
+msgid "Clear Private Data"
+msgstr ""
 
-#: ../midori/midori-browser.c:2794
-#, c-format
-msgid "%d days ago"
-msgstr "%d days ago"
+#: ../midori/midori-browser.c:3743
+msgid "_Clear private data"
+msgstr ""
 
-#: ../midori/midori-browser.c:2801
-msgid "Today"
-msgstr "Today"
+#: ../midori/midori-browser.c:3756
+msgid "Clear the following data:"
+msgstr ""
 
-#: ../midori/midori-browser.c:2803
-msgid "Yesterday"
-msgstr "Yesterday"
+#: ../midori/midori-browser.c:3766 ../midori/midori-preferences.c:675
+#: ../panels/midori-history.c:108
+msgid "History"
+msgstr "History"
 
-#: ../midori/midori-browser.c:2892
+#: ../midori/midori-browser.c:3771
+msgid "Cookies"
+msgstr "Cookies"
+
+#: ../midori/midori-browser.c:3776
+msgid "'Flash' Cookies"
+msgstr "'Flash' Cookies"
+
+#: ../midori/midori-browser.c:3781
+msgid "Website icons"
+msgstr ""
+
+#: ../midori/midori-browser.c:3786 ../midori/sokoke.c:874
+msgid "_Closed Tabs and Windows"
+msgstr "_Closed Tabs and Windows"
+
+#: ../midori/midori-browser.c:3869
 msgid "A lightweight web browser."
 msgstr "A lightweight web browser."
 
-#: ../midori/midori-browser.c:2900
+#: ../midori/midori-browser.c:3877
 msgid "translator-credits"
 msgstr ""
 "Bastien Nocera <hadess@hadess.net>\n"
 "Abigail Brady <morwen@evilmagic.org>"
 
-#: ../midori/midori-browser.c:3044
-msgid "Are you sure you want to remove all history items?"
-msgstr "Are you sure you want to remove all history items?"
-
-#: ../midori/midori-browser.c:3098
+#: ../midori/midori-browser.c:4111
 msgid "_File"
 msgstr "_File"
 
-#: ../midori/midori-browser.c:3101
+#: ../midori/midori-browser.c:4114
 msgid "Open a new window"
 msgstr "Open a new window"
 
-#: ../midori/midori-browser.c:3104
+#: ../midori/midori-browser.c:4117
 msgid "Open a new tab"
 msgstr "Open a new tab"
 
-#: ../midori/midori-browser.c:3107
+#: ../midori/midori-browser.c:4120
 msgid "Open a file"
 msgstr "Open a file"
 
-#: ../midori/midori-browser.c:3110
+#: ../midori/midori-browser.c:4123
 msgid "Save to a file"
 msgstr "Save to a file"
 
-#: ../midori/midori-browser.c:3112
+#: ../midori/midori-browser.c:4125
+msgid "Add to Speed _dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:4126
+msgid "Add shortcut to speed dial"
+msgstr ""
+
+#: ../midori/midori-browser.c:4128
 msgid "_Close Tab"
 msgstr "_Close Tab"
 
-#: ../midori/midori-browser.c:3113
+#: ../midori/midori-browser.c:4129
 msgid "Close the current tab"
 msgstr "Close the current tab"
 
-#: ../midori/midori-browser.c:3115
+#: ../midori/midori-browser.c:4131
 msgid "C_lose Window"
 msgstr "C_lose Window"
 
-#: ../midori/midori-browser.c:3116
+#: ../midori/midori-browser.c:4132
 msgid "Close this window"
 msgstr "Close this window"
 
-#: ../midori/midori-browser.c:3119
+#: ../midori/midori-browser.c:4135
 msgid "Print the current page"
 msgstr "Print the current page"
 
-#: ../midori/midori-browser.c:3122
+#: ../midori/midori-browser.c:4138
 msgid "Quit the application"
 msgstr "Quit the application"
 
-#: ../midori/midori-browser.c:3124
+#: ../midori/midori-browser.c:4140
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../midori/midori-browser.c:3127
+#: ../midori/midori-browser.c:4143
 msgid "Cut the selected text"
 msgstr "Cut the selected text"
 
-#: ../midori/midori-browser.c:3130 ../midori/midori-browser.c:3133
+#: ../midori/midori-browser.c:4146 ../midori/midori-browser.c:4149
 msgid "Copy the selected text"
 msgstr "Copy the selected text"
 
-#: ../midori/midori-browser.c:3136
+#: ../midori/midori-browser.c:4152
 msgid "Paste text from the clipboard"
 msgstr "Paste text from the clipboard"
 
-#: ../midori/midori-browser.c:3139
+#: ../midori/midori-browser.c:4155
 msgid "Delete the selected text"
 msgstr "Delete the selected text"
 
-#: ../midori/midori-browser.c:3142
+#: ../midori/midori-browser.c:4158
 msgid "Select all text"
 msgstr "Select all text"
 
-#: ../midori/midori-browser.c:3145
+#: ../midori/midori-browser.c:4161
 msgid "Find a word or phrase in the page"
 msgstr "Find a word or phrase in the page"
 
-#: ../midori/midori-browser.c:3147
+#: ../midori/midori-browser.c:4163
 msgid "Find _Next"
 msgstr "Find _Next"
 
-#: ../midori/midori-browser.c:3148
+#: ../midori/midori-browser.c:4164
 msgid "Find the next occurrence of a word or phrase"
 msgstr "Find the next occurrence of a word or phrase"
 
-#: ../midori/midori-browser.c:3150
+#: ../midori/midori-browser.c:4166
 msgid "Find _Previous"
 msgstr "Find _Previous"
 
-#: ../midori/midori-browser.c:3151
+#: ../midori/midori-browser.c:4167
 msgid "Find the previous occurrence of a word or phrase"
 msgstr "Find the previous occurrence of a word or phrase"
 
-#: ../midori/midori-browser.c:3154
-msgid "_Quick Find"
-msgstr "_Quick Find"
-
-#: ../midori/midori-browser.c:3155
-msgid "Quickly jump to a word or phrase"
-msgstr "Quickly jump to a word or phrase"
-
-#: ../midori/midori-browser.c:3158
+#: ../midori/midori-browser.c:4171
 msgid "Configure the application preferences"
 msgstr "Configure the application preferences"
 
-#: ../midori/midori-browser.c:3160
+#: ../midori/midori-browser.c:4173
 msgid "_View"
 msgstr "_View"
 
-#: ../midori/midori-browser.c:3161
+#: ../midori/midori-browser.c:4174
 msgid "_Toolbars"
 msgstr "_Toolbars"
 
-#: ../midori/midori-browser.c:3173
+#: ../midori/midori-browser.c:4186
 msgid "Increase the zoom level"
 msgstr "Increase the zoom level"
 
-#: ../midori/midori-browser.c:3176
+#: ../midori/midori-browser.c:4189
 msgid "Decrease the zoom level"
 msgstr "Decrease the zoom level"
 
-#: ../midori/midori-browser.c:3179
+#: ../midori/midori-browser.c:4192
 msgid "Reset the zoom level"
 msgstr "Reset the zoom level"
 
-#: ../midori/midori-browser.c:3181 ../midori/midori-view.c:984
-msgid "View _Source"
-msgstr "View _Source"
+#: ../midori/midori-browser.c:4193
+msgid "_Encoding"
+msgstr "_Encoding"
 
-#: ../midori/midori-browser.c:3182
+#: ../midori/midori-browser.c:4195
+msgid "View So_urce"
+msgstr "View So_urce"
+
+#: ../midori/midori-browser.c:4196
 msgid "View the source code of the page"
 msgstr "View the source code of the page"
 
-#: ../midori/midori-browser.c:3184
+#: ../midori/midori-browser.c:4198
 msgid "View Selection Source"
 msgstr "View Selection Source"
 
-#: ../midori/midori-browser.c:3185
+#: ../midori/midori-browser.c:4199
 msgid "View the source code of the selection"
 msgstr "View the source code of the selection"
 
-#: ../midori/midori-browser.c:3189
+#: ../midori/midori-browser.c:4203
 msgid "Toggle fullscreen view"
 msgstr "Toggle fullscreen view"
 
-#: ../midori/midori-browser.c:3191
+#: ../midori/midori-browser.c:4205
 msgid "_Go"
 msgstr "_Go"
 
-#: ../midori/midori-browser.c:3194
+#: ../midori/midori-browser.c:4208
 msgid "Go back to the previous page"
 msgstr "Go back to the previous page"
 
-#: ../midori/midori-browser.c:3197
+#: ../midori/midori-browser.c:4211
 msgid "Go forward to the next page"
 msgstr "Go forward to the next page"
 
-#: ../midori/midori-browser.c:3200
+#: ../midori/midori-browser.c:4214
 msgid "Go to your homepage"
 msgstr "Go to your homepage"
 
-#: ../midori/midori-browser.c:3202
+#: ../midori/midori-browser.c:4216
 msgid "Empty Trash"
 msgstr "Empty Wastebasket"
 
-#: ../midori/midori-browser.c:3203
+#: ../midori/midori-browser.c:4217
 msgid "Delete the contents of the trash"
 msgstr "Delete the contents of the wastebasket"
 
-#: ../midori/midori-browser.c:3205 ../midori/midori-view.c:956
-msgid "Undo Close Tab"
-msgstr "Undo Close Tab"
+#: ../midori/midori-browser.c:4219
+msgid "Undo _Close Tab"
+msgstr "Undo _Close Tab"
 
-#: ../midori/midori-browser.c:3206
+#: ../midori/midori-browser.c:4220
 msgid "Open the last closed tab"
 msgstr "Open the last closed tab"
 
-#: ../midori/midori-browser.c:3210 ../panels/midori-bookmarks.c:209
+#: ../midori/midori-browser.c:4224 ../panels/midori-bookmarks.c:231
 msgid "Add a new bookmark"
 msgstr "Add a new bookmark"
 
-#: ../midori/midori-browser.c:3213
-msgid "Delete the selected history item"
-msgstr "Delete the selected history item"
+#: ../midori/midori-browser.c:4226
+msgid "Add a new _folder"
+msgstr "Add a new _folder"
 
-#: ../midori/midori-browser.c:3216
-msgid "Clear the entire history"
-msgstr "Clear the entire history"
+#: ../midori/midori-browser.c:4227
+msgid "Add a new bookmark folder"
+msgstr "Add a new bookmark folder"
 
-#: ../midori/midori-browser.c:3219
-msgid "Bookmark the selected history item"
-msgstr "Bookmark the selected history item"
-
-#: ../midori/midori-browser.c:3221
+#: ../midori/midori-browser.c:4228
 msgid "_Tools"
 msgstr "_Tools"
 
-#: ../midori/midori-browser.c:3223 ../midori/midori-searchaction.c:464
+#: ../midori/midori-browser.c:4230 ../midori/midori-searchaction.c:493
 msgid "_Manage Search Engines"
 msgstr "_Manage Search Engines"
 
-#: ../midori/midori-browser.c:3224
+#: ../midori/midori-browser.c:4231
 msgid "Add, edit and remove search engines..."
 msgstr "Add, edit and remove search engines..."
 
-#: ../midori/midori-browser.c:3228
+#: ../midori/midori-browser.c:4234
+msgid "_Clear Private Data"
+msgstr ""
+
+#: ../midori/midori-browser.c:4235
+msgid "Clear private data..."
+msgstr ""
+
+#: ../midori/midori-browser.c:4239
 msgid "_Previous Tab"
 msgstr "_Previous Tab"
 
-#: ../midori/midori-browser.c:3229
+#: ../midori/midori-browser.c:4240
 msgid "Switch to the previous tab"
 msgstr "Switch to the previous tab"
 
-#: ../midori/midori-browser.c:3231
+#: ../midori/midori-browser.c:4242
 msgid "_Next Tab"
 msgstr "_Next Tab"
 
-#: ../midori/midori-browser.c:3232
+#: ../midori/midori-browser.c:4243
 msgid "Switch to the next tab"
 msgstr "Switch to the next tab"
 
-#: ../midori/midori-browser.c:3234
+#: ../midori/midori-browser.c:4245
 msgid "_Help"
 msgstr "_Help"
 
-#: ../midori/midori-browser.c:3236
+#: ../midori/midori-browser.c:4247
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../midori/midori-browser.c:3237
+#: ../midori/midori-browser.c:4248
 msgid "Show the documentation"
 msgstr "Show the documentation"
 
-#: ../midori/midori-browser.c:3239
-#, fuzzy
+#: ../midori/midori-browser.c:4250
 msgid "_Frequent Questions"
-msgstr "_Frequent questions"
+msgstr "_Frequent Questions"
 
-#: ../midori/midori-browser.c:3240
+#: ../midori/midori-browser.c:4251
 msgid "Show the Frequently Asked Questions"
 msgstr "Show the Frequently Asked Questions"
 
-#: ../midori/midori-browser.c:3242
-#, fuzzy
+#: ../midori/midori-browser.c:4253
 msgid "_Report a Bug"
-msgstr "_Report a bug"
+msgstr "_Report a Bug"
 
-#: ../midori/midori-browser.c:3243
+#: ../midori/midori-browser.c:4254
 msgid "Open Midori's bug tracker"
 msgstr "Open Midori's bug tracker"
 
-#: ../midori/midori-browser.c:3246
+#: ../midori/midori-browser.c:4257
 msgid "Show information about the program"
 msgstr "Show information about the program"
 
-#: ../midori/midori-browser.c:3253
+#: ../midori/midori-browser.c:4264
 msgid "P_rivate Browsing"
 msgstr "P_rivate Browsing"
 
-#: ../midori/midori-browser.c:3254
+#: ../midori/midori-browser.c:4265
 msgid "Don't save any private data while browsing"
 msgstr "Don't save any private data while browsing"
 
-#: ../midori/midori-browser.c:3259
+#: ../midori/midori-browser.c:4270
 msgid "_Menubar"
 msgstr "_Menubar"
 
-#: ../midori/midori-browser.c:3260
+#: ../midori/midori-browser.c:4271
 msgid "Show menubar"
 msgstr "Show menubar"
 
-#: ../midori/midori-browser.c:3263
+#: ../midori/midori-browser.c:4274
 msgid "_Navigationbar"
 msgstr "_Navigationbar"
 
-#: ../midori/midori-browser.c:3264
+#: ../midori/midori-browser.c:4275
 msgid "Show navigationbar"
 msgstr "Show navigationbar"
 
-#: ../midori/midori-browser.c:3267
+#: ../midori/midori-browser.c:4278
 msgid "Side_panel"
 msgstr "Side_panel"
 
-#: ../midori/midori-browser.c:3268
+#: ../midori/midori-browser.c:4279
 msgid "Show sidepanel"
 msgstr "Show sidepanel"
 
-#: ../midori/midori-browser.c:3271
+#: ../midori/midori-browser.c:4282
 msgid "_Bookmarkbar"
 msgstr "_Bookmarkbar"
 
-#: ../midori/midori-browser.c:3272
+#: ../midori/midori-browser.c:4283
 msgid "Show bookmarkbar"
 msgstr "Show bookmarkbar"
 
-#: ../midori/midori-browser.c:3275
+#: ../midori/midori-browser.c:4286
 msgid "_Transferbar"
 msgstr "_Transferbar"
 
-#: ../midori/midori-browser.c:3276
+#: ../midori/midori-browser.c:4287
 msgid "Show transferbar"
 msgstr "Show transferbar"
 
-#: ../midori/midori-browser.c:3279
+#: ../midori/midori-browser.c:4290
 msgid "_Statusbar"
 msgstr "_Statusbar"
 
-#: ../midori/midori-browser.c:3280
+#: ../midori/midori-browser.c:4291
 msgid "Show statusbar"
 msgstr "Show statusbar"
 
-#: ../midori/midori-browser.c:3748
-#, fuzzy
-msgid "_Separator"
-msgstr "<i>Separator</i>"
+#: ../midori/midori-browser.c:4298
+msgid "_Automatic"
+msgstr ""
 
-#: ../midori/midori-browser.c:3755
+#: ../midori/midori-browser.c:4301 ../midori/midori-websettings.c:212
+msgid "Chinese (BIG5)"
+msgstr "Chinese (BIG5)"
+
+#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic
+#: ../midori/midori-browser.c:4305
+msgid "Japanese (SHIFT__JIS)"
+msgstr "Japanese (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:4308 ../midori/midori-websettings.c:214
+msgid "Russian (KOI8-R)"
+msgstr "Russian (KOI8-R)"
+
+#: ../midori/midori-browser.c:4311 ../midori/midori-websettings.c:215
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
+
+#: ../midori/midori-browser.c:4314 ../midori/midori-websettings.c:216
+msgid "Western (ISO-8859-1)"
+msgstr "Western (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:4317 ../midori/midori-websettings.c:217
+#: ../midori/midori-websettings.c:289
+msgid "Custom..."
+msgstr "Custom..."
+
+#: ../midori/midori-browser.c:4755
+msgid "_Separator"
+msgstr "_Separator"
+
+#: ../midori/midori-browser.c:4762
 msgid "_Location..."
 msgstr "_Location..."
 
-#: ../midori/midori-browser.c:3757
+#: ../midori/midori-browser.c:4764
 msgid "Open a particular location"
 msgstr "Open a particular location"
 
-#: ../midori/midori-browser.c:3781
+#: ../midori/midori-browser.c:4788
 msgid "_Web Search..."
 msgstr "_Web Search..."
 
-#: ../midori/midori-browser.c:3783
+#: ../midori/midori-browser.c:4790
 msgid "Run a web search"
 msgstr "Run a web search"
 
-#: ../midori/midori-browser.c:3802
+#: ../midori/midori-browser.c:4811
 msgid "Reopen a previously closed tab or window"
 msgstr "Reopen a previously closed tab or window"
 
-#: ../midori/midori-browser.c:3815
+#: ../midori/midori-browser.c:4826
 msgid "_Recently visited pages"
 msgstr "_Recently visited pages"
 
-#: ../midori/midori-browser.c:3817
+#: ../midori/midori-browser.c:4828
 msgid "Reopen pages that you visited earlier"
 msgstr "Reopen pages that you visited earlier"
 
-#: ../midori/midori-browser.c:3832
+#: ../midori/midori-browser.c:4843 ../midori/sokoke.c:863
+msgid "_Bookmarks"
+msgstr "_Bookmarks"
+
+#: ../midori/midori-browser.c:4845
 msgid "Show the saved bookmarks"
 msgstr "Show the saved bookmarks"
 
-#: ../midori/midori-browser.c:3845
+#: ../midori/midori-browser.c:4860
 msgid "_Window"
 msgstr "_Window"
 
-#: ../midori/midori-browser.c:3847
+#: ../midori/midori-browser.c:4862
 msgid "Show a list of all open tabs"
 msgstr "Show a list of all open tabs"
 
-#: ../midori/midori-browser.c:4001 ../midori/midori-preferences.c:597
-msgid "History"
-msgstr "History"
+#: ../midori/midori-browser.c:4876
+msgid "_Menu"
+msgstr "_Menu"
+
+#: ../midori/midori-browser.c:4878
+msgid "Menu"
+msgstr "Menu"
 
 #. i18n: A panel at the bottom, to search text in pages
-#: ../midori/midori-browser.c:4050
-#, fuzzy
+#: ../midori/midori-browser.c:5059
 msgid "_Inline Find:"
-msgstr "_Inline find:"
+msgstr "_Inline Find:"
 
-#: ../midori/midori-browser.c:4071
-#, fuzzy
+#: ../midori/midori-browser.c:5084
 msgid "Previous"
-msgstr "_Previous Tab"
+msgstr "Previous"
 
-#: ../midori/midori-browser.c:4076
-#, fuzzy
+#: ../midori/midori-browser.c:5089
 msgid "Next"
-msgstr "Text"
+msgstr "Next"
 
-#: ../midori/midori-browser.c:4081
+#: ../midori/midori-browser.c:5094
 msgid "Match Case"
 msgstr "Match Case"
 
-#: ../midori/midori-browser.c:4089
+#: ../midori/midori-browser.c:5102
 msgid "Highlight Matches"
 msgstr "Highlight Matches"
 
-#: ../midori/midori-browser.c:4098
+#: ../midori/midori-browser.c:5112
 msgid "Close Findbar"
 msgstr "Close Findbar"
 
-#: ../midori/midori-browser.c:4379
+#: ../midori/midori-browser.c:5147
+#: ../extensions/cookie-manager/cookie-manager-page.c:109
+msgid "Delete All"
+msgstr ""
+
+#: ../midori/midori-browser.c:5476
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr "Unexpected setting '%s'"
 
-#: ../midori/midori-panel.c:199 ../midori/midori-panel.c:200
+#: ../midori/midori-locationaction.c:901
+#, c-format
+msgid "Search with %s"
+msgstr ""
+
+#: ../midori/midori-panel.c:333
+msgid "Detach chosen panel from the window"
+msgstr ""
+
+#: ../midori/midori-panel.c:343 ../midori/midori-panel.c:508
+msgid "Align sidepanel to the right"
+msgstr ""
+
+#: ../midori/midori-panel.c:353 ../midori/midori-panel.c:354
 msgid "Close panel"
 msgstr "Close panel"
 
-#: ../midori/midori-websettings.c:169 ../midori/midori-view.c:1719
+#: ../midori/midori-panel.c:509
+msgid "Align sidepanel to the left"
+msgstr ""
+
+#: ../midori/midori-websettings.c:195 ../midori/midori-view.c:2265
 msgid "Blank page"
 msgstr "Blank page"
 
-#: ../midori/midori-websettings.c:170 ../midori/midori-websettings.c:461
+#: ../midori/midori-websettings.c:196 ../midori/midori-websettings.c:563
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../midori/midori-websettings.c:171
+#: ../midori/midori-websettings.c:197
 msgid "Last open pages"
 msgstr "Last open pages"
 
-#: ../midori/midori-websettings.c:186
-msgid "Chinese (BIG5)"
-msgstr "Chinese (BIG5)"
-
-#: ../midori/midori-websettings.c:187
+#: ../midori/midori-websettings.c:213
 msgid "Japanese (SHIFT_JIS)"
 msgstr "Japanese (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:188
-msgid "Russian (KOI8-R)"
-msgstr "Russian (KOI8-R)"
-
-#: ../midori/midori-websettings.c:189
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: ../midori/midori-websettings.c:190
-msgid "Western (ISO-8859-1)"
-msgstr "Western (ISO-8859-1)"
-
-#: ../midori/midori-websettings.c:191 ../midori/midori-websettings.c:263
-msgid "Custom..."
-msgstr "Custom..."
-
-#: ../midori/midori-websettings.c:206
+#: ../midori/midori-websettings.c:232
 msgid "New tab"
 msgstr "New tab"
 
-#: ../midori/midori-websettings.c:207
+#: ../midori/midori-websettings.c:233
 msgid "New window"
 msgstr "New window"
 
-#: ../midori/midori-websettings.c:208
+#: ../midori/midori-websettings.c:234
 msgid "Current tab"
 msgstr "Current tab"
 
-#: ../midori/midori-websettings.c:223
+#: ../midori/midori-websettings.c:249
 msgid "Default"
 msgstr "Default"
 
-#: ../midori/midori-websettings.c:224
+#: ../midori/midori-websettings.c:250
 msgid "Icons"
 msgstr "Icons"
 
-#: ../midori/midori-websettings.c:225
+#: ../midori/midori-websettings.c:251
 msgid "Text"
 msgstr "Text"
 
-#: ../midori/midori-websettings.c:226
+#: ../midori/midori-websettings.c:252
 msgid "Both"
 msgstr "Both"
 
-#: ../midori/midori-websettings.c:227
+#: ../midori/midori-websettings.c:253
 msgid "Both horizontal"
 msgstr "Both horizontal"
 
-#: ../midori/midori-websettings.c:242
+#: ../midori/midori-websettings.c:268
 msgid "All cookies"
 msgstr "All cookies"
 
-#: ../midori/midori-websettings.c:243
+#: ../midori/midori-websettings.c:269
 msgid "Session cookies"
 msgstr "Session cookies"
 
-#: ../midori/midori-websettings.c:244 ../panels/midori-addons.c:96
+#: ../midori/midori-websettings.c:270 ../panels/midori-addons.c:94
+#: ../extensions/shortcuts.c:87
 msgid "None"
 msgstr "None"
 
-#: ../midori/midori-websettings.c:260
+#: ../midori/midori-websettings.c:286
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:261
+#: ../midori/midori-websettings.c:287
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:262
+#: ../midori/midori-websettings.c:288
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:303
+#: ../midori/midori-websettings.c:341
 msgid "Remember last window size"
 msgstr "Remember last window size"
 
-#: ../midori/midori-websettings.c:304
+#: ../midori/midori-websettings.c:342
 msgid "Whether to save the last window size"
 msgstr "Whether to save the last window size"
 
-#: ../midori/midori-websettings.c:312
+#: ../midori/midori-websettings.c:350
 msgid "Last window width"
 msgstr "Last window width"
 
-#: ../midori/midori-websettings.c:313
+#: ../midori/midori-websettings.c:351
 msgid "The last saved window width"
 msgstr "The last saved window width"
 
-#: ../midori/midori-websettings.c:321
+#: ../midori/midori-websettings.c:359
 msgid "Last window height"
 msgstr "Last window height"
 
-#: ../midori/midori-websettings.c:322
+#: ../midori/midori-websettings.c:360
 msgid "The last saved window height"
 msgstr "The last saved window height"
 
-#: ../midori/midori-websettings.c:347
+#: ../midori/midori-websettings.c:385
 msgid "Last panel position"
 msgstr "Last panel position"
 
-#: ../midori/midori-websettings.c:348
+#: ../midori/midori-websettings.c:386
 msgid "The last saved panel position"
 msgstr "The last saved panel position"
 
 #. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:357
+#: ../midori/midori-websettings.c:395
 msgid "Last panel page"
 msgstr "Last panel page"
 
-#: ../midori/midori-websettings.c:358
+#: ../midori/midori-websettings.c:396
 msgid "The last saved panel page"
 msgstr "The last saved panel page"
 
-#: ../midori/midori-websettings.c:366
+#: ../midori/midori-websettings.c:404
 msgid "Last Web search"
 msgstr "Last Web search"
 
-#: ../midori/midori-websettings.c:367
+#: ../midori/midori-websettings.c:405
 msgid "The last saved Web search"
 msgstr "The last saved Web search"
 
-#: ../midori/midori-websettings.c:376
+#: ../midori/midori-websettings.c:414
 msgid "Show Menubar"
 msgstr "Show Menubar"
 
-#: ../midori/midori-websettings.c:377
+#: ../midori/midori-websettings.c:415
 msgid "Whether to show the menubar"
 msgstr "Whether to show the menubar"
 
-#: ../midori/midori-websettings.c:385
+#: ../midori/midori-websettings.c:423
 msgid "Show Navigationbar"
 msgstr "Show Navigationbar"
 
-#: ../midori/midori-websettings.c:386
+#: ../midori/midori-websettings.c:424
 msgid "Whether to show the navigationbar"
 msgstr "Whether to show the navigationbar"
 
-#: ../midori/midori-websettings.c:394
+#: ../midori/midori-websettings.c:432
 msgid "Show Bookmarkbar"
 msgstr "Show Bookmarkbar"
 
-#: ../midori/midori-websettings.c:395
+#: ../midori/midori-websettings.c:433
 msgid "Whether to show the bookmarkbar"
 msgstr "Whether to show the bookmarkbar"
 
-#: ../midori/midori-websettings.c:403
+#: ../midori/midori-websettings.c:441
 msgid "Show Panel"
 msgstr "Show Panel"
 
-#: ../midori/midori-websettings.c:404
+#: ../midori/midori-websettings.c:442
 msgid "Whether to show the panel"
 msgstr "Whether to show the panel"
 
-#: ../midori/midori-websettings.c:412
+#: ../midori/midori-websettings.c:457
+msgid "Show Transferbar"
+msgstr "Show Transferbar"
+
+#: ../midori/midori-websettings.c:458
+msgid "Whether to show the transferbar"
+msgstr "Whether to show the transferbar"
+
+#: ../midori/midori-websettings.c:466
 msgid "Show Statusbar"
 msgstr "Show Statusbar"
 
-#: ../midori/midori-websettings.c:413
+#: ../midori/midori-websettings.c:467
 msgid "Whether to show the statusbar"
 msgstr "Whether to show the statusbar"
 
-#: ../midori/midori-websettings.c:422
+#: ../midori/midori-websettings.c:476
 msgid "Toolbar Style"
 msgstr "Toolbar Style"
 
-#: ../midori/midori-websettings.c:423
+#: ../midori/midori-websettings.c:477
 msgid "The style of the toolbar"
 msgstr "The style of the toolbar"
 
-#: ../midori/midori-websettings.c:432
+#: ../midori/midori-websettings.c:493
+msgid "Show progress in location entry"
+msgstr ""
+
+#: ../midori/midori-websettings.c:494
+msgid "Whether to show loading progress in the location entry"
+msgstr ""
+
+#: ../midori/midori-websettings.c:509
+msgid "Search engines in location completion"
+msgstr ""
+
+#: ../midori/midori-websettings.c:510
+msgid "Whether to show search engines in the location completion"
+msgstr ""
+
+#: ../midori/midori-websettings.c:518
 msgid "Toolbar Items"
 msgstr "Toolbar Items"
 
-#: ../midori/midori-websettings.c:433
+#: ../midori/midori-websettings.c:519
 msgid "The items to show on the toolbar"
 msgstr "The items to show on the toolbar"
 
-#: ../midori/midori-websettings.c:441
+#: ../midori/midori-websettings.c:527
 msgid "Compact Sidepanel"
 msgstr "Compact Sidepanel"
 
-#: ../midori/midori-websettings.c:442
+#: ../midori/midori-websettings.c:528
 msgid "Whether to make the sidepanel compact"
 msgstr "Whether to make the sidepanel compact"
 
-#: ../midori/midori-websettings.c:451
+#: ../midori/midori-websettings.c:543
+msgid "Align sidepanel on the right"
+msgstr ""
+
+#: ../midori/midori-websettings.c:544
+msgid "Whether to align the sidepanel on the right"
+msgstr ""
+
+#: ../midori/midori-websettings.c:553
 msgid "Load on Startup"
 msgstr "Load on Startup"
 
-#: ../midori/midori-websettings.c:452
+#: ../midori/midori-websettings.c:554
 msgid "What to load on startup"
 msgstr "What to load on startup"
 
-#: ../midori/midori-websettings.c:462
+#: ../midori/midori-websettings.c:564
 msgid "The homepage"
 msgstr "The homepage"
 
-#: ../midori/midori-websettings.c:477
+#: ../midori/midori-websettings.c:579
 msgid "Show crash dialog"
 msgstr "Show crash dialogue"
 
-#: ../midori/midori-websettings.c:478
+#: ../midori/midori-websettings.c:580
 msgid "Show a dialog after Midori crashed"
 msgstr "Show a dialogue after Midori crashed"
 
-#: ../midori/midori-websettings.c:486
+#. i18n: Speed dial, webpage shortcuts, named for the phone function
+#: ../midori/midori-websettings.c:596
+msgid "Show speed dial in new tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:597
+msgid "Show speed dial in newly opened tabs"
+msgstr ""
+
+#: ../midori/midori-websettings.c:605
 msgid "Download Folder"
 msgstr "Download Folder"
 
-#: ../midori/midori-websettings.c:487
+#: ../midori/midori-websettings.c:606
 msgid "The folder downloaded files are saved to"
 msgstr "The folder downloaded files are saved to"
 
-#: ../midori/midori-websettings.c:495
+#: ../midori/midori-websettings.c:625
+msgid "Ask for the destination folder"
+msgstr ""
+
+#: ../midori/midori-websettings.c:626
+msgid "Whether to ask for the destination folder when downloading a file"
+msgstr ""
+
+#: ../midori/midori-websettings.c:645
+msgid "Notify when a transfer has been completed"
+msgstr ""
+
+#: ../midori/midori-websettings.c:646
+msgid "Whether to show a notification when a transfer has been completed"
+msgstr ""
+
+#: ../midori/midori-websettings.c:658
 msgid "Download Manager"
 msgstr "Download Manager"
 
-#: ../midori/midori-websettings.c:496
+#: ../midori/midori-websettings.c:659
 msgid "An external download manager"
 msgstr "An external download manager"
 
-#: ../midori/midori-websettings.c:504
+#: ../midori/midori-websettings.c:667
 msgid "Text Editor"
 msgstr "Text Editor"
 
-#: ../midori/midori-websettings.c:505
+#: ../midori/midori-websettings.c:668
 msgid "An external text editor"
 msgstr "An external text editor"
 
-#: ../midori/midori-websettings.c:513
+#: ../midori/midori-websettings.c:683
+msgid "News Aggregator"
+msgstr ""
+
+#: ../midori/midori-websettings.c:684
+msgid "An external news aggregator"
+msgstr ""
+
+#: ../midori/midori-websettings.c:692
 msgid "Location entry Search"
 msgstr "Location entry Search"
 
-#: ../midori/midori-websettings.c:514
+#: ../midori/midori-websettings.c:693
 msgid "The search to perform inside the location entry"
 msgstr "The search to perform inside the location entry"
 
-#: ../midori/midori-websettings.c:522
+#: ../midori/midori-websettings.c:701
 msgid "Preferred Encoding"
 msgstr "Preferred Encoding"
 
-#: ../midori/midori-websettings.c:523
+#: ../midori/midori-websettings.c:702
 msgid "The preferred character encoding"
 msgstr "The preferred character encoding"
 
-#: ../midori/midori-websettings.c:533
+#: ../midori/midori-websettings.c:712
 msgid "Always Show Tabbar"
 msgstr "Always Show Tabbar"
 
-#: ../midori/midori-websettings.c:534
+#: ../midori/midori-websettings.c:713
 msgid "Always show the tabbar"
 msgstr "Always show the tabbar"
 
-#: ../midori/midori-websettings.c:542
+#: ../midori/midori-websettings.c:721
 msgid "Close Buttons on Tabs"
 msgstr "Close Buttons on Tabs"
 
-#: ../midori/midori-websettings.c:543
+#: ../midori/midori-websettings.c:722
 msgid "Whether tabs have close buttons"
 msgstr "Whether tabs have close buttons"
 
-#: ../midori/midori-websettings.c:552
+#: ../midori/midori-websettings.c:730
 msgid "Open new pages in"
 msgstr "Open new pages in"
 
-#: ../midori/midori-websettings.c:553
+#: ../midori/midori-websettings.c:731
 msgid "Where to open new pages"
 msgstr "Where to open new pages"
 
-#: ../midori/midori-websettings.c:563
+#: ../midori/midori-websettings.c:740
 msgid "Open external pages in"
 msgstr "Open external pages in"
 
-#: ../midori/midori-websettings.c:564
+#: ../midori/midori-websettings.c:741
 msgid "Where to open externally opened pages"
 msgstr "Where to open externally opened pages"
 
-#: ../midori/midori-websettings.c:577
+#: ../midori/midori-websettings.c:754
 msgid "Middle click opens Selection"
 msgstr "Middle click opens Selection"
 
-#: ../midori/midori-websettings.c:578
+#: ../midori/midori-websettings.c:755
 msgid "Load an address from the selection via middle click"
 msgstr "Load an address from the selection via middle click"
 
-#: ../midori/midori-websettings.c:586
+#: ../midori/midori-websettings.c:763
 msgid "Open tabs in the background"
 msgstr "Open tabs in the background"
 
-#: ../midori/midori-websettings.c:587
+#: ../midori/midori-websettings.c:764
 msgid "Whether to open new tabs in the background"
 msgstr "Whether to open new tabs in the background"
 
-#: ../midori/midori-websettings.c:595
+#: ../midori/midori-websettings.c:772
 msgid "Open Tabs next to Current"
 msgstr "Open Tabs next to Current"
 
-#: ../midori/midori-websettings.c:596
+#: ../midori/midori-websettings.c:773
 msgid "Whether to open new tabs next to the current tab or after the last one"
 msgstr "Whether to open new tabs next to the current tab or after the last one"
 
-#: ../midori/midori-websettings.c:604
+#: ../midori/midori-websettings.c:781
 msgid "Open popups in tabs"
 msgstr "Open popups in tabs"
 
-#: ../midori/midori-websettings.c:605
+#: ../midori/midori-websettings.c:782
 msgid "Whether to open popup windows in tabs"
 msgstr "Whether to open popup windows in tabs"
 
-#: ../midori/midori-websettings.c:656
+#: ../midori/midori-websettings.c:798
 msgid "Zoom Text and Images"
 msgstr "Zoom Text and Images"
 
-#: ../midori/midori-websettings.c:657
+#: ../midori/midori-websettings.c:799
 msgid "Whether to zoom text and images"
 msgstr "Whether to zoom text and images"
 
-#: ../midori/midori-websettings.c:667
+#: ../midori/midori-websettings.c:814
+msgid "Find inline while typing"
+msgstr ""
+
+#: ../midori/midori-websettings.c:815
+msgid "Whether to automatically find inline while typing"
+msgstr ""
+
+#: ../midori/midori-websettings.c:823
 msgid "Accept cookies"
 msgstr "Accept cookies"
 
-#: ../midori/midori-websettings.c:668
+#: ../midori/midori-websettings.c:824
 msgid "What type of cookies to accept"
 msgstr "What type of cookies to accept"
 
-#: ../midori/midori-websettings.c:681
+#: ../midori/midori-websettings.c:833
 msgid "Original cookies only"
 msgstr "Original cookies only"
 
-#: ../midori/midori-websettings.c:682
+#: ../midori/midori-websettings.c:834
 msgid "Accept cookies from the original website only"
 msgstr "Accept cookies from the original website only"
 
-#: ../midori/midori-websettings.c:690
+#: ../midori/midori-websettings.c:842
 msgid "Maximum cookie age"
 msgstr "Maximum cookie age"
 
-#: ../midori/midori-websettings.c:691
+#: ../midori/midori-websettings.c:843
 msgid "The maximum number of days to save cookies for"
 msgstr "The maximum number of days to save cookies for"
 
-#: ../midori/midori-websettings.c:701
+#: ../midori/midori-websettings.c:853
 msgid "Remember last visited pages"
 msgstr "Remember last visited pages"
 
-#: ../midori/midori-websettings.c:702
+#: ../midori/midori-websettings.c:854
 msgid "Whether the last visited pages are saved"
 msgstr "Whether the last visited pages are saved"
 
-#: ../midori/midori-websettings.c:710
+#: ../midori/midori-websettings.c:862
 msgid "Maximum history age"
 msgstr "Maximum history age"
 
-#: ../midori/midori-websettings.c:711
+#: ../midori/midori-websettings.c:863
 msgid "The maximum number of days to save the history for"
 msgstr "The maximum number of days to save the history for"
 
-#: ../midori/midori-websettings.c:719
+#: ../midori/midori-websettings.c:871
 msgid "Remember last form inputs"
 msgstr "Remember last form inputs"
 
-#: ../midori/midori-websettings.c:720
+#: ../midori/midori-websettings.c:872
 msgid "Whether the last form inputs are saved"
 msgstr "Whether the last form inputs are saved"
 
-#: ../midori/midori-websettings.c:728
+#: ../midori/midori-websettings.c:880
 msgid "Remember last downloaded files"
 msgstr "Remember last downloaded files"
 
-#: ../midori/midori-websettings.c:729
+#: ../midori/midori-websettings.c:881
 msgid "Whether the last downloaded files are saved"
 msgstr "Whether the last downloaded files are saved"
 
-#: ../midori/midori-websettings.c:739
+#: ../midori/midori-websettings.c:891
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: ../midori/midori-websettings.c:740
+#: ../midori/midori-websettings.c:892
 msgid "The proxy server used for HTTP connections"
 msgstr "The proxy server used for HTTP connections"
 
+#: ../midori/midori-websettings.c:907
+msgid "Detect proxy server automatically"
+msgstr ""
+
+#: ../midori/midori-websettings.c:908
+msgid "Whether to detect the proxy server automatically from the environment"
+msgstr ""
+
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:760
+#: ../midori/midori-websettings.c:924
 msgid "Identify as"
 msgstr "Identify as"
 
-#: ../midori/midori-websettings.c:761
+#: ../midori/midori-websettings.c:925
 msgid "What to identify as to web pages"
 msgstr "What to identify as to web pages"
 
-#: ../midori/midori-websettings.c:781
+#: ../midori/midori-websettings.c:941
 msgid "Identification string"
 msgstr "Identification string"
 
-#: ../midori/midori-websettings.c:782
+#: ../midori/midori-websettings.c:942
 msgid "The application identification string"
 msgstr "The application identification string"
 
-#: ../midori/midori-websettings.c:794
+#: ../midori/midori-websettings.c:950
 msgid "Cache size"
 msgstr "Cache size"
 
-#: ../midori/midori-websettings.c:795
+#: ../midori/midori-websettings.c:951
 msgid "The allowed size of the cache"
 msgstr "The allowed size of the cache"
 
+#: ../midori/midori-websettings.c:966
+msgid "Clear private data"
+msgstr ""
+
+#: ../midori/midori-websettings.c:967
+msgid "The private data selected for deletion"
+msgstr ""
+
+#: ../midori/midori-view.c:750
+#, c-format
+msgid "The page '%s' couldn't be loaded."
+msgstr ""
+
+#. WebKit 1.1.6 doesn't handle "alternate content" flawlessly,
+#. so reloading via Javascript works but not via API calls.
+#: ../midori/midori-view.c:752 ../midori/midori-view.c:2897
+#: ../extensions/feed-panel/main.c:112
+msgid "Error"
+msgstr ""
+
+#: ../midori/midori-view.c:755
+msgid "Try again"
+msgstr ""
+
 #. i18n: The title of the 404 - Not found error page
-#: ../midori/midori-view.c:608
+#. Error pages are special, we want to try loading the destination
+#. again, not the error page which isn't even a proper page
+#: ../midori/midori-view.c:785 ../midori/midori-view.c:2901
 #, c-format
 msgid "Not found - %s"
 msgstr "Not found - %s"
 
-#: ../midori/midori-view.c:888
+#: ../midori/midori-view.c:1172
+msgid "Open _Link"
+msgstr "Open _Link"
+
+#: ../midori/midori-view.c:1174
 msgid "Open Link in New _Tab"
 msgstr "Open Link in New _Tab"
 
-#: ../midori/midori-view.c:911
-msgid "_Save Link destination"
-msgstr "_Save Link destination"
+#: ../midori/midori-view.c:1191
+msgid "Open Link in New _Window"
+msgstr ""
 
-#: ../midori/midori-view.c:919
+#: ../midori/midori-view.c:1197
 msgid "_Download Link destination"
 msgstr "_Download Link destination"
 
-#: ../midori/midori-view.c:941
+#: ../midori/midori-view.c:1203
+msgid "_Save Link destination"
+msgstr "_Save Link destination"
+
+#: ../midori/midori-view.c:1212
+msgid "Download with Download _Manager"
+msgstr ""
+
+#: ../midori/midori-view.c:1241
+msgid "Search _with"
+msgstr ""
+
+#: ../midori/midori-view.c:1269
+msgid "_Search the Web"
+msgstr ""
+
+#: ../midori/midori-view.c:1279
 msgid "Open Address in New _Tab"
 msgstr "Open Address in New _Tab"
 
-#: ../midori/midori-view.c:1411
+#: ../midori/midori-view.c:1457
+msgid "Open or download file"
+msgstr ""
+
+#: ../midori/midori-view.c:1474
+#, c-format
+msgid "File Type: '%s'"
+msgstr ""
+
+#: ../midori/midori-view.c:1477
+#, c-format
+msgid "File Type: %s ('%s')"
+msgstr ""
+
+#. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
+#: ../midori/midori-view.c:1481
+#, c-format
+msgid "Open %s"
+msgstr "Open %s"
+
+#: ../midori/midori-view.c:1899
 #, c-format
 msgid "Inspect page - %s"
 msgstr "Inspect page - %s"
 
-#: ../midori/midori-view.c:1562
-msgid "Source"
-msgstr "Source"
+#: ../midori/midori-view.c:2089
+msgid "Speed dial"
+msgstr ""
 
-#: ../midori/midori-view.c:1586
+#: ../midori/midori-view.c:2090
+msgid "Click to add a shortcut"
+msgstr ""
+
+#: ../midori/midori-view.c:2091
+msgid "Enter shortcut address"
+msgstr ""
+
+#: ../midori/midori-view.c:2092
+msgid "Enter shortcut title"
+msgstr ""
+
+#: ../midori/midori-view.c:2093
+msgid "Are you sure you want to delete this shortcut?"
+msgstr ""
+
+#: ../midori/midori-view.c:2123
 #, c-format
 msgid "Document cannot be displayed"
 msgstr "Document cannot be displayed"
 
-#: ../midori/midori-view.c:1602
+#: ../midori/midori-view.c:2140
 #, c-format
 msgid "No documentation installed"
 msgstr "No documentation installed"
 
+#: ../midori/midori-view.c:2487
+msgid "_Duplicate Tab"
+msgstr ""
+
 #: ../midori/midori-preferences.c:91
 #, c-format
 msgid "Preferences for %s"
 msgstr "Preferences for %s"
 
 #. Page "General"
-#: ../midori/midori-preferences.c:372
+#: ../midori/midori-preferences.c:398
 msgid "General"
 msgstr "General"
 
-#: ../midori/midori-preferences.c:373
+#: ../midori/midori-preferences.c:399
 msgid "Startup"
 msgstr "Startup"
 
+#: ../midori/midori-preferences.c:415
+msgid "Use current page as homepage"
+msgstr ""
+
+#: ../midori/midori-preferences.c:425 ../panels/midori-transfers.c:88
+msgid "Transfers"
+msgstr "Transfers"
+
 #. Page "Appearance"
-#: ../midori/midori-preferences.c:422
+#: ../midori/midori-preferences.c:440
 msgid "Appearance"
 msgstr "Appearance"
 
-#: ../midori/midori-preferences.c:423
+#: ../midori/midori-preferences.c:441
 msgid "Font settings"
 msgstr "Font settings"
 
-#: ../midori/midori-preferences.c:425
+#: ../midori/midori-preferences.c:443
 msgid "Default Font Family"
 msgstr "Default Font Family"
 
-#: ../midori/midori-preferences.c:431
+#: ../midori/midori-preferences.c:447
+msgid "The default font family used to display text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:450
 msgid "The default font size used to display text"
 msgstr "The default font size used to display text"
 
-#: ../midori/midori-preferences.c:434
+#: ../midori/midori-preferences.c:453
+msgid "Fixed-width Font Family"
+msgstr ""
+
+#: ../midori/midori-preferences.c:457
+msgid "The font family used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:460
+msgid "The font size used to display fixed-width text"
+msgstr ""
+
+#: ../midori/midori-preferences.c:463
 msgid "Minimum Font Size"
 msgstr "Minimum Font Size"
 
-#: ../midori/midori-preferences.c:437
+#: ../midori/midori-preferences.c:466
 msgid "The minimum font size used to display text"
 msgstr "The minimum font size used to display text"
 
-#: ../midori/midori-preferences.c:444
+#: ../midori/midori-preferences.c:473
 msgid "Encoding"
 msgstr "Encoding"
 
-#: ../midori/midori-preferences.c:447
+#: ../midori/midori-preferences.c:476
 msgid "The character encoding to use by default"
 msgstr "The character encoding to use by default"
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:454
+#: ../midori/midori-preferences.c:483
 msgid "Behavior"
 msgstr "Behaviour"
 
-#: ../midori/midori-preferences.c:455
+#: ../midori/midori-preferences.c:484
 msgid "Features"
 msgstr "Features"
 
-#: ../midori/midori-preferences.c:458 ../extensions/statusbar-features.c:40
+#: ../midori/midori-preferences.c:487 ../extensions/statusbar-features.c:88
 msgid "Load images automatically"
 msgstr "Load images automatically"
 
-#: ../midori/midori-preferences.c:459
+#: ../midori/midori-preferences.c:488
 msgid "Load and display images automatically"
 msgstr "Load and display images automatically"
 
-#: ../midori/midori-preferences.c:462
+#: ../midori/midori-preferences.c:491
 msgid "Shrink images automatically"
 msgstr "Shrink images automatically"
 
-#: ../midori/midori-preferences.c:463
+#: ../midori/midori-preferences.c:492
 msgid "Automatically shrink standalone images to fit"
 msgstr "Automatically shrink standalone images to fit"
 
-#: ../midori/midori-preferences.c:466
+#: ../midori/midori-preferences.c:495
 msgid "Print background images"
 msgstr "Print background images"
 
-#: ../midori/midori-preferences.c:467
+#: ../midori/midori-preferences.c:496
 msgid "Whether background images should be printed"
 msgstr "Whether background images should be printed"
 
-#: ../midori/midori-preferences.c:470
+#: ../midori/midori-preferences.c:499
 msgid "Resizable text areas"
 msgstr "Resizable text areas"
 
-#: ../midori/midori-preferences.c:471
+#: ../midori/midori-preferences.c:500
 msgid "Whether text areas are resizable"
 msgstr "Whether text areas are resizable"
 
-#: ../midori/midori-preferences.c:474 ../extensions/statusbar-features.c:47
+#: ../midori/midori-preferences.c:503 ../extensions/statusbar-features.c:100
 msgid "Enable scripts"
 msgstr "Enable scripts"
 
-#: ../midori/midori-preferences.c:475
+#: ../midori/midori-preferences.c:504
 msgid "Enable embedded scripting languages"
 msgstr "Enable embedded scripting languages"
 
-#: ../midori/midori-preferences.c:478 ../extensions/statusbar-features.c:54
-msgid "Enable plugins"
-msgstr "Enable plugins"
+#: ../midori/midori-preferences.c:507 ../extensions/statusbar-features.c:112
+msgid "Enable Netscape plugins"
+msgstr ""
 
-#: ../midori/midori-preferences.c:479
-msgid "Enable embedded plugin objects"
-msgstr "Enable embedded plugin objects"
+#: ../midori/midori-preferences.c:508
+msgid "Enable embedded Netscape plugin objects"
+msgstr ""
 
-#: ../midori/midori-preferences.c:482
+#: ../midori/midori-preferences.c:511
 msgid "Enforce 96 dots per inch"
 msgstr "Enforce 96 dots per inch"
 
-#: ../midori/midori-preferences.c:483
+#: ../midori/midori-preferences.c:512
 msgid "Enforce a video dot density of 96 DPI"
 msgstr "Enforce a video dot density of 96 DPI"
 
-#: ../midori/midori-preferences.c:486
+#: ../midori/midori-preferences.c:515
 msgid "Enable developer tools"
 msgstr "Enable developer tools"
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:516
 msgid "Enable special extensions for developers"
 msgstr "Enable special extensions for developers"
 
+#: ../midori/midori-preferences.c:523
+msgid "Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:526
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: ../midori/midori-preferences.c:527
+msgid "Enable spell checking while typing"
+msgstr ""
+
+#. i18n: The example should be adjusted to contain a good local default
+#: ../midori/midori-preferences.c:531
+msgid ""
+"A comma separated list of languages to be used for spell checking, for "
+"example \"en_GB,de_DE\""
+msgstr ""
+
 #. Page "Interface"
-#: ../midori/midori-preferences.c:497
+#: ../midori/midori-preferences.c:536
 msgid "Interface"
 msgstr "Interface"
 
-#: ../midori/midori-preferences.c:499
+#: ../midori/midori-preferences.c:537
 msgid "Navigationbar"
 msgstr "Navigationbar"
 
-#: ../midori/midori-preferences.c:505
+#: ../midori/midori-preferences.c:548
 msgid "Browsing"
 msgstr "Browsing"
 
-#: ../midori/midori-preferences.c:542 ../midori/midori-preferences.c:543
+#. Page "Applications"
+#: ../midori/midori-preferences.c:578
+msgid "Applications"
+msgstr ""
+
+#: ../midori/midori-preferences.c:579
+msgid "External applications"
+msgstr ""
+
+#. Page "Network"
+#: ../midori/midori-preferences.c:625 ../midori/midori-preferences.c:626
 msgid "Network"
 msgstr "Network"
 
-#: ../midori/midori-preferences.c:565
+#: ../midori/midori-preferences.c:653
 msgid "MB"
 msgstr "MB"
 
 #. Page "Privacy"
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:658
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ../midori/midori-preferences.c:579
+#: ../midori/midori-preferences.c:659
 msgid "Web Cookies"
 msgstr "Web Cookies"
 
-#: ../midori/midori-preferences.c:592 ../midori/midori-preferences.c:604
+#: ../midori/midori-preferences.c:672 ../midori/midori-preferences.c:682
 msgid "days"
 msgstr "days"
 
-#: ../midori/midori-searchaction.c:455 ../katze/katze-arrayaction.c:279
+#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:331
 msgid "Empty"
 msgstr "Empty"
 
-#: ../midori/midori-searchaction.c:792
+#: ../midori/midori-searchaction.c:904
 msgid "Add search engine"
 msgstr "Add search engine"
 
-#: ../midori/midori-searchaction.c:792
+#: ../midori/midori-searchaction.c:904
 msgid "Edit search engine"
 msgstr "Edit search engine"
 
-#: ../midori/midori-searchaction.c:820
+#: ../midori/midori-searchaction.c:932
 msgid "_Name:"
 msgstr "_Name:"
 
-#: ../midori/midori-searchaction.c:864
-msgid "_Icon (name or file):"
-msgstr "_Icon (name or file):"
+#: ../midori/midori-searchaction.c:976
+msgid "_Icon:"
+msgstr "_Icon:"
 
-#: ../midori/midori-searchaction.c:878
+#: ../midori/midori-searchaction.c:990
 msgid "_Token:"
 msgstr "_Token:"
 
-#: ../midori/midori-searchaction.c:1055
-#, fuzzy
+#: ../midori/midori-searchaction.c:1209
 msgid "Manage Search Engines"
-msgstr "_Manage Search Engines"
+msgstr "Manage Search Engines"
 
-#: ../midori/sokoke.c:101 ../midori/sokoke.c:113
+#: ../midori/midori-searchaction.c:1308
+msgid "Use as _default"
+msgstr ""
+
+#: ../midori/sokoke.c:172 ../midori/sokoke.c:184
 msgid "Could not run external program."
 msgstr "Could not run external program."
 
-#. i18n: A superuser, or system administrator, may not be 'root'
-#: ../midori/sokoke.c:354
-msgid "Warning: You are using a superuser account!"
-msgstr "Warning: You are using a superuser account!"
+#: ../midori/sokoke.c:862
+msgid "_Bookmark"
+msgstr "_Bookmark"
 
-#: ../midori/gjs.c:742 ../midori/gjs.c:832
-#, c-format
-msgid "%s has no property '%s'"
-msgstr "%s has no property '%s'"
+#: ../midori/sokoke.c:864
+msgid "Add Boo_kmark"
+msgstr "Add Boo_kmark"
 
-#: ../midori/gjs.c:878
-#, c-format
-msgid "%s cannot be assigned to %s.%s"
-msgstr "%s cannot be assigned to %s.%s"
+#: ../midori/sokoke.c:865
+msgid "_Console"
+msgstr "_Console"
 
-#: ../midori/gjs.c:888
-#, c-format
-msgid "%s.%s cannot be accessed"
-msgstr "%s.%s cannot be accessed"
+#: ../midori/sokoke.c:866
+msgid "_Extensions"
+msgstr "_Extensions"
 
-#: ../panels/midori-addons.c:97 ../panels/midori-addons.c:143
+#: ../midori/sokoke.c:867
+msgid "_History"
+msgstr "_History"
+
+#: ../midori/sokoke.c:868
+msgid "_Homepage"
+msgstr "_Homepage"
+
+#: ../midori/sokoke.c:869
+msgid "_Userscripts"
+msgstr "_Userscripts"
+
+#: ../midori/sokoke.c:870
+msgid "User_styles"
+msgstr "User_styles"
+
+#: ../midori/sokoke.c:871
+msgid "New _Tab"
+msgstr "New _Tab"
+
+#: ../midori/sokoke.c:872
+msgid "_Transfers"
+msgstr "_Transfers"
+
+#: ../midori/sokoke.c:873
+msgid "Netscape p_lugins"
+msgstr "Netscape p_lugins"
+
+#: ../midori/sokoke.c:875
+msgid "New _Window"
+msgstr "New _Window"
+
+#: ../panels/midori-addons.c:95 ../panels/midori-addons.c:141
 msgid "Userscripts"
 msgstr "Userscripts"
 
-#: ../panels/midori-addons.c:98 ../panels/midori-addons.c:145
+#: ../panels/midori-addons.c:96 ../panels/midori-addons.c:143
 msgid "Userstyles"
 msgstr "Userstyles"
 
-#: ../panels/midori-addons.c:1005 ../panels/midori-extensions.c:144
-msgid "_Enable"
-msgstr "_Enable"
-
-#: ../panels/midori-addons.c:1014 ../panels/midori-extensions.c:153
-msgid "_Disable"
-msgstr "_Disable"
-
-#: ../panels/midori-bookmarks.c:100
+#: ../panels/midori-bookmarks.c:108
 msgid "Bookmarks"
 msgstr "Bookmarks"
 
-#: ../panels/midori-bookmarks.c:217
+#: ../panels/midori-bookmarks.c:239
 msgid "Edit the selected bookmark"
 msgstr "Edit the selected bookmark"
 
-#: ../panels/midori-bookmarks.c:225
+#: ../panels/midori-bookmarks.c:247
 msgid "Delete the selected bookmark"
 msgstr "Delete the selected bookmark"
 
-#: ../panels/midori-bookmarks.c:529
+#: ../panels/midori-bookmarks.c:260
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:592
 msgid "<i>Separator</i>"
 msgstr "<i>Separator</i>"
 
@@ -1477,13 +1764,81 @@ msgstr "<i>Separator</i>"
 msgid "Console"
 msgstr "Console"
 
-#: ../panels/midori-extensions.c:87
+#: ../panels/midori-extensions.c:91
 msgid "Extensions"
 msgstr "Extensions"
 
-#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:52
-msgid "Plugins"
-msgstr "Plugins"
+#: ../panels/midori-history.c:162
+msgid "Are you sure you want to remove all history items?"
+msgstr "Are you sure you want to remove all history items?"
+
+#: ../panels/midori-history.c:217
+msgid "Bookmark the selected history item"
+msgstr "Bookmark the selected history item"
+
+#: ../panels/midori-history.c:226
+msgid "Delete the selected history item"
+msgstr "Delete the selected history item"
+
+#: ../panels/midori-history.c:234
+msgid "Clear the entire history"
+msgstr "Clear the entire history"
+
+#: ../panels/midori-history.c:601
+msgid "A week ago"
+msgstr "A week ago"
+
+#: ../panels/midori-history.c:606
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d day ago"
+msgstr[1] "%d days ago"
+
+#: ../panels/midori-history.c:614
+msgid "Today"
+msgstr "Today"
+
+#: ../panels/midori-history.c:616
+msgid "Yesterday"
+msgstr "Yesterday"
+
+#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:108
+msgid "Netscape plugins"
+msgstr "Netscape plugins"
+
+#: ../panels/midori-transfers.c:271
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#: ../panels/midori-transfers.c:479
+msgid "Open Destination _Folder"
+msgstr ""
+
+#: ../panels/midori-transfers.c:482
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: ../katze/katze-http-auth.c:97
+msgid "Authentication Required"
+msgstr "Authentication Required"
+
+#: ../katze/katze-http-auth.c:113
+msgid ""
+"A username and a password are required\n"
+"to open this location:"
+msgstr ""
+"A username and a password are required\n"
+"to open this location:"
+
+#: ../katze/katze-http-auth.c:127
+msgid "Username"
+msgstr "Username"
+
+#: ../katze/katze-http-auth.c:138
+msgid "Password"
+msgstr "Password"
 
 #: ../katze/katze-throbber.c:828
 #, c-format
@@ -1499,44 +1854,339 @@ msgstr "Stock icon '%s' couldn't be loaded"
 msgid "Animation frames are broken"
 msgstr "Animation frames are broken"
 
-#: ../katze/katze-utils.c:180 ../katze/katze-utils.c:389
+#: ../katze/katze-utils.c:200 ../katze/katze-utils.c:407
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr "Property '%s' is invalid for %s"
 
-#: ../katze/katze-utils.c:209 ../katze/katze-utils.c:248
+#: ../katze/katze-utils.c:235 ../katze/katze-utils.c:264
 msgid "Choose file"
 msgstr "Choose file"
 
-#: ../katze/katze-utils.c:229
+#: ../katze/katze-utils.c:250
 msgid "Choose folder"
 msgstr "Choose folder"
 
-#: ../extensions/mouse-gestures/main.c:216
+#: ../extensions/adblock.c:128
+msgid "Configure Advertisement filters"
+msgstr ""
+
+#: ../extensions/adblock.c:269
+msgid "Configure _Advertisement filters..."
+msgstr ""
+
+#: ../extensions/adblock.c:526
+msgid "Advertisement blocker"
+msgstr ""
+
+#: ../extensions/adblock.c:527
+msgid "Block advertisements according to a filter list"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:115
+msgid "Tint tabs distinctly"
+msgstr ""
+
+#: ../extensions/colorful-tabs.c:151
+msgid "Colorful Tabs"
+msgstr "Colourful Tabs"
+
+#: ../extensions/colorful-tabs.c:152
+msgid "Tint each tab distinctly"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:79
+#: ../extensions/cookie-manager/main.c:56
+msgid "Cookie Manager"
+msgstr "Cookie Manager"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:111
+msgid ""
+"Deletes all shown cookies. If a filter is set, only those cookies are "
+"deleted which match the filter."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:126
+msgid "Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:133
+msgid "Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:460
+msgid "Do you really want to delete all cookies?"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:462
+msgid "Question"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:471
+msgid "Only cookies which match the filter will be deleted."
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:539
+msgid "At the end of the session"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:542
+#, c-format
+msgid ""
+"<b>Host</b>: %s\n"
+"<b>Name</b>: %s\n"
+"<b>Value</b>: %s\n"
+"<b>Path</b>: %s\n"
+"<b>Secure</b>: %s\n"
+"<b>Expires</b>: %s"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:548
+msgid "Yes"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:548
+msgid "No"
+msgstr "No"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:811
+msgid "Name"
+msgstr "Name"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:862
+msgid "_Expand All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:870
+msgid "_Collapse All"
+msgstr ""
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:923
+msgid "Filter:"
+msgstr "Filter:"
+
+#: ../extensions/cookie-manager/cookie-manager-page.c:928
+msgid ""
+"Enter a filter string to show only cookies whose name or domain field match "
+"the entered filter"
+msgstr ""
+
+#: ../extensions/cookie-manager/main.c:40
+msgid "_Cookie Manager"
+msgstr "_Cookie Manager"
+
+#: ../extensions/cookie-manager/main.c:57
+msgid "List, view and delete cookies"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:242
+msgid "Failed to find required Atom \"entry\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-atom.c:348
+msgid "Failed to find required Atom \"feed\" elements in XML data."
+msgstr ""
+
+#. i18n: The local date a feed was last updated
+#: ../extensions/feed-panel/feed-panel.c:399
+#, c-format
+msgctxt "Feed"
+msgid "Last updated: %s."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:664
+msgid "Feeds"
+msgstr "Feeds"
+
+#: ../extensions/feed-panel/feed-panel.c:717
+msgid "Add new feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:724
+msgid "Delete feed"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-panel.c:807
+msgid "_Feeds"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:185
+#, c-format
+msgid "Failed to find root element in feed XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:225
+#, c-format
+msgid "Unsupported feed format."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-parse.c:255
+#, c-format
+msgid "Failed to parse XML feed: %s"
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:46
+msgid "Failed to find \"channel\" element in RSS XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:51
+msgid "Unsupported RSS version found."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:148
+msgid "Failed to find required RSS \"item\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/feed-rss.c:248
+msgid "Failed to find required RSS \"channel\" elements in XML data."
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:114
+#, c-format
+msgid "Feed '%s' already exists"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:191
+#, c-format
+msgid "Error loading feed '%s'"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:331
+msgid "New feed"
+msgstr ""
+
+#: ../extensions/feed-panel/main.c:489
+msgid "Feed Panel"
+msgstr "Feed Panel"
+
+#: ../extensions/feed-panel/main.c:490
+msgid "Read Atom/ RSS feeds"
+msgstr ""
+
+#: ../extensions/mouse-gestures/main.c:236
 msgid "Mouse Gestures"
 msgstr "Mouse Gestures"
 
-#: ../extensions/mouse-gestures/main.c:217
+#: ../extensions/mouse-gestures/main.c:237
 msgid "Control Midori by moving the mouse"
 msgstr "Control Midori by moving the mouse"
 
 #. i18n: A panel showing a user specified web page
-#: ../extensions/page-holder.c:116 ../extensions/page-holder.c:153
+#: ../extensions/page-holder.c:129 ../extensions/page-holder.c:177
 msgid "Pageholder"
 msgstr "Pageholder"
 
-#: ../extensions/page-holder.c:137
+#: ../extensions/page-holder.c:161
 msgid "_Pageholder"
 msgstr "_Pageholder"
 
-#: ../extensions/statusbar-features.c:38
+#: ../extensions/shortcuts.c:166
+msgid "Configure Keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:263
+msgid "Configure Sh_ortcuts..."
+msgstr ""
+
+#: ../extensions/shortcuts.c:295
+msgid "Shortcuts"
+msgstr ""
+
+#: ../extensions/shortcuts.c:296
+msgid "View and edit keyboard shortcuts"
+msgstr ""
+
+#: ../extensions/statusbar-features.c:84
 msgid "Images"
 msgstr "Images"
 
-#: ../extensions/statusbar-features.c:45
+#: ../extensions/statusbar-features.c:96
 msgid "Scripts"
 msgstr "Scripts"
 
+#: ../extensions/statusbar-features.c:149
+msgid "Statusbar Features"
+msgstr "Statusbar Features"
+
+#: ../extensions/statusbar-features.c:150
+msgid "Easily toggle features on web pages on and off"
+msgstr ""
+
+#: ../extensions/tab-panel.c:293 ../extensions/tab-panel.c:352
+msgid "Tab Panel"
+msgstr "Tab Panel"
+
+#: ../extensions/tab-panel.c:336
+msgid "T_ab Panel"
+msgstr "T_ab Panel"
+
+#: ../extensions/tab-panel.c:353
+msgid "Show tabs in a vertical panel"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:390
+msgid "Customize Toolbar"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:406
+msgid ""
+"Select items to be displayed on the toolbar. Items can be reodered by drag "
+"and drop."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:422
+msgid "Available Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:443
+msgid "Displayed Items"
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:584
+msgid "Configure _Toolbar..."
+msgstr ""
+
+#: ../extensions/toolbar-editor.c:613
+msgid "Toolbar Editor"
+msgstr "Toolbar Editor"
+
+#: ../extensions/toolbar-editor.c:614
+msgid "Easily edit the toolbar layout"
+msgstr ""
+
+#~ msgid "_Quick Find"
+#~ msgstr "_Quick Find"
+
+#~ msgid "Quickly jump to a word or phrase"
+#~ msgstr "Quickly jump to a word or phrase"
+
+#~ msgid "Source"
+#~ msgstr "Source"
+
+#~ msgid "_Icon (name or file):"
+#~ msgstr "_Icon (name or file):"
+
+#~ msgid "Warning: You are using a superuser account!"
+#~ msgstr "Warning: You are using a superuser account!"
+
+#~ msgid "%s has no property '%s'"
+#~ msgstr "%s has no property '%s'"
+
+#~ msgid "%s cannot be assigned to %s.%s"
+#~ msgstr "%s cannot be assigned to %s.%s"
+
+#~ msgid "%s.%s cannot be accessed"
+#~ msgstr "%s.%s cannot be accessed"
+
+#~ msgid "_Enable"
+#~ msgstr "_Enable"
+
+#~ msgid "_Disable"
+#~ msgstr "_Disable"
+
+#~ msgid "Plugins"
+#~ msgstr "Plugins"
+
 #~ msgid "Manage search engines"
 #~ msgstr "Manage search engines"