Updated Canadian English translation.

	* en_CA.po: Updated Canadian English translation.

2 files changed, 205 insertions, 188 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index f39c57d2a..471ee90c3 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-14  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
 2004-11-13  Žygimantas Beručka  <uid0@akl.lt>
 
 	* lt.po: Updated Lithuanian translation.
diff --git a/po/en_CA.po b/po/en_CA.po
index 61ee5c0cb..6745f78b5 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: epiphany\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-09 17:18-0500\n"
-"PO-Revision-Date: 2004-11-09 21:35-0400\n"
+"POT-Creation-Date: 2004-11-14 01:58-0500\n"
+"PO-Revision-Date: 2004-11-14 21:35-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: English/Canada <adamw@FreeBSD.org>\n"
 "MIME-Version: 1.0\n"
@@ -113,7 +113,7 @@ msgstr "Hide the menubar by default."
 msgid "Browse the web"
 msgstr "Browse the web"
 
-#: data/epiphany.desktop.in.h:2 src/ephy-main.c:110
+#: data/epiphany.desktop.in.h:2 src/ephy-main.c:117
 msgid "Epiphany Web Browser"
 msgstr "Epiphany Web Browser"
 
@@ -600,7 +600,7 @@ msgid "MD5 Fingerprint:"
 msgstr "MD5 Fingerprint:"
 
 #: data/glade/certificate-dialogs.glade.h:16
-#: embed/mozilla/GtkNSSDialogs.cpp:1000
+#: embed/mozilla/GtkNSSDialogs.cpp:1002
 msgid "Organization:"
 msgstr "Organization:"
 
@@ -1015,15 +1015,7 @@ msgid_plural "%d downloads"
 msgstr[0] "%d download"
 msgstr[1] "%d downloads"
 
-#: embed/downloader-view.c:487 embed/downloader-view.c:496
-msgid "download status|Unknown"
-msgstr "download status|Unknown"
-
-#: embed/downloader-view.c:490
-msgid "download status|Failed"
-msgstr "download status|Failed"
-
-#: embed/downloader-view.c:550 src/bookmarks/ephy-bookmarks-editor.c:651
+#: embed/downloader-view.c:550 src/bookmarks/ephy-bookmarks-editor.c:716
 msgid "File"
 msgstr "File"
 
@@ -1398,28 +1390,28 @@ msgstr "Ukrainian"
 msgid "Unknown (%s)"
 msgstr "Unknown (%s)"
 
-#: embed/ephy-history.c:484 src/bookmarks/ephy-bookmarks.c:697
+#: embed/ephy-history.c:506 src/bookmarks/ephy-bookmarks.c:697
 msgid "All"
 msgstr "All"
 
-#: embed/ephy-history.c:658
+#: embed/ephy-history.c:680
 msgid "Others"
 msgstr "Others"
 
-#: embed/ephy-history.c:664
+#: embed/ephy-history.c:686
 msgid "Local files"
 msgstr "Local files"
 
-#: embed/mozilla/ContentHandler.cpp:143
+#: embed/mozilla/ContentHandler.cpp:144
 #: embed/mozilla/EphyHeaderSniffer.cpp:357
 msgid "Save"
 msgstr "Save"
 
-#: embed/mozilla/ContentHandler.cpp:271
+#: embed/mozilla/ContentHandler.cpp:274
 msgid "Download the unsafe file?"
 msgstr "Download the unsafe file?"
 
-#: embed/mozilla/ContentHandler.cpp:272
+#: embed/mozilla/ContentHandler.cpp:275
 msgid ""
 "This type of file could potentially damage your documents or invade your "
 "privacy. It's not safe to open it directly. You can save it instead."
@@ -1427,11 +1419,11 @@ msgstr ""
 "This type of file could potentially damage your documents or invade your "
 "privacy. It's not safe to open it directly. You can save it instead."
 
-#: embed/mozilla/ContentHandler.cpp:279
+#: embed/mozilla/ContentHandler.cpp:282
 msgid "Open the file in another application?"
 msgstr "Open the file in another application?"
 
-#: embed/mozilla/ContentHandler.cpp:280
+#: embed/mozilla/ContentHandler.cpp:283
 msgid ""
 "It's not possible to view this file type directly in the browser. You can "
 "open it with another application or save it."
@@ -1439,11 +1431,11 @@ msgstr ""
 "It's not possible to view this file type directly in the browser. You can "
 "open it with another application or save it."
 
-#: embed/mozilla/ContentHandler.cpp:286
+#: embed/mozilla/ContentHandler.cpp:289
 msgid "Download the file?"
 msgstr "Download the file?"
 
-#: embed/mozilla/ContentHandler.cpp:287
+#: embed/mozilla/ContentHandler.cpp:290
 msgid ""
 "It's not possible to view this file because there is no application "
 "installed that can open it. You can save it instead."
@@ -1451,7 +1443,7 @@ msgstr ""
 "It's not possible to view this file because there is no application "
 "installed that can open it. You can save it instead."
 
