diff --git a/po/midori.pot b/po/midori.pot
index 685cee8b..dd28db9d 100644
--- a/po/midori.pot
+++ b/po/midori.pot
@@ -8,21 +8,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-10 16:06+0200\n"
+"POT-Creation-Date: 2009-07-20 01:57+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: ../data/midori.desktop.in.h:1
 msgid "Lightweight web browser"
 msgstr ""
 
-#: ../data/midori.desktop.in.h:2 ../midori/main.c:1315 ../midori/main.c:1449
-#: ../midori/main.c:1457 ../midori/main.c:1468
-#: ../midori/midori-websettings.c:277
+#: ../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 ""
 
@@ -81,1323 +82,1362 @@ msgstr ""
 msgid "The configuration couldn't be saved. %s"
 msgstr ""
 
-#: ../midori/main.c:770
+#: ../midori/main.c:779
 #, c-format
 msgid "The search engines couldn't be saved. %s"
 msgstr ""
 
-#: ../midori/main.c:789 ../midori/main.c:817 ../midori/main.c:846
+#: ../midori/main.c:798 ../midori/main.c:826 ../midori/main.c:855
 #, c-format
 msgid "The bookmarks couldn't be saved. %s"
 msgstr ""
 
 #. i18n: Trash, or wastebin, containing closed tabs
-#: ../midori/main.c:869 ../midori/main.c:892
+#: ../midori/main.c:878 ../midori/main.c:901
 #, c-format
 msgid "The trash couldn't be saved. %s"
 msgstr ""
 
-#: ../midori/main.c:965
+#: ../midori/main.c:974
 #, c-format
 msgid "The session couldn't be saved. %s"
 msgstr ""
 
-#: ../midori/main.c:1092
+#: ../midori/main.c:1101
 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/main.c:1107
+#: ../midori/main.c:1116
 msgid "Modify _preferences"
 msgstr ""
 
-#: ../midori/main.c:1111
+#: ../midori/main.c:1120
 msgid "Reset the last _session"
 msgstr ""
 
-#: ../midori/main.c:1116
+#: ../midori/main.c:1125
 msgid "Disable all _extensions"
 msgstr ""
 
-#: ../midori/main.c:1315
+#: ../midori/main.c:1344
 msgid "No filename specified"
 msgstr ""
 
-#: ../midori/main.c:1338
+#: ../midori/main.c:1367
 msgid "An unknown error occured."
 msgstr ""
 
-#: ../midori/main.c:1370
+#: ../midori/main.c:1400
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr ""
 
-#: ../midori/main.c:1391
+#: ../midori/main.c:1435
 msgid "Run ADDRESS as a web application"
 msgstr ""
 
-#: ../midori/main.c:1391
+#: ../midori/main.c:1435
 msgid "ADDRESS"
 msgstr ""
 
-#: ../midori/main.c:1393
+#: ../midori/main.c:1437
 msgid "Use FOLDER as configuration folder"
 msgstr ""
 
-#: ../midori/main.c:1393
+#: ../midori/main.c:1437
 msgid "FOLDER"
 msgstr ""
 
-#: ../midori/main.c:1395
+#: ../midori/main.c:1440
 msgid "Run the specified filename as javascript"
 msgstr ""
 
-#: ../midori/main.c:1398
+#: ../midori/main.c:1444
 msgid "Take a snapshot of the specified URI"
 msgstr ""
 
-#: ../midori/main.c:1401
+#: ../midori/main.c:1447
+msgid "Execute the specified command"
+msgstr ""
+
+#: ../midori/main.c:1449
 msgid "Display program version"
 msgstr ""
 
-#: ../midori/main.c:1403
+#: ../midori/main.c:1451
 msgid "Addresses"
 msgstr ""
 
-#: ../midori/main.c:1446
+#: ../midori/main.c:1495
 msgid "[Addresses]"
 msgstr ""
 
-#: ../midori/main.c:1469
+#: ../midori/main.c:1518
 msgid "Please report comments, suggestions and bugs to:"
 msgstr ""
 
-#: ../midori/main.c:1471
+#: ../midori/main.c:1520
 msgid "Check for new versions at:"
 msgstr ""
 
-#: ../midori/main.c:1548
+#: ../midori/main.c:1602
 msgid "The specified configuration folder is invalid."
 msgstr ""
 
-#: ../midori/main.c:1583
+#: ../midori/main.c:1638
 msgid "An instance of Midori is already running but not responding.\n"
 msgstr ""
 
-#: ../midori/main.c:1633
+#: ../midori/main.c:1688
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr ""
 
-#: ../midori/main.c:1645
+#: ../midori/main.c:1700
 #, c-format
 msgid "The bookmarks couldn't be loaded: %s\n"
 msgstr ""
 
-#: ../midori/main.c:1660
+#: ../midori/main.c:1715
 #, c-format
 msgid "The session couldn't be loaded: %s\n"
 msgstr ""
 
-#: ../midori/main.c:1673
+#: ../midori/main.c:1728
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr ""
 
-#: ../midori/main.c:1686
+#: ../midori/main.c:1741
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr ""
 
-#: ../midori/main.c:1698
+#: ../midori/main.c:1753
 msgid "The following errors occured:"
 msgstr ""
 
-#: ../midori/main.c:1714
+#: ../midori/main.c:1769
 msgid "_Ignore"
 msgstr ""
 
-#: ../midori/midori-array.c:195
+#: ../midori/midori-array.c:250
 msgid "File not found."
 msgstr ""
 
-#: ../midori/midori-array.c:203 ../midori/midori-array.c:212
+#: ../midori/midori-array.c:258 ../midori/midori-array.c:267
 msgid "Malformed document."
 msgstr ""
 
-#: ../midori/midori-array.c:338 ../midori/sokoke.c:716
+#: ../midori/midori-array.c:429 ../midori/sokoke.c:700
 #, c-format
 msgid "Writing failed."
 msgstr ""
 
-#: ../midori/midori-browser.c:287 ../midori/midori-browser.c:3819
-#: ../midori/midori-browser.c:3825
+#: ../midori/midori-browser.c:304 ../midori/midori-browser.c:4177
+#: ../midori/midori-browser.c:4183
 msgid "Reload the current page"
 msgstr ""
 
-#: ../midori/midori-browser.c:298 ../midori/midori-browser.c:3822
+#: ../midori/midori-browser.c:315 ../midori/midori-browser.c:4180
 msgid "Stop loading the current page"
 msgstr ""
 
-#: ../midori/midori-browser.c:360
+#: ../midori/midori-browser.c:410
 #, c-format
 msgid "%d%% loaded"
 msgstr ""
 
-#: ../midori/midori-browser.c:385
+#: ../midori/midori-browser.c:435
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr ""
 
-#: ../midori/midori-browser.c:603
+#: ../midori/midori-browser.c:617
 msgid "New folder"
 msgstr ""
 
-#: ../midori/midori-browser.c:603
+#: ../midori/midori-browser.c:617
 msgid "Edit folder"
 msgstr ""
 
-#: ../midori/midori-browser.c:605
+#: ../midori/midori-browser.c:619
 msgid "New bookmark"
 msgstr ""
 
-#: ../midori/midori-browser.c:605
+#: ../midori/midori-browser.c:619
 msgid "Edit bookmark"
 msgstr ""
 
-#: ../midori/midori-browser.c:635
+#: ../midori/midori-browser.c:649
 msgid "_Title:"
 msgstr ""
 
-#: ../midori/midori-browser.c:648 ../midori/midori-searchaction.c:948
+#: ../midori/midori-browser.c:662 ../midori/midori-searchaction.c:948
 msgid "_Description:"
 msgstr ""
 
-#: ../midori/midori-browser.c:667 ../midori/midori-searchaction.c:962
+#: ../midori/midori-browser.c:681 ../midori/midori-searchaction.c:962
 #: ../extensions/feed-panel/main.c:343
 msgid "_Address:"
 msgstr ""
 
-#: ../midori/midori-browser.c:686
+#: ../midori/midori-browser.c:700
 msgid "_Folder:"
 msgstr ""
 
-#: ../midori/midori-browser.c:691 ../midori/midori-browser.c:732
+#: ../midori/midori-browser.c:705 ../midori/midori-browser.c:746
 msgid "Toplevel folder"
 msgstr ""
 
-#: ../midori/midori-browser.c:808
+#: ../midori/midori-browser.c:822
 msgid "Save file as"
 msgstr ""
 
-#: ../midori/midori-browser.c:1119
+#: ../midori/midori-browser.c:1169
 #, c-format
 msgid "The file <b>%s</b> has been downloaded."
 msgstr ""
 
-#: ../midori/midori-browser.c:1123
+#: ../midori/midori-browser.c:1173
 msgid "Transfer completed"
 msgstr ""
 