-#: embed/mozilla/ContentHandler.cpp:303
+#: embed/mozilla/ContentHandler.cpp:306
 msgid "_Save As..."
 msgstr "_Save As..."
 
@@ -1461,58 +1453,58 @@ msgstr "_Save As..."
 msgid "Untitled"
 msgstr "Untitled"
 
-#: embed/mozilla/FilePicker.cpp:141 embed/print-dialog.c:336
-#: lib/ephy-file-chooser.c:374 src/bookmarks/ephy-bookmarks-editor.c:576
+#: embed/mozilla/FilePicker.cpp:143 embed/print-dialog.c:336
+#: lib/ephy-file-chooser.c:374 src/bookmarks/ephy-bookmarks-editor.c:641
 msgid "All files"
 msgstr "All files"
 
-#: embed/mozilla/FilePicker.cpp:146 lib/ephy-file-chooser.c:358
+#: embed/mozilla/FilePicker.cpp:148 lib/ephy-file-chooser.c:358
 msgid "Web pages"
 msgstr "Web pages"
 
-#: embed/mozilla/FilePicker.cpp:154
+#: embed/mozilla/FilePicker.cpp:156
 msgid "Text files"
 msgstr "Text files"
 
-#: embed/mozilla/FilePicker.cpp:159 lib/ephy-file-chooser.c:366
+#: embed/mozilla/FilePicker.cpp:161 lib/ephy-file-chooser.c:366
 msgid "Images"
 msgstr "Images"
 
-#: embed/mozilla/FilePicker.cpp:167
+#: embed/mozilla/FilePicker.cpp:169
 msgid "XML files"
 msgstr "XML files"
 
-#: embed/mozilla/FilePicker.cpp:172
+#: embed/mozilla/FilePicker.cpp:174
 msgid "XUL files"
 msgstr "XUL files"
 
-#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:154
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:156
 msgid "_Select Certificate"
 msgstr "_Select Certificate"
 
-#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:196
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:198
 #, c-format
 msgid "Choose a certificate to present as identification to %s."
 msgstr "Choose a certificate to present as identification to %s."
 
-#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:199
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:201
 msgid "Select a certificate to identify yourself."
 msgstr "Select a certificate to identify yourself."
 
-#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:237
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:239
 msgid "Certificate _Details"
 msgstr "Certificate _Details"
 
 #. Add the buttons
-#: embed/mozilla/GtkNSSDialogs.cpp:226 embed/mozilla/GtkNSSDialogs.cpp:551
+#: embed/mozilla/GtkNSSDialogs.cpp:228 embed/mozilla/GtkNSSDialogs.cpp:553
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:234
+#: embed/mozilla/GtkNSSDialogs.cpp:236
 msgid "_Accept"
 msgstr "_Accept"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:301
+#: embed/mozilla/GtkNSSDialogs.cpp:303
 #, c-format
 msgid ""
 "The site %s returned security information for %s. It is possible that "
@@ -1523,17 +1515,17 @@ msgstr ""
 "someone is intercepting your communication to obtain your confidential "
 "information."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:307
+#: embed/mozilla/GtkNSSDialogs.cpp:309
 #, c-format
 msgid "You should only accept the security information if you trust %s and %s."
 msgstr ""
 "You should only accept the security information if you trust %s and %s."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:312
+#: embed/mozilla/GtkNSSDialogs.cpp:314
 msgid "Accept incorrect security information?"
 msgstr "Accept incorrect security information?"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:347
+#: embed/mozilla/GtkNSSDialogs.cpp:349
 #, c-format
 msgid ""
 "It was not possible to automatically trust %s. It is possible that someone "
@@ -1542,7 +1534,7 @@ msgstr ""
 "It was not possible to automatically trust %s. It is possible that someone "
 "is intercepting your communication to obtain your confidential information."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:353
+#: embed/mozilla/GtkNSSDialogs.cpp:355
 #, c-format
 msgid ""
 "You should only connect to the site if you are certain you are connected to %"
@@ -1551,32 +1543,32 @@ msgstr ""
 "You should only connect to the site if you are certain you are connected to %"
 "s."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:358
+#: embed/mozilla/GtkNSSDialogs.cpp:360
 msgid "Connect to untrusted site?"
 msgstr "Connect to untrusted site?"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:362
+#: embed/mozilla/GtkNSSDialogs.cpp:364
 msgid "_Don't show this message again for this site"
 msgstr "_Don't show this message again for this site"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:363
+#: embed/mozilla/GtkNSSDialogs.cpp:365
 msgid "Co_nnect"
 msgstr "Co_nnect"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:423
+#: embed/mozilla/GtkNSSDialogs.cpp:425
 msgid "Accept expired security information?"
 msgstr "Accept expired security information?"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:424
+#: embed/mozilla/GtkNSSDialogs.cpp:426
 #, c-format
 msgid "The security information for %s expired on %s."
 msgstr "The security information for %s expired on %s."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:430
+#: embed/mozilla/GtkNSSDialogs.cpp:432
 msgid "Accept not yet valid security information?"
 msgstr "Accept not yet valid security information?"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:431