-#: ../midori/midori-browser.c:1820
+#: ../midori/midori-browser.c:1314
+msgid "Save file"
+msgstr ""
+
+#: ../midori/midori-browser.c:1960
 msgid "Open file"
 msgstr ""
 
-#: ../midori/midori-browser.c:3152 ../panels/midori-bookmarks.c:778
-#: ../panels/midori-history.c:808
+#: ../midori/midori-browser.c:3429 ../panels/midori-bookmarks.c:781
+#: ../panels/midori-history.c:812
 msgid "Open all in _Tabs"
 msgstr ""
 
-#: ../midori/midori-browser.c:3159 ../panels/midori-bookmarks.c:784
-#: ../panels/midori-history.c:814 ../extensions/feed-panel/feed-panel.c:542
+#: ../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 ""
 
-#: ../midori/midori-browser.c:3162 ../panels/midori-bookmarks.c:786
-#: ../panels/midori-history.c:816 ../extensions/feed-panel/feed-panel.c:544
+#: ../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 ""
 
-#: ../midori/midori-browser.c:3425
+#: ../midori/midori-browser.c:3739
 msgid "Clear Private Data"
 msgstr ""
 
-#: ../midori/midori-browser.c:3428
+#: ../midori/midori-browser.c:3743
 msgid "_Clear private data"
 msgstr ""
 
-#: ../midori/midori-browser.c:3441
+#: ../midori/midori-browser.c:3756
 msgid "Clear the following data:"
 msgstr ""
 
-#: ../midori/midori-browser.c:3449 ../midori/midori-preferences.c:669
+#: ../midori/midori-browser.c:3766 ../midori/midori-preferences.c:675
 #: ../panels/midori-history.c:108
 msgid "History"
 msgstr ""
 
-#: ../midori/midori-browser.c:3452
+#: ../midori/midori-browser.c:3771
 msgid "Cookies"
 msgstr ""
 
-#: ../midori/midori-browser.c:3455
+#: ../midori/midori-browser.c:3776
 msgid "'Flash' Cookies"
 msgstr ""
 
-#: ../midori/midori-browser.c:3458
+#: ../midori/midori-browser.c:3781
 msgid "Website icons"
 msgstr ""
 
-#: ../midori/midori-browser.c:3538
+#: ../midori/midori-browser.c:3786 ../midori/sokoke.c:874
+msgid "_Closed Tabs and Windows"
+msgstr ""
+
+#: ../midori/midori-browser.c:3869
 msgid "A lightweight web browser."
 msgstr ""
 
-#: ../midori/midori-browser.c:3546
+#: ../midori/midori-browser.c:3877
 msgid "translator-credits"
 msgstr ""
 
-#: ../midori/midori-browser.c:3750
+#: ../midori/midori-browser.c:4111
 msgid "_File"
 msgstr ""
 
-#: ../midori/midori-browser.c:3753
+#: ../midori/midori-browser.c:4114
 msgid "Open a new window"
 msgstr ""
 
-#: ../midori/midori-browser.c:3756
+#: ../midori/midori-browser.c:4117
 msgid "Open a new tab"
 msgstr ""
 
-#: ../midori/midori-browser.c:3759
+#: ../midori/midori-browser.c:4120
 msgid "Open a file"
 msgstr ""
 
-#: ../midori/midori-browser.c:3762
+#: ../midori/midori-browser.c:4123
 msgid "Save to a file"
 msgstr ""
 
-#: ../midori/midori-browser.c:3764 ../midori/midori-view.c:1256
+#: ../midori/midori-browser.c:4125
 msgid "Add to Speed _dial"
 msgstr ""
 
-#: ../midori/midori-browser.c:3765
+#: ../midori/midori-browser.c:4126
 msgid "Add shortcut to speed dial"
 msgstr ""
 
-#: ../midori/midori-browser.c:3767
+#: ../midori/midori-browser.c:4128
 msgid "_Close Tab"
 msgstr ""
 
-#: ../midori/midori-browser.c:3768
+#: ../midori/midori-browser.c:4129
 msgid "Close the current tab"
 msgstr ""
 
-#: ../midori/midori-browser.c:3770
+#: ../midori/midori-browser.c:4131
 msgid "C_lose Window"
 msgstr ""
 
-#: ../midori/midori-browser.c:3771
+#: ../midori/midori-browser.c:4132
 msgid "Close this window"
 msgstr ""
 
-#: ../midori/midori-browser.c:3774
+#: ../midori/midori-browser.c:4135
 msgid "Print the current page"
 msgstr ""
 
-#: ../midori/midori-browser.c:3777
+#: ../midori/midori-browser.c:4138
 msgid "Quit the application"
 msgstr ""
 
-#: ../midori/midori-browser.c:3779
+#: ../midori/midori-browser.c:4140
 msgid "_Edit"
 msgstr ""
 
-#: ../midori/midori-browser.c:3782
+#: ../midori/midori-browser.c:4143
 msgid "Cut the selected text"
 msgstr ""
 
-#: ../midori/midori-browser.c:3785 ../midori/midori-browser.c:3788
+#: ../midori/midori-browser.c:4146 ../midori/midori-browser.c:4149
 msgid "Copy the selected text"
 msgstr ""
 
-#: ../midori/midori-browser.c:3791
+#: ../midori/midori-browser.c:4152
 msgid "Paste text from the clipboard"
 msgstr ""
 
-#: ../midori/midori-browser.c:3794
+#: ../midori/midori-browser.c:4155
 msgid "Delete the selected text"
 msgstr ""
 
-#: ../midori/midori-browser.c:3797
+#: ../midori/midori-browser.c:4158
 msgid "Select all text"
 msgstr ""
 
-#: ../midori/midori-browser.c:3800
+#: ../midori/midori-browser.c:4161
 msgid "Find a word or phrase in the page"
 msgstr ""
 
-#: ../midori/midori-browser.c:3802
+#: ../midori/midori-browser.c:4163
 msgid "Find _Next"
 msgstr ""
 
-#: ../midori/midori-browser.c:3803
+#: ../midori/midori-browser.c:4164
 msgid "Find the next occurrence of a word or phrase"
 msgstr ""
 
-#: ../midori/midori-browser.c:3805
+#: ../midori/midori-browser.c:4166
 msgid "Find _Previous"
 msgstr ""
 
-#: ../midori/midori-browser.c:3806
+#: ../midori/midori-browser.c:4167
 msgid "Find the previous occurrence of a word or phrase"
 msgstr ""
 
-#: ../midori/midori-browser.c:3809
-msgid "_Quick Find"
-msgstr ""
-
-#: ../midori/midori-browser.c:3810
-msgid "Quickly jump to a word or phrase"
-msgstr ""
-
-#: ../midori/midori-browser.c:3813
+#: ../midori/midori-browser.c:4171
 msgid "Configure the application preferences"
 msgstr ""
 
-#: ../midori/midori-browser.c:3815
+#: ../midori/midori-browser.c:4173
 msgid "_View"
 msgstr ""
 
-#: ../midori/midori-browser.c:3816
+#: ../midori/midori-browser.c:4174
 msgid "_Toolbars"
 msgstr ""
 
-#: ../midori/midori-browser.c:3828
+#: ../midori/midori-browser.c:4186
 msgid "Increase the zoom level"
 msgstr ""
 
-#: ../midori/midori-browser.c:3831
+#: ../midori/midori-browser.c:4189
 msgid "Decrease the zoom level"
 msgstr ""
 
-#: ../midori/midori-browser.c:3834
+#: ../midori/midori-browser.c:4192
 msgid "Reset the zoom level"
 msgstr ""
 
-#: ../midori/midori-browser.c:3835
+#: ../midori/midori-browser.c:4193
 msgid "_Encoding"
 msgstr ""
 
-#: ../midori/midori-browser.c:3837
-msgid "_Automatic"
+#: ../midori/midori-browser.c:4195
+msgid "View So_urce"
 msgstr ""
 
-#: ../midori/midori-browser.c:3840 ../midori/midori-websettings.c:204
-msgid "Chinese (BIG5)"
-msgstr ""
-
-#: ../midori/midori-browser.c:3843 ../midori/midori-websettings.c:205
-msgid "Japanese (SHIFT_JIS)"
-msgstr ""
-
-#: ../midori/midori-browser.c:3846 ../midori/midori-websettings.c:206
-msgid "Russian (KOI8-R)"
-msgstr ""
-
-#: ../midori/midori-browser.c:3849 ../midori/midori-websettings.c:207
-msgid "Unicode (UTF-8)"
-msgstr ""
-
-#: ../midori/midori-browser.c:3852 ../midori/midori-websettings.c:208
-msgid "Western (ISO-8859-1)"
-msgstr ""
-
-#: ../midori/midori-browser.c:3855 ../midori/midori-websettings.c:209
-#: ../midori/midori-websettings.c:281
-msgid "Custom..."
-msgstr ""
-
-#: ../midori/midori-browser.c:3858 ../midori/midori-view.c:1275
-msgid "View _Source"
-msgstr ""
-
-#: ../midori/midori-browser.c:3859
+#: ../midori/midori-browser.c:4196
 msgid "View the source code of the page"
 msgstr ""
 
-#: ../midori/midori-browser.c:3861
+#: ../midori/midori-browser.c:4198
 msgid "View Selection Source"
 msgstr ""
 
-#: ../midori/midori-browser.c:3862
+#: ../midori/midori-browser.c:4199
 msgid "View the source code of the selection"
 msgstr ""
 
-#: ../midori/midori-browser.c:3866
+#: ../midori/midori-browser.c:4203
 msgid "Toggle fullscreen view"
 msgstr ""
 
-#: ../midori/midori-browser.c:3868
+#: ../midori/midori-browser.c:4205
 msgid "_Go"
 msgstr ""
 
-#: ../midori/midori-browser.c:3871
+#: ../midori/midori-browser.c:4208
 msgid "Go back to the previous page"
 msgstr ""
 
-#: ../midori/midori-browser.c:3874
+#: ../midori/midori-browser.c:4211
 msgid "Go forward to the next page"
 msgstr ""
 
-#: ../midori/midori-browser.c:3877
+#: ../midori/midori-browser.c:4214
 msgid "Go to your homepage"
 msgstr ""
 
-#: ../midori/midori-browser.c:3879
+#: ../midori/midori-browser.c:4216
 msgid "Empty Trash"
 msgstr ""
 
-#: ../midori/midori-browser.c:3880
+#: ../midori/midori-browser.c:4217
 msgid "Delete the contents of the trash"
 msgstr ""
 
-#: ../midori/midori-browser.c:3882 ../midori/midori-view.c:1233
-msgid "Undo Close Tab"
+#: ../midori/midori-browser.c:4219
+msgid "Undo _Close Tab"
 msgstr ""
 
-#: ../midori/midori-browser.c:3883
+#: ../midori/midori-browser.c:4220
 msgid "Open the last closed tab"
 msgstr ""
 
-#: ../midori/midori-browser.c:3887 ../panels/midori-bookmarks.c:230
+#: ../midori/midori-browser.c:4224 ../panels/midori-bookmarks.c:231
 msgid "Add a new bookmark"
 msgstr ""
 
-#: ../midori/midori-browser.c:3889 ../panels/midori-bookmarks.c:259
-msgid "Add a new folder"
+#: ../midori/midori-browser.c:4226
+msgid "Add a new _folder"
 msgstr ""
 
-#: ../midori/midori-browser.c:3890
+#: ../midori/midori-browser.c:4227
 msgid "Add a new bookmark folder"
 msgstr ""
 
-#: ../midori/midori-browser.c:3891
+#: ../midori/midori-browser.c:4228
 msgid "_Tools"
 msgstr ""
 
-#: ../midori/midori-browser.c:3893 ../midori/midori-searchaction.c:493
+#: ../midori/midori-browser.c:4230 ../midori/midori-searchaction.c:493
 msgid "_Manage Search Engines"
 msgstr ""
 
-#: ../midori/midori-browser.c:3894
+#: ../midori/midori-browser.c:4231
 msgid "Add, edit and remove search engines..."
 msgstr ""
 
-#: ../midori/midori-browser.c:3897
+#: ../midori/midori-browser.c:4234
 msgid "_Clear Private Data"
 msgstr ""
 
-#: ../midori/midori-browser.c:3898
+#: ../midori/midori-browser.c:4235
 msgid "Clear private data..."
 msgstr ""
 
-#: ../midori/midori-browser.c:3902
+#: ../midori/midori-browser.c:4239
 msgid "_Previous Tab"
 msgstr ""
 
-#: ../midori/midori-browser.c:3903
+#: ../midori/midori-browser.c:4240
 msgid "Switch to the previous tab"
 msgstr ""
 
-#: ../midori/midori-browser.c:3905
+#: ../midori/midori-browser.c:4242
 msgid "_Next Tab"
 msgstr ""
 
-#: ../midori/midori-browser.c:3906
+#: ../midori/midori-browser.c:4243
 msgid "Switch to the next tab"
 msgstr ""
 
-#: ../midori/midori-browser.c:3908
+#: ../midori/midori-browser.c:4245
 msgid "_Help"
 msgstr ""
 
-#: ../midori/midori-browser.c:3910
+#: ../midori/midori-browser.c:4247
 msgid "_Contents"
 msgstr ""
 
-#: ../midori/midori-browser.c:3911
+#: ../midori/midori-browser.c:4248
 msgid "Show the documentation"
 msgstr ""
 
-#: ../midori/midori-browser.c:3913
+#: ../midori/midori-browser.c:4250
 msgid "_Frequent Questions"
 msgstr ""
 
-#: ../midori/midori-browser.c:3914
+#: ../midori/midori-browser.c:4251
 msgid "Show the Frequently Asked Questions"
 msgstr ""
 
-#: ../midori/midori-browser.c:3916
+#: ../midori/midori-browser.c:4253
 msgid "_Report a Bug"
 msgstr ""
 
-#: ../midori/midori-browser.c:3917
+#: ../midori/midori-browser.c:4254
 msgid "Open Midori's bug tracker"
 msgstr ""
 
-#: ../midori/midori-browser.c:3920
+#: ../midori/midori-browser.c:4257
 msgid "Show information about the program"
 msgstr ""
 
-#: ../midori/midori-browser.c:3927
+#: ../midori/midori-browser.c:4264
 msgid "P_rivate Browsing"
 msgstr ""
 
-#: ../midori/midori-browser.c:3928
+#: ../midori/midori-browser.c:4265
 msgid "Don't save any private data while browsing"
 msgstr ""
 
-#: ../midori/midori-browser.c:3933
+#: ../midori/midori-browser.c:4270
 msgid "_Menubar"
 msgstr ""
 
-#: ../midori/midori-browser.c:3934
+#: ../midori/midori-browser.c:4271
 msgid "Show menubar"
 msgstr ""
 
-#: ../midori/midori-browser.c:3937
+#: ../midori/midori-browser.c:4274
 msgid "_Navigationbar"
 msgstr ""
 
-#: ../midori/midori-browser.c:3938
+#: ../midori/midori-browser.c:4275
 msgid "Show navigationbar"
 msgstr ""
 
-#: ../midori/midori-browser.c:3941
+#: ../midori/midori-browser.c:4278
 msgid "Side_panel"
 msgstr ""
 
-#: ../midori/midori-browser.c:3942
+#: ../midori/midori-browser.c:4279
 msgid "Show sidepanel"
 msgstr ""
 
-#: ../midori/midori-browser.c:3945
+#: ../midori/midori-browser.c:4282
 msgid "_Bookmarkbar"
 msgstr ""
 
-#: ../midori/midori-browser.c:3946
+#: ../midori/midori-browser.c:4283
 msgid "Show bookmarkbar"
 msgstr ""
 
-#: ../midori/midori-browser.c:3949
+#: ../midori/midori-browser.c:4286
 msgid "_Transferbar"
 msgstr ""
 
-#: ../midori/midori-browser.c:3950
+#: ../midori/midori-browser.c:4287
 msgid "Show transferbar"
 msgstr ""
 
-#: ../midori/midori-browser.c:3953
+#: ../midori/midori-browser.c:4290
 msgid "_Statusbar"
 msgstr ""
 
-#: ../midori/midori-browser.c:3954
+#: ../midori/midori-browser.c:4291
 msgid "Show statusbar"
 msgstr ""
 
-#: ../midori/midori-browser.c:4389
+#: ../midori/midori-browser.c:4298
+msgid "_Automatic"
+msgstr ""
+
+#: ../midori/midori-browser.c:4301 ../midori/midori-websettings.c:212
+msgid "Chinese (BIG5)"
+msgstr ""
+
+#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic
+#: ../midori/midori-browser.c:4305
+msgid "Japanese (SHIFT__JIS)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4308 ../midori/midori-websettings.c:214
+msgid "Russian (KOI8-R)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4311 ../midori/midori-websettings.c:215
+msgid "Unicode (UTF-8)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4314 ../midori/midori-websettings.c:216
+msgid "Western (ISO-8859-1)"
+msgstr ""
+
+#: ../midori/midori-browser.c:4317 ../midori/midori-websettings.c:217
+#: ../midori/midori-websettings.c:289
+msgid "Custom..."
+msgstr ""
+
+#: ../midori/midori-browser.c:4755
 msgid "_Separator"
 msgstr ""
 
-#: ../midori/midori-browser.c:4396
+#: ../midori/midori-browser.c:4762
 msgid "_Location..."
 msgstr ""
 