+#: embed/mozilla/GtkNSSDialogs.cpp:433
 #, c-format
 msgid "The security information for %s isn't valid until %s."
 msgstr "The security information for %s isn't valid until %s."
@@ -1584,42 +1576,42 @@ msgstr "The security information for %s isn't valid until %s."
 #. To translators: this a time format that is used while displaying the
 #. * expiry or start date of an SSL certificate, for the format see
 #. * strftime(3)
-#: embed/mozilla/GtkNSSDialogs.cpp:447
+#: embed/mozilla/GtkNSSDialogs.cpp:449
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:457
+#: embed/mozilla/GtkNSSDialogs.cpp:459
 msgid "You should ensure that your computer's time is correct."
 msgstr "You should ensure that your computer's time is correct."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:507
+#: embed/mozilla/GtkNSSDialogs.cpp:509
 #, c-format
 msgid "Cannot establish connection to %s."
 msgstr "Cannot establish connection to %s."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:510
+#: embed/mozilla/GtkNSSDialogs.cpp:512
 #, c-format
 msgid "The certificate revocation list (CRL) from %s needs to be updated."
 msgstr "The certificate revocation list (CRL) from %s needs to be updated."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:515
+#: embed/mozilla/GtkNSSDialogs.cpp:517
 msgid "Please ask your system administrator for assistance."
 msgstr "Please ask your system administrator for assistance."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:554
+#: embed/mozilla/GtkNSSDialogs.cpp:556
 msgid "_Trust CA"
 msgstr "_Trust CA"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:572
+#: embed/mozilla/GtkNSSDialogs.cpp:574
 #, c-format
 msgid "Trust %s to identify:"
 msgstr "Trust %s to identify:"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:576
+#: embed/mozilla/GtkNSSDialogs.cpp:578
 msgid "Trust new Certificate Authority?"
 msgstr "Trust new Certificate Authority?"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:577
+#: embed/mozilla/GtkNSSDialogs.cpp:579
 msgid ""
 "Before trusting a Certificate Authority (CA) you should verify the "
 "certificate is authentic."
@@ -1627,122 +1619,122 @@ msgstr ""
 "Before trusting a Certificate Authority (CA) you should verify the "
 "certificate is authentic."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:587
+#: embed/mozilla/GtkNSSDialogs.cpp:589
 msgid "_Web sites"
 msgstr "_Web sites"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:592
+#: embed/mozilla/GtkNSSDialogs.cpp:594
 msgid "_Software developers"
 msgstr "_Software developers"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:660
+#: embed/mozilla/GtkNSSDialogs.cpp:662
 msgid "Certificate already exists."
 msgstr "Certificate already exists."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:661
+#: embed/mozilla/GtkNSSDialogs.cpp:663
 msgid "The certificate has already been imported."
 msgstr "The certificate has already been imported."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:782
+#: embed/mozilla/GtkNSSDialogs.cpp:784
 msgid "_Backup Certificate"
 msgstr "_Backup Certificate"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:789
+#: embed/mozilla/GtkNSSDialogs.cpp:791
 msgid "Select password."
 msgstr "Select password."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:790
+#: embed/mozilla/GtkNSSDialogs.cpp:792
 msgid "Select a password to protect this certificate."
 msgstr "Select a password to protect this certificate."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:802 embed/mozilla/GtkNSSDialogs.cpp:907
+#: embed/mozilla/GtkNSSDialogs.cpp:804 embed/mozilla/GtkNSSDialogs.cpp:909
 msgid "_Password:"
 msgstr "_Password:"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:816
+#: embed/mozilla/GtkNSSDialogs.cpp:818
 msgid "Con_firm password:"
 msgstr "Con_firm password:"
 
 #. TODO: We need a better password quality meter
-#: embed/mozilla/GtkNSSDialogs.cpp:828
+#: embed/mozilla/GtkNSSDialogs.cpp:830
 msgid "Password quality:"
 msgstr "Password quality:"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:886
+#: embed/mozilla/GtkNSSDialogs.cpp:888
 msgid "I_mport Certificate"
 msgstr "I_mport Certificate"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:896
+#: embed/mozilla/GtkNSSDialogs.cpp:898
 msgid "Password required."
 msgstr "Password required."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:897
+#: embed/mozilla/GtkNSSDialogs.cpp:899
 msgid "Enter the password for this certificate."
 msgstr "Enter the password for this certificate."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:978
+#: embed/mozilla/GtkNSSDialogs.cpp:980
 msgid "Certificate Revocation list successfully imported."
 msgstr "Certificate Revocation list successfully imported."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:979
+#: embed/mozilla/GtkNSSDialogs.cpp:981
 msgid "Certificate Revocation list (CRL) imported:"
 msgstr "Certificate Revocation list (CRL) imported:"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1005
+#: embed/mozilla/GtkNSSDialogs.cpp:1007
 msgid "Unit:"
 msgstr "Unit:"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1010
+#: embed/mozilla/GtkNSSDialogs.cpp:1012
 msgid "Next Update:"
 msgstr "Next Update:"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1037
+#: embed/mozilla/GtkNSSDialogs.cpp:1039
 msgid "Not part of certificate"
 msgstr "Not part of certificate"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1318
+#: embed/mozilla/GtkNSSDialogs.cpp:1320
 msgid "Certificate Properties"
 msgstr "Certificate Properties"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1340
+#: embed/mozilla/GtkNSSDialogs.cpp:1342
 msgid "This certificate has been verified for the following uses:"
 msgstr "This certificate has been verified for the following uses:"
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1343
+#: embed/mozilla/GtkNSSDialogs.cpp:1345
 msgid "Could not verify this certificate because it has been revoked."
 msgstr "Could not verify this certificate because it has been revoked."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1346
+#: embed/mozilla/GtkNSSDialogs.cpp:1348
 msgid "Could not verify this certificate because it has expired."
 msgstr "Could not verify this certificate because it has expired."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1349
+#: embed/mozilla/GtkNSSDialogs.cpp:1351
 msgid "Could not verify this certificate because it is not trusted."
 msgstr "Could not verify this certificate because it is not trusted."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1352
+#: embed/mozilla/GtkNSSDialogs.cpp:1354
 msgid "Could not verify this certificate because the issuer is not trusted."
 msgstr "Could not verify this certificate because the issuer is not trusted."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1355
+#: embed/mozilla/GtkNSSDialogs.cpp:1357
 msgid "Could not verify this certificate because the issuer is unknown."
 msgstr "Could not verify this certificate because the issuer is unknown."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1358
+#: embed/mozilla/GtkNSSDialogs.cpp:1360
 msgid ""
 "Could not verify this certificate because the CA certificate is invalid."
 msgstr ""
 "Could not verify this certificate because the CA certificate is invalid."
 
-#: embed/mozilla/GtkNSSDialogs.cpp:1363
+#: embed/mozilla/GtkNSSDialogs.cpp:1365
 msgid "Could not verify this certificate for unknown reasons."
 msgstr "Could not verify this certificate for unknown reasons."
 
-#: embed/mozilla/GtkNSSKeyPairDialogs.cpp:191
+#: embed/mozilla/GtkNSSKeyPairDialogs.cpp:190
 msgid "Generating Private Key."
 msgstr "Generating Private Key."
 
-#: embed/mozilla/GtkNSSKeyPairDialogs.cpp:192
+#: embed/mozilla/GtkNSSKeyPairDialogs.cpp:191
 msgid ""
 "Please wait while a new private key is generated. This process could take a "
 "few minutes."
@@ -1750,7 +1742,7 @@ msgstr ""
 "Please wait while a new private key is generated. This process could take a "
 "few minutes."
 
-#: embed/mozilla/MozDownload.cpp:575
+#: embed/mozilla/MozDownload.cpp:577
 msgid "Files"
 msgstr "Files"
 
@@ -1764,11 +1756,11 @@ msgstr "Files"
 #. * in url-escaped UTF-8; that means that if you're choosing google,
 #. * the 'q=' part needs to come last.
 #.
-#: embed/mozilla/mozilla-embed-single.cpp:224
+#: embed/mozilla/mozilla-embed-single.cpp:226
 msgid "http://www.google.com/search?ie=UTF-8&oe=UTF-8&q="
 msgstr "http://www.google.ca/search?ie=UTF-8&oe=UTF-8&q="
 
-#: embed/mozilla/mozilla-embed-single.cpp:538
+#: embed/mozilla/mozilla-embed-single.cpp:540
 msgid "Epiphany can't be used now. Mozilla initialization failed."
 msgstr "Epiphany cannot be used now. Mozilla initialization failed."
 
@@ -1934,11 +1926,11 @@ msgstr "Close Tab"
 msgid "Popup Windows"
 msgstr "Popup Windows"
 
-#: lib/ephy-stock-icons.c:57 src/ephy-history-window.c:1173
+#: lib/ephy-stock-icons.c:57 src/ephy-history-window.c:1193
 msgid "History"
 msgstr "History"
 
-#: lib/ephy-stock-icons.c:58 src/bookmarks/ephy-bookmarks-editor.c:1394
+#: lib/ephy-stock-icons.c:58 src/bookmarks/ephy-bookmarks-editor.c:1459
 #: src/bookmarks/ephy-topic-action.c:926 src/ephy-window.c:1149
 msgid "Bookmarks"
 msgstr "Bookmarks"
@@ -1993,9 +1985,9 @@ msgid "%s:"
 msgstr "%s:"
 
 #: src/bookmarks/ephy-bookmark-action.c:546
-#: src/bookmarks/ephy-bookmarks-editor.c:177
-#: src/bookmarks/ephy-bookmarks-editor.c:1017 src/ephy-history-window.c:172
-#: src/ephy-history-window.c:693
+#: src/bookmarks/ephy-bookmarks-editor.c:178
+#: src/bookmarks/ephy-bookmarks-editor.c:1082 src/ephy-history-window.c:175
+#: src/ephy-history-window.c:713
 msgid "Open in New _Tab"
 msgstr "Open in New _Tab"
 