-#: ../midori/midori-browser.c:4398
+#: ../midori/midori-browser.c:4764
 msgid "Open a particular location"
 msgstr ""
 
-#: ../midori/midori-browser.c:4420
+#: ../midori/midori-browser.c:4788
 msgid "_Web Search..."
 msgstr ""
 
-#: ../midori/midori-browser.c:4422
+#: ../midori/midori-browser.c:4790
 msgid "Run a web search"
 msgstr ""
 
-#: ../midori/midori-browser.c:4443
+#: ../midori/midori-browser.c:4811
 msgid "Reopen a previously closed tab or window"
 msgstr ""
 
-#: ../midori/midori-browser.c:4458
+#: ../midori/midori-browser.c:4826
 msgid "_Recently visited pages"
 msgstr ""
 
-#: ../midori/midori-browser.c:4460
+#: ../midori/midori-browser.c:4828
 msgid "Reopen pages that you visited earlier"
 msgstr ""
 
-#: ../midori/midori-browser.c:4475 ../midori/sokoke.c:872
+#: ../midori/midori-browser.c:4843 ../midori/sokoke.c:863
 msgid "_Bookmarks"
 msgstr ""
 
-#: ../midori/midori-browser.c:4477
+#: ../midori/midori-browser.c:4845
 msgid "Show the saved bookmarks"
 msgstr ""
 
-#: ../midori/midori-browser.c:4492
+#: ../midori/midori-browser.c:4860
 msgid "_Window"
 msgstr ""
 
-#: ../midori/midori-browser.c:4494
+#: ../midori/midori-browser.c:4862
 msgid "Show a list of all open tabs"
 msgstr ""
 
+#: ../midori/midori-browser.c:4876
+msgid "_Menu"
+msgstr ""
+
+#: ../midori/midori-browser.c:4878
+msgid "Menu"
+msgstr ""
+
 #. i18n: A panel at the bottom, to search text in pages
-#: ../midori/midori-browser.c:4674
+#: ../midori/midori-browser.c:5059
 msgid "_Inline Find:"
 msgstr ""
 
-#: ../midori/midori-browser.c:4699
+#: ../midori/midori-browser.c:5084
 msgid "Previous"
 msgstr ""
 
-#: ../midori/midori-browser.c:4704
+#: ../midori/midori-browser.c:5089
 msgid "Next"
 msgstr ""
 
-#: ../midori/midori-browser.c:4709
+#: ../midori/midori-browser.c:5094
 msgid "Match Case"
 msgstr ""
 
-#: ../midori/midori-browser.c:4717
+#: ../midori/midori-browser.c:5102
 msgid "Highlight Matches"
 msgstr ""
 
-#: ../midori/midori-browser.c:4727
+#: ../midori/midori-browser.c:5112
 msgid "Close Findbar"
 msgstr ""
 
-#: ../midori/midori-browser.c:4762 ../extensions/cookie-manager.c:821
+#: ../midori/midori-browser.c:5147
+#: ../extensions/cookie-manager/cookie-manager-page.c:109
 msgid "Delete All"
 msgstr ""
 
-#: ../midori/midori-browser.c:5084
+#: ../midori/midori-browser.c:5476
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr ""
 
+#: ../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:335
-msgid "Whether to detach the chosen panel from the window"
+#: ../midori/midori-panel.c:343 ../midori/midori-panel.c:508
+msgid "Align sidepanel to the right"
 msgstr ""
 
-#: ../midori/midori-panel.c:345 ../midori/midori-websettings.c:535
-msgid "Align sidepanel on the right"
-msgstr ""
-
-#: ../midori/midori-panel.c:347 ../midori/midori-websettings.c:536
-msgid "Whether to align the sidepanel on the right"
-msgstr ""
-
-#: ../midori/midori-panel.c:357 ../midori/midori-panel.c:358
+#: ../midori/midori-panel.c:353 ../midori/midori-panel.c:354
 msgid "Close panel"
 msgstr ""
 
-#: ../midori/midori-websettings.c:187 ../midori/midori-view.c:1999
-#: ../midori/midori-view.c:2176
+#: ../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 ""
 
-#: ../midori/midori-websettings.c:188 ../midori/midori-websettings.c:555
+#: ../midori/midori-websettings.c:196 ../midori/midori-websettings.c:563
 msgid "Homepage"
 msgstr ""
 
-#: ../midori/midori-websettings.c:189
+#: ../midori/midori-websettings.c:197
 msgid "Last open pages"
 msgstr ""
 
-#: ../midori/midori-websettings.c:224
+#: ../midori/midori-websettings.c:213
+msgid "Japanese (SHIFT_JIS)"
+msgstr ""
+
+#: ../midori/midori-websettings.c:232
 msgid "New tab"
 msgstr ""
 
-#: ../midori/midori-websettings.c:225
+#: ../midori/midori-websettings.c:233
 msgid "New window"
 msgstr ""
 
-#: ../midori/midori-websettings.c:226
+#: ../midori/midori-websettings.c:234
 msgid "Current tab"
 msgstr ""
 
-#: ../midori/midori-websettings.c:241
+#: ../midori/midori-websettings.c:249
 msgid "Default"
 msgstr ""
 
-#: ../midori/midori-websettings.c:242
+#: ../midori/midori-websettings.c:250
 msgid "Icons"
 msgstr ""
 
-#: ../midori/midori-websettings.c:243
+#: ../midori/midori-websettings.c:251
 msgid "Text"
 msgstr ""
 
-#: ../midori/midori-websettings.c:244
+#: ../midori/midori-websettings.c:252
 msgid "Both"
 msgstr ""
 
-#: ../midori/midori-websettings.c:245
+#: ../midori/midori-websettings.c:253
 msgid "Both horizontal"
 msgstr ""
 
-#: ../midori/midori-websettings.c:260
+#: ../midori/midori-websettings.c:268
 msgid "All cookies"
 msgstr ""
 
-#: ../midori/midori-websettings.c:261
+#: ../midori/midori-websettings.c:269
 msgid "Session cookies"
 msgstr ""
 
-#: ../midori/midori-websettings.c:262 ../panels/midori-addons.c:94
+#: ../midori/midori-websettings.c:270 ../panels/midori-addons.c:94
+#: ../extensions/shortcuts.c:87
 msgid "None"
 msgstr ""
 
-#: ../midori/midori-websettings.c:278
+#: ../midori/midori-websettings.c:286
 msgid "Safari"
 msgstr ""
 
-#: ../midori/midori-websettings.c:279
+#: ../midori/midori-websettings.c:287
 msgid "Firefox"
 msgstr ""
 
-#: ../midori/midori-websettings.c:280
+#: ../midori/midori-websettings.c:288
 msgid "Internet Explorer"
 msgstr ""
 
-#: ../midori/midori-websettings.c:333
+#: ../midori/midori-websettings.c:341
 msgid "Remember last window size"
 msgstr ""
 
-#: ../midori/midori-websettings.c:334
+#: ../midori/midori-websettings.c:342
 msgid "Whether to save the last window size"
 msgstr ""
 
-#: ../midori/midori-websettings.c:342
+#: ../midori/midori-websettings.c:350
 msgid "Last window width"
 msgstr ""
 
-#: ../midori/midori-websettings.c:343
+#: ../midori/midori-websettings.c:351
 msgid "The last saved window width"
 msgstr ""
 
-#: ../midori/midori-websettings.c:351
+#: ../midori/midori-websettings.c:359
 msgid "Last window height"
 msgstr ""
 
-#: ../midori/midori-websettings.c:352
+#: ../midori/midori-websettings.c:360
 msgid "The last saved window height"
 msgstr ""
 
-#: ../midori/midori-websettings.c:377
+#: ../midori/midori-websettings.c:385
 msgid "Last panel position"
 msgstr ""
 
-#: ../midori/midori-websettings.c:378
+#: ../midori/midori-websettings.c:386
 msgid "The last saved panel position"
 msgstr ""
 
 #. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:387
+#: ../midori/midori-websettings.c:395
 msgid "Last panel page"
 msgstr ""
 
-#: ../midori/midori-websettings.c:388
+#: ../midori/midori-websettings.c:396
 msgid "The last saved panel page"
 msgstr ""
 
-#: ../midori/midori-websettings.c:396
+#: ../midori/midori-websettings.c:404
 msgid "Last Web search"
 msgstr ""
 
-#: ../midori/midori-websettings.c:397
+#: ../midori/midori-websettings.c:405
 msgid "The last saved Web search"
 msgstr ""
 
-#: ../midori/midori-websettings.c:406
+#: ../midori/midori-websettings.c:414
 msgid "Show Menubar"
 msgstr ""
 
-#: ../midori/midori-websettings.c:407
+#: ../midori/midori-websettings.c:415
 msgid "Whether to show the menubar"
 msgstr ""
 