@@ -2033,258 +2025,279 @@ msgid "_Show in bookmarks bar"
 msgstr "_Show in bookmarks bar"
 
 #. Toplevel
-#: src/bookmarks/ephy-bookmarks-editor.c:164 src/ephy-history-window.c:162
+#: src/bookmarks/ephy-bookmarks-editor.c:165 src/ephy-history-window.c:165
 #: src/ephy-window.c:89
 msgid "_File"
 msgstr "_File"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:165 src/ephy-history-window.c:163
+#: src/bookmarks/ephy-bookmarks-editor.c:166 src/ephy-history-window.c:166
 #: src/ephy-window.c:90
 msgid "_Edit"
 msgstr "_Edit"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:166 src/ephy-history-window.c:164
+#: src/bookmarks/ephy-bookmarks-editor.c:167 src/ephy-history-window.c:167
 #: src/ephy-window.c:91
 msgid "_View"
 msgstr "_View"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:167 src/ephy-history-window.c:165
+#: src/bookmarks/ephy-bookmarks-editor.c:168 src/ephy-history-window.c:168
 #: src/ephy-window.c:96
 msgid "_Help"
 msgstr "_Help"
 
 #. File Menu
-#: src/bookmarks/ephy-bookmarks-editor.c:171
+#: src/bookmarks/ephy-bookmarks-editor.c:172
 #: src/bookmarks/ephy-new-bookmark.c:291
 msgid "_New Topic"
 msgstr "_New Topic"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:172
+#: src/bookmarks/ephy-bookmarks-editor.c:173
 msgid "Create a new topic"
 msgstr "Create a new topic"
 
 #. File Menu
-#: src/bookmarks/ephy-bookmarks-editor.c:174
-#: src/bookmarks/ephy-bookmarks-editor.c:1016 src/ephy-history-window.c:169
-#: src/ephy-history-window.c:692
+#: src/bookmarks/ephy-bookmarks-editor.c:175
+#: src/bookmarks/ephy-bookmarks-editor.c:1081 src/ephy-history-window.c:172
+#: src/ephy-history-window.c:712
 msgid "_Open in New Window"
 msgstr "_Open in New Window"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:175
+#: src/bookmarks/ephy-bookmarks-editor.c:176
 msgid "Open the selected bookmark in a new window"
 msgstr "Open the selected bookmark in a new window"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:178
+#: src/bookmarks/ephy-bookmarks-editor.c:179
 msgid "Open the selected bookmark in a new tab"
 msgstr "Open the selected bookmark in a new tab"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:180
+#: src/bookmarks/ephy-bookmarks-editor.c:181
 msgid "_Rename..."
 msgstr "_Rename..."
 
-#: src/bookmarks/ephy-bookmarks-editor.c:181
+#: src/bookmarks/ephy-bookmarks-editor.c:182
 msgid "Rename the selected bookmark or topic"
 msgstr "Rename the selected bookmark or topic"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:182 src/ephy-history-window.c:175
+#: src/bookmarks/ephy-bookmarks-editor.c:183 src/ephy-history-window.c:178
 msgid "_Delete"
 msgstr "_Delete"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:183
+#: src/bookmarks/ephy-bookmarks-editor.c:184
 msgid "Delete the selected bookmark or topic"
 msgstr "Delete the selected bookmark or topic"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:185
+#: src/bookmarks/ephy-bookmarks-editor.c:186
 msgid "_Properties"
 msgstr "_Properties"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:186
+#: src/bookmarks/ephy-bookmarks-editor.c:187
 msgid "View or modify the properties of the selected bookmark"
 msgstr "View or modify the properties of the selected bookmark"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:188
+#: src/bookmarks/ephy-bookmarks-editor.c:189
 msgid "_Import Bookmarks..."
 msgstr "_Import Bookmarks..."
 
-#: src/bookmarks/ephy-bookmarks-editor.c:189
+#: src/bookmarks/ephy-bookmarks-editor.c:190
 msgid "Import bookmarks from another browser or a bookmarks file"
 msgstr "Import bookmarks from another browser or a bookmarks file"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:191 src/ephy-history-window.c:181
+#: src/bookmarks/ephy-bookmarks-editor.c:192 src/ephy-history-window.c:184
 #: src/ephy-window.c:127
 msgid "_Close"
 msgstr "_Close"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:192
+#: src/bookmarks/ephy-bookmarks-editor.c:193
 msgid "Close the bookmarks window"
 msgstr "Close the bookmarks window"
 
 #. Edit Menu
-#: src/bookmarks/ephy-bookmarks-editor.c:196 src/ephy-history-window.c:186
+#: src/bookmarks/ephy-bookmarks-editor.c:197 src/ephy-history-window.c:189
 #: src/ephy-window.c:138
 msgid "Cu_t"
 msgstr "Cu_t"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:197 src/ephy-history-window.c:187
+#: src/bookmarks/ephy-bookmarks-editor.c:198 src/ephy-history-window.c:190
 #: src/ephy-window.c:139
 msgid "Cut the selection"
 msgstr "Cut the selection"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:199
-#: src/bookmarks/ephy-bookmarks-editor.c:1026 src/ephy-history-window.c:189
-#: src/ephy-history-window.c:702 src/ephy-window.c:141
+#: src/bookmarks/ephy-bookmarks-editor.c:200
+#: src/bookmarks/ephy-bookmarks-editor.c:1091 src/ephy-history-window.c:192
+#: src/ephy-history-window.c:722 src/ephy-window.c:141
 msgid "_Copy"
 msgstr "_Copy"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:200 src/ephy-history-window.c:190
+#: src/bookmarks/ephy-bookmarks-editor.c:201 src/ephy-history-window.c:193
 #: src/ephy-window.c:142
 msgid "Copy the selection"
 msgstr "Copy the selection"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:202 src/ephy-history-window.c:192
+#: src/bookmarks/ephy-bookmarks-editor.c:203 src/ephy-history-window.c:195
 #: src/ephy-window.c:144
 msgid "_Paste"
 msgstr "_Paste"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:203 src/ephy-history-window.c:193
+#: src/bookmarks/ephy-bookmarks-editor.c:204 src/ephy-history-window.c:196
 msgid "Paste the clipboard"
 msgstr "Paste the clipboard"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:205 src/ephy-history-window.c:195
+#: src/bookmarks/ephy-bookmarks-editor.c:206 src/ephy-history-window.c:198
 #: src/ephy-window.c:147
 msgid "Select _All"
 msgstr "Select _All"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:206
+#: src/bookmarks/ephy-bookmarks-editor.c:207
 msgid "Select all bookmarks or text"
 msgstr "Select all bookmarks or text"
 
 #. Help Menu
 #. Help menu
-#: src/bookmarks/ephy-bookmarks-editor.c:210 src/ephy-history-window.c:203
+#: src/bookmarks/ephy-bookmarks-editor.c:211 src/ephy-history-window.c:206
 #: src/ephy-window.c:238
 msgid "_Contents"
 msgstr "_Contents"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:211
+#: src/bookmarks/ephy-bookmarks-editor.c:212
 msgid "Display bookmarks help"
 msgstr "Display bookmarks help"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:213 src/ephy-history-window.c:206
+#: src/bookmarks/ephy-bookmarks-editor.c:214 src/ephy-history-window.c:209
 #: src/ephy-window.c:241
 msgid "_About"
 msgstr "_About"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:214 src/ephy-history-window.c:207
+#: src/bookmarks/ephy-bookmarks-editor.c:215 src/ephy-history-window.c:210
 #: src/ephy-window.c:242
 msgid "Display credits for the web browser creators"
 msgstr "Display credits for the web browser creators"
 
 #. File Menu
-#: src/bookmarks/ephy-bookmarks-editor.c:222
+#: src/bookmarks/ephy-bookmarks-editor.c:223
 msgid "_Show in Bookmarks Bar"
 msgstr "_Show in Bookmarks Bar"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:223
+#: src/bookmarks/ephy-bookmarks-editor.c:224
 msgid "Show the selected bookmark or topic in the bookmarks bar"
 msgstr "Show the selected bookmark or topic in the bookmarks bar"
 
 #. View Menu
-#: src/bookmarks/ephy-bookmarks-editor.c:237 src/ephy-history-window.c:222
+#: src/bookmarks/ephy-bookmarks-editor.c:238 src/ephy-history-window.c:225
 msgid "_Title"
 msgstr "_Title"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:238 src/ephy-history-window.c:223
+#: src/bookmarks/ephy-bookmarks-editor.c:239 src/ephy-history-window.c:226
 msgid "Show only the title column"
 msgstr "Show only the title column"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:239 src/ephy-history-window.c:226
+#: src/bookmarks/ephy-bookmarks-editor.c:240 src/ephy-history-window.c:229
 msgid "T_itle and Address"
 msgstr "T_itle and Address"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:240 src/ephy-history-window.c:227
+#: src/bookmarks/ephy-bookmarks-editor.c:241 src/ephy-history-window.c:230
 msgid "Show both the title and address columns"
 msgstr "Show both the title and address columns"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:282
+#: src/bookmarks/ephy-bookmarks-editor.c:283
 #: src/bookmarks/ephy-topics-selector.c:313
 msgid "Type a topic"
 msgstr "Type a topic"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:557
+#: src/bookmarks/ephy-bookmarks-editor.c:457
+#, c-format
+msgid "Delete topic %s?"
+msgstr "Delete topic %s?"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:467
+msgid "Delete this topic?"
+msgstr "Delete this topic?"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:469
+msgid ""
+"Deleting this topic will cause all its bookmarks to become uncategorized, "
+"unless they also belong to other topics. The bookmarks will not be deleted."
+msgstr ""
+"Deleting this topic will cause all its bookmarks to become uncategorized, "
+"unless they also belong to other topics. The bookmarks will not be deleted."
+
+#: src/bookmarks/ephy-bookmarks-editor.c:472
+msgid "_Delete Topic"
+msgstr "_Delete Topic"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:622
 msgid "Import bookmarks from file"
 msgstr "Import bookmarks from file"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:564