-#: ../midori/midori-websettings.c:415
+#: ../midori/midori-websettings.c:423
 msgid "Show Navigationbar"
 msgstr ""
 
-#: ../midori/midori-websettings.c:416
+#: ../midori/midori-websettings.c:424
 msgid "Whether to show the navigationbar"
 msgstr ""
 
-#: ../midori/midori-websettings.c:424
+#: ../midori/midori-websettings.c:432
 msgid "Show Bookmarkbar"
 msgstr ""
 
-#: ../midori/midori-websettings.c:425
+#: ../midori/midori-websettings.c:433
 msgid "Whether to show the bookmarkbar"
 msgstr ""
 
-#: ../midori/midori-websettings.c:433
+#: ../midori/midori-websettings.c:441
 msgid "Show Panel"
 msgstr ""
 
-#: ../midori/midori-websettings.c:434
+#: ../midori/midori-websettings.c:442
 msgid "Whether to show the panel"
 msgstr ""
 
-#: ../midori/midori-websettings.c:449
+#: ../midori/midori-websettings.c:457
 msgid "Show Transferbar"
 msgstr ""
 
-#: ../midori/midori-websettings.c:450
+#: ../midori/midori-websettings.c:458
 msgid "Whether to show the transferbar"
 msgstr ""
 
-#: ../midori/midori-websettings.c:458
+#: ../midori/midori-websettings.c:466
 msgid "Show Statusbar"
 msgstr ""
 
-#: ../midori/midori-websettings.c:459
+#: ../midori/midori-websettings.c:467
 msgid "Whether to show the statusbar"
 msgstr ""
 
-#: ../midori/midori-websettings.c:468
+#: ../midori/midori-websettings.c:476
 msgid "Toolbar Style"
 msgstr ""
 
-#: ../midori/midori-websettings.c:469
+#: ../midori/midori-websettings.c:477
 msgid "The style of the toolbar"
 msgstr ""
 
-#: ../midori/midori-websettings.c:485
+#: ../midori/midori-websettings.c:493
 msgid "Show progress in location entry"
 msgstr ""
 
-#: ../midori/midori-websettings.c:486
+#: ../midori/midori-websettings.c:494
 msgid "Whether to show loading progress in the location entry"
 msgstr ""
 
-#: ../midori/midori-websettings.c:501
+#: ../midori/midori-websettings.c:509
 msgid "Search engines in location completion"
 msgstr ""
 
-#: ../midori/midori-websettings.c:502
+#: ../midori/midori-websettings.c:510
 msgid "Whether to show search engines in the location completion"
 msgstr ""
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:518
 msgid "Toolbar Items"
 msgstr ""
 
-#: ../midori/midori-websettings.c:511
+#: ../midori/midori-websettings.c:519
 msgid "The items to show on the toolbar"
 msgstr ""
 
-#: ../midori/midori-websettings.c:519
+#: ../midori/midori-websettings.c:527
 msgid "Compact Sidepanel"
 msgstr ""
 
-#: ../midori/midori-websettings.c:520
+#: ../midori/midori-websettings.c:528
 msgid "Whether to make the sidepanel compact"
 msgstr ""
 
-#: ../midori/midori-websettings.c:545
+#: ../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 ""
 
-#: ../midori/midori-websettings.c:546
+#: ../midori/midori-websettings.c:554
 msgid "What to load on startup"
 msgstr ""
 
-#: ../midori/midori-websettings.c:556
+#: ../midori/midori-websettings.c:564
 msgid "The homepage"
 msgstr ""
 
-#: ../midori/midori-websettings.c:571
+#: ../midori/midori-websettings.c:579
 msgid "Show crash dialog"
 msgstr ""
 
-#: ../midori/midori-websettings.c:572
+#: ../midori/midori-websettings.c:580
 msgid "Show a dialog after Midori crashed"
 msgstr ""
 
 #. i18n: Speed dial, webpage shortcuts, named for the phone function
-#: ../midori/midori-websettings.c:588
+#: ../midori/midori-websettings.c:596
 msgid "Show speed dial in new tabs"
 msgstr ""
 
-#: ../midori/midori-websettings.c:589
+#: ../midori/midori-websettings.c:597
 msgid "Show speed dial in newly opened tabs"
 msgstr ""
 
-#: ../midori/midori-websettings.c:597
+#: ../midori/midori-websettings.c:605
 msgid "Download Folder"
 msgstr ""
 
-#: ../midori/midori-websettings.c:598
+#: ../midori/midori-websettings.c:606
 msgid "The folder downloaded files are saved to"
 msgstr ""
 
-#: ../midori/midori-websettings.c:617
+#: ../midori/midori-websettings.c:625
 msgid "Ask for the destination folder"
 msgstr ""
 
-#: ../midori/midori-websettings.c:618
+#: ../midori/midori-websettings.c:626
 msgid "Whether to ask for the destination folder when downloading a file"
 msgstr ""
 
-#: ../midori/midori-websettings.c:637
+#: ../midori/midori-websettings.c:645
 msgid "Notify when a transfer has been completed"
 msgstr ""
 
-#: ../midori/midori-websettings.c:638
+#: ../midori/midori-websettings.c:646
 msgid "Whether to show a notification when a transfer has been completed"
 msgstr ""
 
-#: ../midori/midori-websettings.c:650
+#: ../midori/midori-websettings.c:658
 msgid "Download Manager"
 msgstr ""
 
-#: ../midori/midori-websettings.c:651
+#: ../midori/midori-websettings.c:659
 msgid "An external download manager"
 msgstr ""
 
-#: ../midori/midori-websettings.c:659
+#: ../midori/midori-websettings.c:667
 msgid "Text Editor"
 msgstr ""
 
-#: ../midori/midori-websettings.c:660
+#: ../midori/midori-websettings.c:668
 msgid "An external text editor"
 msgstr ""
 
-#: ../midori/midori-websettings.c:675
+#: ../midori/midori-websettings.c:683
 msgid "News Aggregator"
 msgstr ""
 
-#: ../midori/midori-websettings.c:676
+#: ../midori/midori-websettings.c:684
 msgid "An external news aggregator"
 msgstr ""
 
-#: ../midori/midori-websettings.c:684
+#: ../midori/midori-websettings.c:692
 msgid "Location entry Search"
 msgstr ""
 
-#: ../midori/midori-websettings.c:685
+#: ../midori/midori-websettings.c:693
 msgid "The search to perform inside the location entry"
 msgstr ""
 
-#: ../midori/midori-websettings.c:693
+#: ../midori/midori-websettings.c:701
 msgid "Preferred Encoding"
 msgstr ""
 
-#: ../midori/midori-websettings.c:694
+#: ../midori/midori-websettings.c:702
 msgid "The preferred character encoding"
 msgstr ""
 
-#: ../midori/midori-websettings.c:704
+#: ../midori/midori-websettings.c:712
 msgid "Always Show Tabbar"
 msgstr ""
 
-#: ../midori/midori-websettings.c:705
+#: ../midori/midori-websettings.c:713
 msgid "Always show the tabbar"
 msgstr ""
 
-#: ../midori/midori-websettings.c:713
+#: ../midori/midori-websettings.c:721
 msgid "Close Buttons on Tabs"
 msgstr ""
 
-#: ../midori/midori-websettings.c:714
+#: ../midori/midori-websettings.c:722
 msgid "Whether tabs have close buttons"
 msgstr ""
 
-#: ../midori/midori-websettings.c:722
+#: ../midori/midori-websettings.c:730
 msgid "Open new pages in"
 msgstr ""
 
-#: ../midori/midori-websettings.c:723
+#: ../midori/midori-websettings.c:731
 msgid "Where to open new pages"
 msgstr ""
 
-#: ../midori/midori-websettings.c:732
+#: ../midori/midori-websettings.c:740
 msgid "Open external pages in"
 msgstr ""
 
-#: ../midori/midori-websettings.c:733
+#: ../midori/midori-websettings.c:741
 msgid "Where to open externally opened pages"
 msgstr ""
 
-#: ../midori/midori-websettings.c:746
+#: ../midori/midori-websettings.c:754
 msgid "Middle click opens Selection"
 msgstr ""
 
-#: ../midori/midori-websettings.c:747
+#: ../midori/midori-websettings.c:755
 msgid "Load an address from the selection via middle click"
 msgstr ""
 
-#: ../midori/midori-websettings.c:755
+#: ../midori/midori-websettings.c:763
 msgid "Open tabs in the background"
 msgstr ""
 
-#: ../midori/midori-websettings.c:756
+#: ../midori/midori-websettings.c:764
 msgid "Whether to open new tabs in the background"
 msgstr ""
 
-#: ../midori/midori-websettings.c:764
+#: ../midori/midori-websettings.c:772
 msgid "Open Tabs next to Current"
 msgstr ""
 
-#: ../midori/midori-websettings.c:765
+#: ../midori/midori-websettings.c:773
 msgid "Whether to open new tabs next to the current tab or after the last one"
 msgstr ""
 
-#: ../midori/midori-websettings.c:773
+#: ../midori/midori-websettings.c:781
 msgid "Open popups in tabs"
 msgstr ""
 
-#: ../midori/midori-websettings.c:774
+#: ../midori/midori-websettings.c:782
 msgid "Whether to open popup windows in tabs"
 msgstr ""
 
-#: ../midori/midori-websettings.c:790
+#: ../midori/midori-websettings.c:798
 msgid "Zoom Text and Images"
 msgstr ""
 
-#: ../midori/midori-websettings.c:791
+#: ../midori/midori-websettings.c:799
 msgid "Whether to zoom text and images"
 msgstr ""
 
-#: ../midori/midori-websettings.c:806
+#: ../midori/midori-websettings.c:814
 msgid "Find inline while typing"
 msgstr ""
 
-#: ../midori/midori-websettings.c:807
+#: ../midori/midori-websettings.c:815
 msgid "Whether to automatically find inline while typing"
 msgstr ""
 
-#: ../midori/midori-websettings.c:815
+#: ../midori/midori-websettings.c:823
 msgid "Accept cookies"
 msgstr ""
 
-#: ../midori/midori-websettings.c:816
+#: ../midori/midori-websettings.c:824
 msgid "What type of cookies to accept"
 msgstr ""
 
-#: ../midori/midori-websettings.c:825
+#: ../midori/midori-websettings.c:833
 msgid "Original cookies only"
 msgstr ""
 
-#: ../midori/midori-websettings.c:826
+#: ../midori/midori-websettings.c:834
 msgid "Accept cookies from the original website only"
 msgstr ""
 
-#: ../midori/midori-websettings.c:834
+#: ../midori/midori-websettings.c:842
 msgid "Maximum cookie age"
 msgstr ""
 
-#: ../midori/midori-websettings.c:835
+#: ../midori/midori-websettings.c:843
 msgid "The maximum number of days to save cookies for"
 msgstr ""
 
-#: ../midori/midori-websettings.c:845
+#: ../midori/midori-websettings.c:853
 msgid "Remember last visited pages"
 msgstr ""
 
-#: ../midori/midori-websettings.c:846
+#: ../midori/midori-websettings.c:854
 msgid "Whether the last visited pages are saved"
 msgstr ""
 
-#: ../midori/midori-websettings.c:854
+#: ../midori/midori-websettings.c:862
 msgid "Maximum history age"
 msgstr ""
 
-#: ../midori/midori-websettings.c:855
+#: ../midori/midori-websettings.c:863
 msgid "The maximum number of days to save the history for"
 msgstr ""
 
-#: ../midori/midori-websettings.c:863
+#: ../midori/midori-websettings.c:871
 msgid "Remember last form inputs"
 msgstr ""
 
-#: ../midori/midori-websettings.c:864
+#: ../midori/midori-websettings.c:872
 msgid "Whether the last form inputs are saved"
 msgstr ""
 
-#: ../midori/midori-websettings.c:872
+#: ../midori/midori-websettings.c:880
 msgid "Remember last downloaded files"
 msgstr ""
 
-#: ../midori/midori-websettings.c:873
+#: ../midori/midori-websettings.c:881
 msgid "Whether the last downloaded files are saved"
 msgstr ""
 
-#: ../midori/midori-websettings.c:883
+#: ../midori/midori-websettings.c:891
 msgid "Proxy Server"
 msgstr ""
 
-#: ../midori/midori-websettings.c:884
+#: ../midori/midori-websettings.c:892
 msgid "The proxy server used for HTTP connections"
 msgstr ""
 
-#: ../midori/midori-websettings.c:899
+#: ../midori/midori-websettings.c:907
 msgid "Detect proxy server automatically"
 msgstr ""
 
-#: ../midori/midori-websettings.c:900
+#: ../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:916
+#: ../midori/midori-websettings.c:924
 msgid "Identify as"
 msgstr ""
 
-#: ../midori/midori-websettings.c:917
+#: ../midori/midori-websettings.c:925
 msgid "What to identify as to web pages"
 msgstr ""
 
-#: ../midori/midori-websettings.c:933
+#: ../midori/midori-websettings.c:941
 msgid "Identification string"
 msgstr ""
 
-#: ../midori/midori-websettings.c:934
+#: ../midori/midori-websettings.c:942
 msgid "The application identification string"
 msgstr ""
 
-#: ../midori/midori-websettings.c:942
+#: ../midori/midori-websettings.c:950
 msgid "Cache size"
 msgstr ""
 
-#: ../midori/midori-websettings.c:943
+#: ../midori/midori-websettings.c:951
 msgid "The allowed size of the cache"
 msgstr ""
 
-#: ../midori/midori-view.c:686
+#: ../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:688 ../midori/midori-view.c:2701
+#: ../midori/midori-view.c:752 ../midori/midori-view.c:2897
 #: ../extensions/feed-panel/main.c:112
 msgid "Error"
 msgstr ""
 
-#: ../midori/midori-view.c:691
+#: ../midori/midori-view.c:755
 msgid "Try again"
 msgstr ""
 
 #. i18n: The title of the 404 - Not found error page
 #. 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:721 ../midori/midori-view.c:2705
+#: ../midori/midori-view.c:785 ../midori/midori-view.c:2901
 #, c-format
 msgid "Not found - %s"
 msgstr ""
 
-#: ../midori/midori-view.c:1095
+#: ../midori/midori-view.c:1172
 msgid "Open _Link"
 msgstr ""
 
-#: ../midori/midori-view.c:1097
+#: ../midori/midori-view.c:1174
 msgid "Open Link in New _Tab"
 msgstr ""
 
-#: ../midori/midori-view.c:1114
+#: ../midori/midori-view.c:1191
 msgid "Open Link in New _Window"
 msgstr ""
 
-#: ../midori/midori-view.c:1123
+#: ../midori/midori-view.c:1197
 msgid "_Download Link destination"
 msgstr ""
 
-#: ../midori/midori-view.c:1129
+#: ../midori/midori-view.c:1203
 msgid "_Save Link destination"
 msgstr ""
 
-#: ../midori/midori-view.c:1138
+#: ../midori/midori-view.c:1212
 msgid "Download with Download _Manager"
 msgstr ""
 
-#: ../midori/midori-view.c:1167
+#: ../midori/midori-view.c:1241
 msgid "Search _with"
 msgstr ""
 
-#: ../midori/midori-view.c:1195
+#: ../midori/midori-view.c:1269
 msgid "_Search the Web"
 msgstr ""
 
-#: ../midori/midori-view.c:1205
+#: ../midori/midori-view.c:1279
 msgid "Open Address in New _Tab"
 msgstr ""
 
-#: ../midori/midori-view.c:1372
+#: ../midori/midori-view.c:1457
 msgid "Open or download file"
 msgstr ""
 
-#: ../midori/midori-view.c:1389
+#: ../midori/midori-view.c:1474
 #, c-format
 msgid "File Type: '%s'"
 msgstr ""
 
-#: ../midori/midori-view.c:1392
+#: ../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:1396
+#: ../midori/midori-view.c:1481
 #, c-format
 msgid "Open %s"
 msgstr ""
 
-#: ../midori/midori-view.c:1816
+#: ../midori/midori-view.c:1899
 #, c-format
 msgid "Inspect page - %s"
 msgstr ""
 
-#: ../midori/midori-view.c:2001 ../midori/midori-view.c:2002
-msgid "Search"
+#: ../midori/midori-view.c:2089
+msgid "Speed dial"
 msgstr ""
 
-#: ../midori/midori-view.c:2003
+#: ../midori/midori-view.c:2090
 msgid "Click to add a shortcut"
 msgstr ""
 
-#: ../midori/midori-view.c:2004
+#: ../midori/midori-view.c:2091
 msgid "Enter shortcut address"
 msgstr ""
 
-#: ../midori/midori-view.c:2005
+#: ../midori/midori-view.c:2092
 msgid "Enter shortcut title"
 msgstr ""
 
-#: ../midori/midori-view.c:2006
+#: ../midori/midori-view.c:2093
 msgid "Are you sure you want to delete this shortcut?"
 msgstr ""
 
-#: ../midori/midori-view.c:2038
+#: ../midori/midori-view.c:2123
 #, c-format
 msgid "Document cannot be displayed"
 msgstr ""
 
-#: ../midori/midori-view.c:2055
+#: ../midori/midori-view.c:2140
 #, c-format
 msgid "No documentation installed"
 msgstr ""
 
+#: ../midori/midori-view.c:2487
+msgid "_Duplicate Tab"
+msgstr ""
+
 #: ../midori/midori-preferences.c:91
 #, c-format
 msgid "Preferences for %s"