+#: src/bookmarks/ephy-bookmarks-editor.c:629
 msgid "Firefox/Firebird/Mozilla bookmarks"
 msgstr "Firefox/Firebird/Mozilla bookmarks"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:568
+#: src/bookmarks/ephy-bookmarks-editor.c:633
 msgid "Galeon/Konqueror bookmarks"
 msgstr "Galeon/Konqueror bookmarks"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:572
+#: src/bookmarks/ephy-bookmarks-editor.c:637
 msgid "Epiphany bookmarks"
 msgstr "Epiphany bookmarks"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:611
+#: src/bookmarks/ephy-bookmarks-editor.c:676
 msgid "Import Bookmarks"
 msgstr "Import Bookmarks"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:617
+#: src/bookmarks/ephy-bookmarks-editor.c:682
 msgid "I_mport"
 msgstr "I_mport"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:631
+#: src/bookmarks/ephy-bookmarks-editor.c:696
 msgid "Import bookmarks from:"
 msgstr "Import bookmarks from:"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:639
+#: src/bookmarks/ephy-bookmarks-editor.c:704
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:641
+#: src/bookmarks/ephy-bookmarks-editor.c:706
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:643
+#: src/bookmarks/ephy-bookmarks-editor.c:708
 msgid "Galeon"
 msgstr "Galeoon"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:645
+#: src/bookmarks/ephy-bookmarks-editor.c:710
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:647
+#: src/bookmarks/ephy-bookmarks-editor.c:712
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1011 src/ephy-history-window.c:687
+#: src/bookmarks/ephy-bookmarks-editor.c:1076 src/ephy-history-window.c:707
 msgid "_Open in New Windows"
 msgstr "_Open in New Windows"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1012 src/ephy-history-window.c:688
+#: src/bookmarks/ephy-bookmarks-editor.c:1077 src/ephy-history-window.c:708
 msgid "Open in New _Tabs"
 msgstr "Open in New _Tabs"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1022 src/ephy-history-window.c:698
+#: src/bookmarks/ephy-bookmarks-editor.c:1087 src/ephy-history-window.c:718
 msgid "_Copy Address"
 msgstr "_Copy Address"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1263 src/ephy-history-window.c:1015
+#: src/bookmarks/ephy-bookmarks-editor.c:1328 src/ephy-history-window.c:1035
 msgid "_Search:"
 msgstr "_Search:"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1472
+#: src/bookmarks/ephy-bookmarks-editor.c:1537
 #: src/bookmarks/ephy-topics-selector.c:195
 msgid "Topics"
 msgstr "Topics"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1537 src/ephy-history-window.c:1298
+#: src/bookmarks/ephy-bookmarks-editor.c:1602 src/ephy-history-window.c:1322
 msgid "Title"
 msgstr "Title"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1543 src/ephy-history-window.c:1304
+#: src/bookmarks/ephy-bookmarks-editor.c:1608 src/ephy-history-window.c:1328
 msgid "Address"
 msgstr "Address"
 
@@ -2342,7 +2355,7 @@ msgstr "Add Bookmark"
 msgid "A bookmark titled %s already exists for this page."
 msgstr "A bookmark titled %s already exists for this page."
 
-#: src/bookmarks/ephy-new-bookmark.c:320
+#: src/bookmarks/ephy-new-bookmark.c:322
 msgid "Duplicated Bookmark"
 msgstr "Duplicated Bookmark"
 
@@ -2375,59 +2388,59 @@ msgstr "_Automatic"
 msgid "Go"
 msgstr "Go"
 
-#: src/ephy-history-window.c:170
+#: src/ephy-history-window.c:173
 msgid "Open the selected history link in a new window"
 msgstr "Open the selected history link in a new window"
 
-#: src/ephy-history-window.c:173
+#: src/ephy-history-window.c:176
 msgid "Open the selected history link in a new tab"
 msgstr "Open the selected history link in a new tab"
 
-#: src/ephy-history-window.c:176
+#: src/ephy-history-window.c:179
 msgid "Delete the selected history link"
 msgstr "Delete the selected history link"
 
-#: src/ephy-history-window.c:178
+#: src/ephy-history-window.c:181
 msgid "Boo_kmark Link..."
 msgstr "Boo_kmark Link..."
 
-#: src/ephy-history-window.c:179
+#: src/ephy-history-window.c:182
 msgid "Bookmark the selected history link"
 msgstr "Bookmark the selected history link"
 
-#: src/ephy-history-window.c:182
+#: src/ephy-history-window.c:185
 msgid "Close the history window"
 msgstr "Close the history window"
 
-#: src/ephy-history-window.c:196
+#: src/ephy-history-window.c:199
 msgid "Select all history links or text"
 msgstr "Select all history links or text"
 
-#: src/ephy-history-window.c:198
+#: src/ephy-history-window.c:201
 msgid "C_lear History"
 msgstr "C_lear History"
 
-#: src/ephy-history-window.c:199
+#: src/ephy-history-window.c:202
 msgid "Clear your browsing history"
 msgstr "Clear your browsing history"
 