@@ -1445,162 +1485,167 @@ msgstr ""
 msgid "Fixed-width Font Family"
 msgstr ""
 
-#: ../midori/midori-preferences.c:456
+#: ../midori/midori-preferences.c:457
 msgid "The font family used to display fixed-width text"
 msgstr ""
 
-#: ../midori/midori-preferences.c:458
+#: ../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 ""
 
-#: ../midori/midori-preferences.c:461
+#: ../midori/midori-preferences.c:466
 msgid "The minimum font size used to display text"
 msgstr ""
 
-#: ../midori/midori-preferences.c:468
+#: ../midori/midori-preferences.c:473
 msgid "Encoding"
 msgstr ""
 
-#: ../midori/midori-preferences.c:471
+#: ../midori/midori-preferences.c:476
 msgid "The character encoding to use by default"
 msgstr ""
 
 #. Page "Behavior"
-#: ../midori/midori-preferences.c:478
+#: ../midori/midori-preferences.c:483
 msgid "Behavior"
 msgstr ""
 
-#: ../midori/midori-preferences.c:479
+#: ../midori/midori-preferences.c:484
 msgid "Features"
 msgstr ""
 
-#: ../midori/midori-preferences.c:482 ../extensions/statusbar-features.c:54
+#: ../midori/midori-preferences.c:487 ../extensions/statusbar-features.c:88
 msgid "Load images automatically"
 msgstr ""
 
-#: ../midori/midori-preferences.c:483
+#: ../midori/midori-preferences.c:488
 msgid "Load and display images automatically"
 msgstr ""
 
-#: ../midori/midori-preferences.c:486
+#: ../midori/midori-preferences.c:491
 msgid "Shrink images automatically"
 msgstr ""
 
-#: ../midori/midori-preferences.c:487
+#: ../midori/midori-preferences.c:492
 msgid "Automatically shrink standalone images to fit"
 msgstr ""
 
-#: ../midori/midori-preferences.c:490
+#: ../midori/midori-preferences.c:495
 msgid "Print background images"
 msgstr ""
 
-#: ../midori/midori-preferences.c:491
+#: ../midori/midori-preferences.c:496
 msgid "Whether background images should be printed"
 msgstr ""
 
-#: ../midori/midori-preferences.c:494
+#: ../midori/midori-preferences.c:499
 msgid "Resizable text areas"
 msgstr ""
 
-#: ../midori/midori-preferences.c:495
+#: ../midori/midori-preferences.c:500
 msgid "Whether text areas are resizable"
 msgstr ""
 
-#: ../midori/midori-preferences.c:498 ../extensions/statusbar-features.c:63
+#: ../midori/midori-preferences.c:503 ../extensions/statusbar-features.c:100
 msgid "Enable scripts"
 msgstr ""
 
-#: ../midori/midori-preferences.c:499
+#: ../midori/midori-preferences.c:504
 msgid "Enable embedded scripting languages"
 msgstr ""
 
-#: ../midori/midori-preferences.c:502 ../extensions/statusbar-features.c:72
+#: ../midori/midori-preferences.c:507 ../extensions/statusbar-features.c:112
 msgid "Enable Netscape plugins"
 msgstr ""
 
-#: ../midori/midori-preferences.c:503
+#: ../midori/midori-preferences.c:508
 msgid "Enable embedded Netscape plugin objects"
 msgstr ""
 
-#: ../midori/midori-preferences.c:506
+#: ../midori/midori-preferences.c:511
 msgid "Enforce 96 dots per inch"
 msgstr ""
 
-#: ../midori/midori-preferences.c:507
+#: ../midori/midori-preferences.c:512
 msgid "Enforce a video dot density of 96 DPI"
 msgstr ""
 
-#: ../midori/midori-preferences.c:510
+#: ../midori/midori-preferences.c:515
 msgid "Enable developer tools"
 msgstr ""
 
-#: ../midori/midori-preferences.c:511
+#: ../midori/midori-preferences.c:516
 msgid "Enable special extensions for developers"
 msgstr ""
 
-#: ../midori/midori-preferences.c:518
+#: ../midori/midori-preferences.c:523
 msgid "Spell Checking"
 msgstr ""
 
-#: ../midori/midori-preferences.c:521
+#: ../midori/midori-preferences.c:526
 msgid "Enable Spell Checking"
 msgstr ""
 
-#: ../midori/midori-preferences.c:522
+#: ../midori/midori-preferences.c:527
 msgid "Enable spell checking while typing"
 msgstr ""
 
-#: ../midori/midori-preferences.c:525
+#. 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:530
+#: ../midori/midori-preferences.c:536
 msgid "Interface"
 msgstr ""
 
-#: ../midori/midori-preferences.c:531
+#: ../midori/midori-preferences.c:537
 msgid "Navigationbar"
 msgstr ""
 
-#: ../midori/midori-preferences.c:542
+#: ../midori/midori-preferences.c:548
 msgid "Browsing"
 msgstr ""
 
 #. Page "Applications"
-#: ../midori/midori-preferences.c:572
+#: ../midori/midori-preferences.c:578
 msgid "Applications"
 msgstr ""
 
-#: ../midori/midori-preferences.c:573
+#: ../midori/midori-preferences.c:579
 msgid "External applications"
 msgstr ""
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:619 ../midori/midori-preferences.c:620
+#: ../midori/midori-preferences.c:625 ../midori/midori-preferences.c:626
 msgid "Network"
 msgstr ""
 
-#: ../midori/midori-preferences.c:647
+#: ../midori/midori-preferences.c:653
 msgid "MB"
 msgstr ""
 
 #. Page "Privacy"
-#: ../midori/midori-preferences.c:652
+#: ../midori/midori-preferences.c:658
 msgid "Privacy"
 msgstr ""
 
-#: ../midori/midori-preferences.c:653
+#: ../midori/midori-preferences.c:659
 msgid "Web Cookies"
 msgstr ""
 
-#: ../midori/midori-preferences.c:666 ../midori/midori-preferences.c:676
+#: ../midori/midori-preferences.c:672 ../midori/midori-preferences.c:682
 msgid "days"
 msgstr ""
 
-#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:314
+#: ../midori/midori-searchaction.c:484 ../katze/katze-arrayaction.c:331
 msgid "Empty"
 msgstr ""
 
@@ -1624,72 +1669,63 @@ msgstr ""
 msgid "_Token:"
 msgstr ""
 
-#: ../midori/midori-searchaction.c:1195
+#: ../midori/midori-searchaction.c:1209
 msgid "Manage Search Engines"
 msgstr ""
 
-#: ../midori/midori-searchaction.c:1292
+#: ../midori/midori-searchaction.c:1308
 msgid "Use as _default"
 msgstr ""
 
-#: ../midori/sokoke.c:162 ../midori/sokoke.c:174
+#: ../midori/sokoke.c:172 ../midori/sokoke.c:184
 msgid "Could not run external program."
 msgstr ""
 
-#. i18n: A superuser, or system administrator, may not be 'root'
-#: ../midori/sokoke.c:520
-msgid "Warning: You are using a superuser account!"
-msgstr ""
-
-#: ../midori/sokoke.c:871
+#: ../midori/sokoke.c:862
 msgid "_Bookmark"
 msgstr ""
 
-#: ../midori/sokoke.c:873
-msgid "_Add Bookmark"
+#: ../midori/sokoke.c:864
+msgid "Add Boo_kmark"
 msgstr ""
 
-#: ../midori/sokoke.c:874
+#: ../midori/sokoke.c:865
 msgid "_Console"
 msgstr ""
 
-#: ../midori/sokoke.c:875
+#: ../midori/sokoke.c:866
 msgid "_Extensions"
 msgstr ""
 
-#: ../midori/sokoke.c:876
+#: ../midori/sokoke.c:867
 msgid "_History"
 msgstr ""
 
-#: ../midori/sokoke.c:877
+#: ../midori/sokoke.c:868
 msgid "_Homepage"
 msgstr ""
 
-#: ../midori/sokoke.c:878
+#: ../midori/sokoke.c:869
 msgid "_Userscripts"
 msgstr ""
 
-#: ../midori/sokoke.c:879
+#: ../midori/sokoke.c:870
 msgid "User_styles"
 msgstr ""
 
-#: ../midori/sokoke.c:880
+#: ../midori/sokoke.c:871
 msgid "New _Tab"
 msgstr ""
 
-#: ../midori/sokoke.c:881
+#: ../midori/sokoke.c:872
 msgid "_Transfers"
 msgstr ""
 
-#: ../midori/sokoke.c:882
+#: ../midori/sokoke.c:873
 msgid "Netscape p_lugins"
 msgstr ""
 