-#: src/ephy-history-window.c:204
+#: src/ephy-history-window.c:207
 msgid "Display history help"
 msgstr "Display history help"
 
-#: src/ephy-history-window.c:224
+#: src/ephy-history-window.c:227
 msgid "_Address"
 msgstr "_Address"
 
-#: src/ephy-history-window.c:225
+#: src/ephy-history-window.c:228
 msgid "Show only the address column"
 msgstr "Show only the address column"
 
-#: src/ephy-history-window.c:255
+#: src/ephy-history-window.c:258
 msgid "Clear browsing history?"
 msgstr "Clear browsing history?"
 
-#: src/ephy-history-window.c:259
+#: src/ephy-history-window.c:262
 msgid ""
 "Clearing the browsing history will cause all history links to be permanently "
 "deleted."
@@ -2435,32 +2448,32 @@ msgstr ""
 "Clearing the browsing history will cause all history links to be permanently "
 "deleted."
 
-#: src/ephy-history-window.c:263
+#: src/ephy-history-window.c:266
 msgid "C_lear"
 msgstr "C_lear"
 
-#: src/ephy-history-window.c:266
+#: src/ephy-history-window.c:269
 msgid "Clear History"
 msgstr "Clear History"
 
-#: src/ephy-history-window.c:1024
+#: src/ephy-history-window.c:1044
 msgid "Last 30 Minutes"
 msgstr "Last 30 Minutes"
 
-#: src/ephy-history-window.c:1025
+#: src/ephy-history-window.c:1045
 msgid "Today"
 msgstr "Today"
 
 #. keep this in sync with embed/ephy-history.c's HISTORY_PAGE_OBSOLETE_DAYS
-#: src/ephy-history-window.c:1026 src/ephy-history-window.c:1029
-#: src/ephy-history-window.c:1033
+#: src/ephy-history-window.c:1046 src/ephy-history-window.c:1049
+#: src/ephy-history-window.c:1053
 #, c-format
 msgid "Last %d day"
 msgid_plural "Last %d days"
 msgstr[0] "Last %d day"
 msgstr[1] "Last %d days"
 
-#: src/ephy-history-window.c:1240
+#: src/ephy-history-window.c:1260
 msgid "Sites"
 msgstr "Sites"
 
@@ -2496,7 +2509,7 @@ msgstr "Import bookmarks from the given file"
 msgid "Launch the bookmarks editor"
 msgstr "Launch the bookmarks editor"
 
-#: src/ephy-main.c:106
+#: src/ephy-main.c:113
 msgid "Ephy"
 msgstr "Ephy"
 
@@ -2528,7 +2541,7 @@ msgstr "_Recover"
 msgid "Crash Recovery"
 msgstr "Crash Recovery"
 
-#: src/ephy-shell.c:324
+#: src/ephy-shell.c:329
 msgid ""
 "Bonobo couldn't locate the GNOME_Epiphany_Automation.server file. You can "
 "use bonobo-activation-sysconf to configure the search path for bonobo server "
@@ -2538,7 +2551,7 @@ msgstr ""
 "use bonobo-activation-sysconf to configure the search path for bonobo server "
 "files."
 
-#: src/ephy-shell.c:331
+#: src/ephy-shell.c:336
 msgid ""
 "Epiphany can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the automation server"
@@ -2546,7 +2559,7 @@ msgstr ""
 "Epiphany can't be used now, due to an unexpected error from Bonobo when "
 "attempting to register the automation server"
 
-#: src/ephy-shell.c:348
+#: src/ephy-shell.c:353
 msgid ""
 "Epiphany can't be used now, due to an unexpected error from Bonobo when "
 "attempting to locate the automation object."
@@ -2554,30 +2567,30 @@ msgstr ""
 "Epiphany can't be used now, due to an unexpected error from Bonobo when "
 "attempting to locate the automation object."
 
-#: src/ephy-tab.c:424 src/ephy-tab.c:1579 src/ephy-tab.c:1793
+#: src/ephy-tab.c:433 src/ephy-tab.c:1588 src/ephy-tab.c:1802
 msgid "Blank page"
 msgstr "Blank page"
 
-#: src/ephy-tab.c:1132
+#: src/ephy-tab.c:1141
 msgid "site"
 msgstr "site"
 
-#: src/ephy-tab.c:1156
+#: src/ephy-tab.c:1165
 #, c-format
 msgid "Redirecting to %s..."
 msgstr "Redirecting to %s..."
 
-#: src/ephy-tab.c:1160
+#: src/ephy-tab.c:1169
 #, c-format
 msgid "Transferring data from %s..."
 msgstr "Transferring data from %s..."
 
-#: src/ephy-tab.c:1164
+#: src/ephy-tab.c:1173
 #, c-format
 msgid "Waiting for authorization from %s..."
 msgstr "Waiting for authorization from %s..."
 
-#: src/ephy-tab.c:1172
+#: src/ephy-tab.c:1181
 #, c-format
 msgid "Loading %s..."
 msgstr "Loading %s..."