-#: ../midori/sokoke.c:883
-msgid "_Closed Tabs and Windows"
-msgstr ""
-
-#: ../midori/sokoke.c:884
+#: ../midori/sokoke.c:875
 msgid "New _Window"
 msgstr ""
 
@@ -1701,35 +1737,23 @@ msgstr ""
 msgid "Userstyles"
 msgstr ""
 
-#: ../panels/midori-addons.c:927 ../panels/midori-extensions.c:144
-msgid "_Enable"
-msgstr ""
-
-#: ../panels/midori-addons.c:928 ../panels/midori-extensions.c:145
-msgid "Enable"
-msgstr ""
-
-#: ../panels/midori-addons.c:937 ../panels/midori-extensions.c:154
-msgid "_Disable"
-msgstr ""
-
-#: ../panels/midori-addons.c:938 ../panels/midori-extensions.c:155
-msgid "Disable"
-msgstr ""
-
-#: ../panels/midori-bookmarks.c:107
+#: ../panels/midori-bookmarks.c:108
 msgid "Bookmarks"
 msgstr ""
 
-#: ../panels/midori-bookmarks.c:238
+#: ../panels/midori-bookmarks.c:239
 msgid "Edit the selected bookmark"
 msgstr ""
 
-#: ../panels/midori-bookmarks.c:246
+#: ../panels/midori-bookmarks.c:247
 msgid "Delete the selected bookmark"
 msgstr ""
 
-#: ../panels/midori-bookmarks.c:591
+#: ../panels/midori-bookmarks.c:260
+msgid "Add a new folder"
+msgstr ""
+
+#: ../panels/midori-bookmarks.c:592
 msgid "<i>Separator</i>"
 msgstr ""
 
@@ -1737,7 +1761,7 @@ msgstr ""
 msgid "Console"
 msgstr ""
 
-#: ../panels/midori-extensions.c:87
+#: ../panels/midori-extensions.c:91
 msgid "Extensions"
 msgstr ""
 
@@ -1757,37 +1781,42 @@ msgstr ""
 msgid "Clear the entire history"
 msgstr ""
 
-#: ../panels/midori-history.c:599
+#: ../panels/midori-history.c:601
 msgid "A week ago"
 msgstr ""
 
-#: ../panels/midori-history.c:604
+#: ../panels/midori-history.c:606
 #, c-format
 msgid "%d day ago"
-msgstr ""
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../panels/midori-history.c:605
-#, c-format
-msgid "%d days ago"
-msgstr ""
-
-#: ../panels/midori-history.c:612
+#: ../panels/midori-history.c:614
 msgid "Today"
 msgstr ""
 
-#: ../panels/midori-history.c:614
+#: ../panels/midori-history.c:616
 msgid "Yesterday"
 msgstr ""
 
-#: ../panels/midori-plugins.c:87
+#: ../panels/midori-plugins.c:87 ../extensions/statusbar-features.c:108
 msgid "Netscape plugins"
 msgstr ""
 
-#: ../panels/midori-transfers.c:256
+#: ../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 ""
@@ -1820,19 +1849,35 @@ msgstr ""
 msgid "Animation frames are broken"
 msgstr ""
 
-#: ../katze/katze-utils.c:183 ../katze/katze-utils.c:385
+#: ../katze/katze-utils.c:200 ../katze/katze-utils.c:407
 #, c-format
 msgid "Property '%s' is invalid for %s"
 msgstr ""
 
-#: ../katze/katze-utils.c:215 ../katze/katze-utils.c:244
+#: ../katze/katze-utils.c:235 ../katze/katze-utils.c:264
 msgid "Choose file"
 msgstr ""
 
-#: ../katze/katze-utils.c:230
+#: ../katze/katze-utils.c:250
 msgid "Choose folder"
 msgstr ""
 
+#: ../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 ""
@@ -1845,11 +1890,42 @@ msgstr ""
 msgid "Tint each tab distinctly"
 msgstr ""
 
-#: ../extensions/cookie-manager.c:201
+#: ../extensions/cookie-manager/cookie-manager-page.c:79
+#: ../extensions/cookie-manager/main.c:56
+msgid "Cookie Manager"
+msgstr ""
+
+#: ../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.c:204
+#: ../extensions/cookie-manager/cookie-manager-page.c:542
 #, c-format
 msgid ""
 "<b>Host</b>: %s\n"
@@ -1860,71 +1936,41 @@ msgid ""
 "<b>Expires</b>: %s"
 msgstr ""
 
-#: ../extensions/cookie-manager.c:210
+#: ../extensions/cookie-manager/cookie-manager-page.c:548
 msgid "Yes"
 msgstr ""
 
-#: ../extensions/cookie-manager.c:210
+#: ../extensions/cookie-manager/cookie-manager-page.c:548
 msgid "No"
 msgstr ""
 
-#: ../extensions/cookie-manager.c:493
-msgid "Do you really want to delete all cookies?"
-msgstr ""
-
-#: ../extensions/cookie-manager.c:495
-msgid "Question"
-msgstr ""
-
-#: ../extensions/cookie-manager.c:504
-msgid "Only cookies which match the filter will be deleted."
-msgstr ""
-
-#: ../extensions/cookie-manager.c:682
+#: ../extensions/cookie-manager/cookie-manager-page.c:811
 msgid "Name"
 msgstr ""
 
-#: ../extensions/cookie-manager.c:742
+#: ../extensions/cookie-manager/cookie-manager-page.c:862
 msgid "_Expand All"
 msgstr ""
 
-#: ../extensions/cookie-manager.c:750
+#: ../extensions/cookie-manager/cookie-manager-page.c:870
 msgid "_Collapse All"
 msgstr ""
 
-#: ../extensions/cookie-manager.c:823
-msgid ""
-"Deletes all shown cookies. If a filter is set, only those cookies are "
-"deleted which match the filter."
-msgstr ""
-
-#: ../extensions/cookie-manager.c:838
-msgid "Expand All"
-msgstr ""
-
-#: ../extensions/cookie-manager.c:845
-msgid "Collapse All"
-msgstr ""
-
-#: ../extensions/cookie-manager.c:876
+#: ../extensions/cookie-manager/cookie-manager-page.c:923
 msgid "Filter:"
 msgstr ""
 
-#: ../extensions/cookie-manager.c:881
+#: ../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.c:916 ../extensions/cookie-manager.c:964
-msgid "Cookie Manager"
-msgstr ""
-
-#: ../extensions/cookie-manager.c:948
+#: ../extensions/cookie-manager/main.c:40
 msgid "_Cookie Manager"
 msgstr ""
 
-#: ../extensions/cookie-manager.c:965
+#: ../extensions/cookie-manager/main.c:57
 msgid "List, view and delete cookies"
 msgstr ""
 
@@ -1959,17 +2005,17 @@ msgstr ""
 msgid "_Feeds"
 msgstr ""
 
-#: ../extensions/feed-panel/feed-parse.c:175
+#: ../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:215
+#: ../extensions/feed-panel/feed-parse.c:225
 #, c-format
 msgid "Unsupported feed format."
 msgstr ""
 
-#: ../extensions/feed-panel/feed-parse.c:245
+#: ../extensions/feed-panel/feed-parse.c:255
 #, c-format
 msgid "Failed to parse XML feed: %s"
 msgstr ""
@@ -1982,11 +2028,11 @@ msgstr ""
 msgid "Unsupported RSS version found."
 msgstr ""
 
-#: ../extensions/feed-panel/feed-rss.c:144
+#: ../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:229
+#: ../extensions/feed-panel/feed-rss.c:248
 msgid "Failed to find required RSS \"channel\" elements in XML data."
 msgstr ""
 
@@ -2012,11 +2058,11 @@ msgstr ""
 msgid "Read Atom/ RSS feeds"
 msgstr ""
 
-#: ../extensions/mouse-gestures/main.c:216
+#: ../extensions/mouse-gestures/main.c:236
 msgid "Mouse Gestures"
 msgstr ""
 
-#: ../extensions/mouse-gestures/main.c:217
+#: ../extensions/mouse-gestures/main.c:237
 msgid "Control Midori by moving the mouse"
 msgstr ""
 
@@ -2029,10 +2075,76 @@ msgstr ""
 msgid "_Pageholder"
 msgstr ""
 
-#: ../extensions/statusbar-features.c:104
+#: ../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 ""
+
+#: ../extensions/statusbar-features.c:96
+msgid "Scripts"
+msgstr ""
+
+#: ../extensions/statusbar-features.c:149
 msgid "Statusbar Features"
 msgstr ""
 
-#: ../extensions/statusbar-features.c:105
+#: ../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 ""
+
+#: ../extensions/tab-panel.c:336
+msgid "T_ab Panel"
+msgstr ""
+
+#: ../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 ""
+
+#: ../extensions/toolbar-editor.c:614
+msgid "Easily edit the toolbar layout"
+msgstr ""