[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [translation/torbirdy] Update translations for torbirdy

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [translation/torbirdy] Update translations for torbirdy
From: translation@xxxxxxxxxxxxxx
Date: Tue, 17 Sep 2013 13:26:58 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 17 Sep 2013 09:27:20 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 90a71f42b02a9f0cf8bf0cd8f8ed452b518e9b12
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Tue Sep 17 13:26:58 2013 +0000

    Update translations for torbirdy
---
 af/torbirdy.dtd    |   26 +++++++++++++-------------
 ak/torbirdy.dtd    |   26 +++++++++++++-------------
 am/torbirdy.dtd    |   26 +++++++++++++-------------
 arn/torbirdy.dtd   |   26 +++++++++++++-------------
 ast/torbirdy.dtd   |   26 +++++++++++++-------------
 az/torbirdy.dtd    |    8 ++++----
 be/torbirdy.dtd    |   26 +++++++++++++-------------
 bg/torbirdy.dtd    |   20 ++++++++++----------
 bn/torbirdy.dtd    |   26 +++++++++++++-------------
 bn_IN/torbirdy.dtd |   26 +++++++++++++-------------
 bo/torbirdy.dtd    |   26 +++++++++++++-------------
 br/torbirdy.dtd    |   26 +++++++++++++-------------
 ca/torbirdy.dtd    |    2 +-
 csb/torbirdy.dtd   |   26 +++++++++++++-------------
 cy/torbirdy.dtd    |    6 +++---
 dz/torbirdy.dtd    |   26 +++++++++++++-------------
 eo/torbirdy.dtd    |   10 +++++-----
 et/torbirdy.dtd    |   22 +++++++++++-----------
 fi/torbirdy.dtd    |    2 +-
 fil/torbirdy.dtd   |   22 +++++++++++-----------
 fo/torbirdy.dtd    |   26 +++++++++++++-------------
 fur/torbirdy.dtd   |   26 +++++++++++++-------------
 fy/torbirdy.dtd    |   26 +++++++++++++-------------
 ga/torbirdy.dtd    |   26 +++++++++++++-------------
 gl/torbirdy.dtd    |   20 ++++++++++----------
 gu/torbirdy.dtd    |    8 ++++----
 gun/torbirdy.dtd   |   26 +++++++++++++-------------
 ha/torbirdy.dtd    |   26 +++++++++++++-------------
 hi/torbirdy.dtd    |    4 ++--
 hr/torbirdy.dtd    |   10 +++++-----
 ht/torbirdy.dtd    |   26 +++++++++++++-------------
 hy/torbirdy.dtd    |   26 +++++++++++++-------------
 id/torbirdy.dtd    |    8 ++++----
 is/torbirdy.dtd    |   22 +++++++++++-----------
 jv/torbirdy.dtd    |   26 +++++++++++++-------------
 ka/torbirdy.dtd    |   26 +++++++++++++-------------
 km/torbirdy.dtd    |   26 +++++++++++++-------------
 kn/torbirdy.dtd    |   26 +++++++++++++-------------
 ku/torbirdy.dtd    |   26 +++++++++++++-------------
 kw/torbirdy.dtd    |   26 +++++++++++++-------------
 ky/torbirdy.dtd    |   22 +++++++++++-----------
 lb/torbirdy.dtd    |   26 +++++++++++++-------------
 lg/torbirdy.dtd    |   24 ++++++++++++------------
 ln/torbirdy.dtd    |   26 +++++++++++++-------------
 lo/torbirdy.dtd    |   26 +++++++++++++-------------
 lt/torbirdy.dtd    |    4 ++--
 mg/torbirdy.dtd    |   26 +++++++++++++-------------
 mi/torbirdy.dtd    |   26 +++++++++++++-------------
 mk/torbirdy.dtd    |    8 ++++----
 ml/torbirdy.dtd    |   26 +++++++++++++-------------
 mn/torbirdy.dtd    |   26 +++++++++++++-------------
 mr/torbirdy.dtd    |   26 +++++++++++++-------------
 ms/torbirdy.dtd    |   26 +++++++++++++-------------
 mt/torbirdy.dtd    |   26 +++++++++++++-------------
 my/torbirdy.dtd    |    2 +-
 nah/torbirdy.dtd   |   26 +++++++++++++-------------
 nap/torbirdy.dtd   |   26 +++++++++++++-------------
 ne/torbirdy.dtd    |   26 +++++++++++++-------------
 nn/torbirdy.dtd    |   26 +++++++++++++-------------
 nso/torbirdy.dtd   |   26 +++++++++++++-------------
 oc/torbirdy.dtd    |   26 +++++++++++++-------------
 or/torbirdy.dtd    |   26 +++++++++++++-------------
 pa/torbirdy.dtd    |    4 ++--
 pap/torbirdy.dtd   |   26 +++++++++++++-------------
 pms/torbirdy.dtd   |   26 +++++++++++++-------------
 ps/torbirdy.dtd    |   26 +++++++++++++-------------
 ro/torbirdy.dtd    |    2 +-
 sco/torbirdy.dtd   |   26 +++++++++++++-------------
 sk/torbirdy.dtd    |   20 ++++++++++----------
 sl/torbirdy.dtd    |    2 +-
 so/torbirdy.dtd    |   26 +++++++++++++-------------
 son/torbirdy.dtd   |   26 +++++++++++++-------------
 sq/torbirdy.dtd    |   22 +++++++++++-----------
 st/torbirdy.dtd    |   26 +++++++++++++-------------
 su/torbirdy.dtd    |   26 +++++++++++++-------------
 sv/torbirdy.dtd    |    6 +++---
 sw/torbirdy.dtd    |   26 +++++++++++++-------------
 ta/torbirdy.dtd    |   22 +++++++++++-----------
 te/torbirdy.dtd    |   26 +++++++++++++-------------
 tg/torbirdy.dtd    |   26 +++++++++++++-------------
 th/torbirdy.dtd    |    4 ++--
 ti/torbirdy.dtd    |   26 +++++++++++++-------------
 tk/torbirdy.dtd    |   26 +++++++++++++-------------
 ur/torbirdy.dtd    |   26 +++++++++++++-------------
 ve/torbirdy.dtd    |   26 +++++++++++++-------------
 vi/torbirdy.dtd    |    8 ++++----
 wa/torbirdy.dtd    |   26 +++++++++++++-------------
 wo/torbirdy.dtd    |   26 +++++++++++++-------------
 zh_HK/torbirdy.dtd |   26 +++++++++++++-------------
 zu/torbirdy.dtd    |   26 +++++++++++++-------------
 90 files changed, 963 insertions(+), 963 deletions(-)

diff --git a/af/torbirdy.dtd b/af/torbirdy.dtd
index 50d9546..831031e 100644
--- a/af/torbirdy.dtd
+++ b/af/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/ak/torbirdy.dtd b/ak/torbirdy.dtd
index 50d9546..831031e 100644
--- a/ak/torbirdy.dtd
+++ b/ak/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/am/torbirdy.dtd b/am/torbirdy.dtd
index 50d9546..831031e 100644
--- a/am/torbirdy.dtd
+++ b/am/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/arn/torbirdy.dtd b/arn/torbirdy.dtd
index 50d9546..831031e 100644
--- a/arn/torbirdy.dtd
+++ b/arn/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/ast/torbirdy.dtd b/ast/torbirdy.dtd
index 50d9546..831031e 100644
--- a/ast/torbirdy.dtd
+++ b/ast/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/az/torbirdy.dtd b/az/torbirdy.dtd
index 6a0026c..66b891e 100644
--- a/az/torbirdy.dtd
+++ b/az/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "P">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
 <!ENTITY torbirdy.accountprefs.cancel.button "LÉ?Ä?v et">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "LÉ?Ä?v et">
 <!ENTITY torbirdy.prefs.extra1.button "VarsayÄ±lanlarÄ± yenidÉ?n yÃ¼klÉ?">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "P">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -50,7 +50,7 @@
 <!ENTITY torbirdy.prefs.renegotiation.label "">
 <!ENTITY torbirdy.prefs.renegotiation.key "P">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/be/torbirdy.dtd b/be/torbirdy.dtd
index 50d9546..831031e 100644
--- a/be/torbirdy.dtd
+++ b/be/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/bg/torbirdy.dtd b/bg/torbirdy.dtd
index 35c7318..9950324 100644
--- a/bg/torbirdy.dtd
+++ b/bg/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
 <!ENTITY torbirdy.accountprefs.cancel.button "Ð?Ñ?ÐºÐ°Ð·">
 <!ENTITY torbirdy.accountprefs.save.button "Ð?Ð°Ð¿Ð¸Ñ?Ð¸">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "Ð?Ð°Ð¿Ð¸Ñ?Ð¸">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Ð?Ñ?ÐºÐ°Ð·">
 <!ENTITY torbirdy.prefs.extra1.button "Ð?Ñ?Ð·Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð¸ Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ñ?Ð½Ð¸Ñ?Ðµ">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/bn/torbirdy.dtd b/bn/torbirdy.dtd
index 50d9546..831031e 100644
--- a/bn/torbirdy.dtd
+++ b/bn/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/bn_IN/torbirdy.dtd b/bn_IN/torbirdy.dtd
index 50d9546..831031e 100644
--- a/bn_IN/torbirdy.dtd
+++ b/bn_IN/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/bo/torbirdy.dtd b/bo/torbirdy.dtd
index 50d9546..831031e 100644
--- a/bo/torbirdy.dtd
+++ b/bo/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/br/torbirdy.dtd b/br/torbirdy.dtd
index 50d9546..831031e 100644
--- a/br/torbirdy.dtd
+++ b/br/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/ca/torbirdy.dtd b/ca/torbirdy.dtd
index 1561d88..69e2221 100644
--- a/ca/torbirdy.dtd
+++ b/ca/torbirdy.dtd
@@ -6,7 +6,7 @@
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
 <!ENTITY torbirdy.accountprefs.cancel.button "CancelÂ·la">
 <!ENTITY torbirdy.accountprefs.save.button "Desa">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "Desa">
diff --git a/csb/torbirdy.dtd b/csb/torbirdy.dtd
index 50d9546..831031e 100644
--- a/csb/torbirdy.dtd
+++ b/csb/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/cy/torbirdy.dtd b/cy/torbirdy.dtd
index 3ceeff8..fdc64bc 100644
--- a/cy/torbirdy.dtd
+++ b/cy/torbirdy.dtd
@@ -6,14 +6,14 @@
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
 <!ENTITY torbirdy.accountprefs.cancel.button "Canslo">
 <!ENTITY torbirdy.accountprefs.save.button "Cadw">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "Cadw">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Canslo">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "p">
 <!ENTITY torbirdy.prefs.proxy.label "">
diff --git a/dz/torbirdy.dtd b/dz/torbirdy.dtd
index 50d9546..831031e 100644
--- a/dz/torbirdy.dtd
+++ b/dz/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/eo/torbirdy.dtd b/eo/torbirdy.dtd
index d7312eb..bcb8975 100644
--- a/eo/torbirdy.dtd
+++ b/eo/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "A">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
 <!ENTITY torbirdy.accountprefs.cancel.button "Rezigni">
 <!ENTITY torbirdy.accountprefs.save.button "Konservi">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "Konservi">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Rezigni">
 <!ENTITY torbirdy.prefs.extra1.button "RestaÅri defaÅltojn">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "A">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -24,7 +24,7 @@
 <!ENTITY torbirdy.prefs.recommended.key "A">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "A">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
@@ -50,7 +50,7 @@
 <!ENTITY torbirdy.prefs.renegotiation.label "">
 <!ENTITY torbirdy.prefs.renegotiation.key "A">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/et/torbirdy.dtd b/et/torbirdy.dtd
index 446526e..3c11d0b 100644
--- a/et/torbirdy.dtd
+++ b/et/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
 <!ENTITY torbirdy.accountprefs.cancel.button "Katkesta">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Katkesta">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/fi/torbirdy.dtd b/fi/torbirdy.dtd
index 9540d7d..99626a3 100644
--- a/fi/torbirdy.dtd
+++ b/fi/torbirdy.dtd
@@ -6,7 +6,7 @@
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
 <!ENTITY torbirdy.accountprefs.cancel.button "Peruuta">
 <!ENTITY torbirdy.accountprefs.save.button "Tallenna">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "Tallenna">
diff --git a/fil/torbirdy.dtd b/fil/torbirdy.dtd
index 6ead76f..5772214 100644
--- a/fil/torbirdy.dtd
+++ b/fil/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
 <!ENTITY torbirdy.accountprefs.cancel.button "Kanselahin">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Kanselahin">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/fo/torbirdy.dtd b/fo/torbirdy.dtd
index 50d9546..831031e 100644
--- a/fo/torbirdy.dtd
+++ b/fo/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/fur/torbirdy.dtd b/fur/torbirdy.dtd
index 50d9546..831031e 100644
--- a/fur/torbirdy.dtd
+++ b/fur/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/fy/torbirdy.dtd b/fy/torbirdy.dtd
index 50d9546..831031e 100644
--- a/fy/torbirdy.dtd
+++ b/fy/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/ga/torbirdy.dtd b/ga/torbirdy.dtd
index 50d9546..831031e 100644
--- a/ga/torbirdy.dtd
+++ b/ga/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/gl/torbirdy.dtd b/gl/torbirdy.dtd
index 9266d80..05f395e 100644
--- a/gl/torbirdy.dtd
+++ b/gl/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "ConfiguraciÃ³n da conta">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "minutos">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancelar">
 <!ENTITY torbirdy.accountprefs.save.button "Gardar">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "Gardar">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Cancelar">
 <!ENTITY torbirdy.prefs.extra1.button "Restabelecer valores predeterminados">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "Porto:">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "Global">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "Elixe unha conta:">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/gu/torbirdy.dtd b/gu/torbirdy.dtd
index 546d576..2bebd00 100644
--- a/gu/torbirdy.dtd
+++ b/gu/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "P">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
 <!ENTITY torbirdy.accountprefs.cancel.button "àª°àª¦à«? àª?àª°à«?">
 <!ENTITY torbirdy.accountprefs.save.button "àª¸àª?àª?à«?àª°àª¹à«?">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "àª¸àª?àª?à«?àª°àª¹à«?">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "àª°àª¦à«? àª?àª°à«?">
 <!ENTITY torbirdy.prefs.extra1.button "àª®à«?àª³àªà«?àª¤ àªªàª¾àª?à«?àª? àª²àª¾àªµà«?">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "P">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -50,7 +50,7 @@
 <!ENTITY torbirdy.prefs.renegotiation.label "">
 <!ENTITY torbirdy.prefs.renegotiation.key "P">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/gun/torbirdy.dtd b/gun/torbirdy.dtd
index 50d9546..831031e 100644
--- a/gun/torbirdy.dtd
+++ b/gun/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/ha/torbirdy.dtd b/ha/torbirdy.dtd
index 50d9546..831031e 100644
--- a/ha/torbirdy.dtd
+++ b/ha/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/hi/torbirdy.dtd b/hi/torbirdy.dtd
index 8b5f2ef..91d3ea1 100644
--- a/hi/torbirdy.dtd
+++ b/hi/torbirdy.dtd
@@ -12,8 +12,8 @@
 <!ENTITY torbirdy.prefs.save.button "à¤¸à¤?à¤?à¤¯ à¤?à¤°à¥?à¤? ">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "à¤°à¤¦à¥?à¤¦ à¤?à¤°à¥?à¤? ">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "P/à¤ª">
 <!ENTITY torbirdy.prefs.proxy.label "">
diff --git a/hr/torbirdy.dtd b/hr/torbirdy.dtd
index 887cadf..d63ee76 100644
--- a/hr/torbirdy.dtd
+++ b/hr/torbirdy.dtd
@@ -4,16 +4,16 @@
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "k">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "k">
 <!ENTITY torbirdy.prefs.proxy.label "">
diff --git a/ht/torbirdy.dtd b/ht/torbirdy.dtd
index 50d9546..831031e 100644
--- a/ht/torbirdy.dtd
+++ b/ht/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/hy/torbirdy.dtd b/hy/torbirdy.dtd
index 50d9546..831031e 100644
--- a/hy/torbirdy.dtd
+++ b/hy/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/id/torbirdy.dtd b/id/torbirdy.dtd
index 1d72692..808becb 100644
--- a/id/torbirdy.dtd
+++ b/id/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "P">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
 <!ENTITY torbirdy.accountprefs.cancel.button "Batal">
 <!ENTITY torbirdy.accountprefs.save.button "Simpan">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "Simpan">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Batal">
 <!ENTITY torbirdy.prefs.extra1.button "Kembalikan Default">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "P">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -50,7 +50,7 @@
 <!ENTITY torbirdy.prefs.renegotiation.label "">
 <!ENTITY torbirdy.prefs.renegotiation.key "P">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/is/torbirdy.dtd b/is/torbirdy.dtd
index 22ea5fd..adbc009 100644
--- a/is/torbirdy.dtd
+++ b/is/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
 <!ENTITY torbirdy.accountprefs.cancel.button "HÃ¦tta viÃ°">
 <!ENTITY torbirdy.accountprefs.save.button "Vista">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "Vista">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "HÃ¦tta viÃ°">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/jv/torbirdy.dtd b/jv/torbirdy.dtd
index 50d9546..831031e 100644
--- a/jv/torbirdy.dtd
+++ b/jv/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/ka/torbirdy.dtd b/ka/torbirdy.dtd
index 50d9546..831031e 100644
--- a/ka/torbirdy.dtd
+++ b/ka/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/km/torbirdy.dtd b/km/torbirdy.dtd
index 50d9546..831031e 100644
--- a/km/torbirdy.dtd
+++ b/km/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/kn/torbirdy.dtd b/kn/torbirdy.dtd
index 50d9546..831031e 100644
--- a/kn/torbirdy.dtd
+++ b/kn/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/ku/torbirdy.dtd b/ku/torbirdy.dtd
index 50d9546..831031e 100644
--- a/ku/torbirdy.dtd
+++ b/ku/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/kw/torbirdy.dtd b/kw/torbirdy.dtd
index 50d9546..831031e 100644
--- a/kw/torbirdy.dtd
+++ b/kw/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/ky/torbirdy.dtd b/ky/torbirdy.dtd
index 3486521..f97fa39 100644
--- a/ky/torbirdy.dtd
+++ b/ky/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
 <!ENTITY torbirdy.accountprefs.cancel.button "Ð?Ð¹Ð½Ñ?Ñ?">
 <!ENTITY torbirdy.accountprefs.save.button "Ð¡Ð°ÐºÑ?Ð¾Ð¾">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "Ð¡Ð°ÐºÑ?Ð¾Ð¾">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Ð?Ð¹Ð½Ñ?Ñ?">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/lb/torbirdy.dtd b/lb/torbirdy.dtd
index 50d9546..831031e 100644
--- a/lb/torbirdy.dtd
+++ b/lb/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/lg/torbirdy.dtd b/lg/torbirdy.dtd
index 50d9546..1eea511 100644
--- a/lg/torbirdy.dtd
+++ b/lg/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
 <!ENTITY torbirdy.accountprefs.save.key "">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/ln/torbirdy.dtd b/ln/torbirdy.dtd
index 50d9546..831031e 100644
--- a/ln/torbirdy.dtd
+++ b/ln/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/lo/torbirdy.dtd b/lo/torbirdy.dtd
index 50d9546..831031e 100644
--- a/lo/torbirdy.dtd
+++ b/lo/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/lt/torbirdy.dtd b/lt/torbirdy.dtd
index c664da8..ab71b17 100644
--- a/lt/torbirdy.dtd
+++ b/lt/torbirdy.dtd
@@ -6,7 +6,7 @@
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
 <!ENTITY torbirdy.accountprefs.cancel.button "Atsisakyti">
 <!ENTITY torbirdy.accountprefs.save.button "Ä®raÅ¡yti">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "Ä®raÅ¡yti">
@@ -24,7 +24,7 @@
 <!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "p">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
diff --git a/mg/torbirdy.dtd b/mg/torbirdy.dtd
index 50d9546..831031e 100644
--- a/mg/torbirdy.dtd
+++ b/mg/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/mi/torbirdy.dtd b/mi/torbirdy.dtd
index 50d9546..831031e 100644
--- a/mi/torbirdy.dtd
+++ b/mi/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/mk/torbirdy.dtd b/mk/torbirdy.dtd
index bff59eb..329a601 100644
--- a/mk/torbirdy.dtd
+++ b/mk/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "P">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
 <!ENTITY torbirdy.accountprefs.cancel.button "Ð?Ñ?ÐºÐ°Ð¶Ð¸ Ñ?Ðµ">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Ð?Ñ?ÐºÐ°Ð¶Ð¸ Ñ?Ðµ">
 <!ENTITY torbirdy.prefs.extra1.button "Ð¡Ñ?Ð°Ð½Ð´Ð°Ñ?Ð´Ð½Ð¸ Ð¿Ð¾Ð´ÐµÑ?Ñ?Ð²Ð°Ñ?Ð°">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "P">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -50,7 +50,7 @@
 <!ENTITY torbirdy.prefs.renegotiation.label "">
 <!ENTITY torbirdy.prefs.renegotiation.key "P">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/ml/torbirdy.dtd b/ml/torbirdy.dtd
index 50d9546..831031e 100644
--- a/ml/torbirdy.dtd
+++ b/ml/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/mn/torbirdy.dtd b/mn/torbirdy.dtd
index 50d9546..831031e 100644
--- a/mn/torbirdy.dtd
+++ b/mn/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/mr/torbirdy.dtd b/mr/torbirdy.dtd
index 50d9546..831031e 100644
--- a/mr/torbirdy.dtd
+++ b/mr/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/ms/torbirdy.dtd b/ms/torbirdy.dtd
index 50d9546..831031e 100644
--- a/ms/torbirdy.dtd
+++ b/ms/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/mt/torbirdy.dtd b/mt/torbirdy.dtd
index 50d9546..831031e 100644
--- a/mt/torbirdy.dtd
+++ b/mt/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/my/torbirdy.dtd b/my/torbirdy.dtd
index cbb8704..0dd6434 100644
--- a/my/torbirdy.dtd
+++ b/my/torbirdy.dtd
@@ -6,7 +6,7 @@
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
 <!ENTITY torbirdy.accountprefs.cancel.button "á??á?»á??á?ºá??á?á??á?ºá?¸á??á??á?º">
 <!ENTITY torbirdy.accountprefs.save.button "á??á?á??á?ºá?¸á??á??á?ºá?¸á??á??á?º">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "á??á?á??á?ºá?¸á??á??á?ºá?¸á??á??á?º">
diff --git a/nah/torbirdy.dtd b/nah/torbirdy.dtd
index 50d9546..831031e 100644
--- a/nah/torbirdy.dtd
+++ b/nah/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/nap/torbirdy.dtd b/nap/torbirdy.dtd
index 50d9546..831031e 100644
--- a/nap/torbirdy.dtd
+++ b/nap/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/ne/torbirdy.dtd b/ne/torbirdy.dtd
index 50d9546..831031e 100644
--- a/ne/torbirdy.dtd
+++ b/ne/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/nn/torbirdy.dtd b/nn/torbirdy.dtd
index 50d9546..831031e 100644
--- a/nn/torbirdy.dtd
+++ b/nn/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/nso/torbirdy.dtd b/nso/torbirdy.dtd
index 50d9546..831031e 100644
--- a/nso/torbirdy.dtd
+++ b/nso/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/oc/torbirdy.dtd b/oc/torbirdy.dtd
index 50d9546..831031e 100644
--- a/oc/torbirdy.dtd
+++ b/oc/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/or/torbirdy.dtd b/or/torbirdy.dtd
index 50d9546..831031e 100644
--- a/or/torbirdy.dtd
+++ b/or/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/pa/torbirdy.dtd b/pa/torbirdy.dtd
index ef9ad92..fa6f892 100644
--- a/pa/torbirdy.dtd
+++ b/pa/torbirdy.dtd
@@ -12,8 +12,8 @@
 <!ENTITY torbirdy.prefs.save.button "à¨ à©?à¨? à¨¹à©?">
 <!ENTITY torbirdy.prefs.save.key "S">
 <!ENTITY torbirdy.prefs.cancel.button "à¨°à©±à¨¦ à¨?à¨°à©?">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "g">
 <!ENTITY torbirdy.prefs.proxy.label "">
diff --git a/pap/torbirdy.dtd b/pap/torbirdy.dtd
index 50d9546..831031e 100644
--- a/pap/torbirdy.dtd
+++ b/pap/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/pms/torbirdy.dtd b/pms/torbirdy.dtd
index 50d9546..831031e 100644
--- a/pms/torbirdy.dtd
+++ b/pms/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/ps/torbirdy.dtd b/ps/torbirdy.dtd
index 50d9546..831031e 100644
--- a/ps/torbirdy.dtd
+++ b/ps/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/ro/torbirdy.dtd b/ro/torbirdy.dtd
index a540991..aa8dec6 100644
--- a/ro/torbirdy.dtd
+++ b/ro/torbirdy.dtd
@@ -6,7 +6,7 @@
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "minute">
 <!ENTITY torbirdy.accountprefs.cancel.button "Revocare">
 <!ENTITY torbirdy.accountprefs.save.button "SalveazÄ?">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "SetÄ?ri TorBirdy">
 <!ENTITY torbirdy.prefs.save.button "SalveazÄ?">
diff --git a/sco/torbirdy.dtd b/sco/torbirdy.dtd
index 50d9546..831031e 100644
--- a/sco/torbirdy.dtd
+++ b/sco/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/sk/torbirdy.dtd b/sk/torbirdy.dtd
index 10d803c..a995567 100644
--- a/sk/torbirdy.dtd
+++ b/sk/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
 <!ENTITY torbirdy.accountprefs.cancel.button "ZruÅ¡iÅ¥">
 <!ENTITY torbirdy.accountprefs.save.button "UloÅ¾iÅ¥">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "UloÅ¾iÅ¥">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "ZruÅ¡iÅ¥">
 <!ENTITY torbirdy.prefs.extra1.button "ObnoviÅ¥ predvolenÃ©">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/sl/torbirdy.dtd b/sl/torbirdy.dtd
index adc2315..a2e2c7d 100644
--- a/sl/torbirdy.dtd
+++ b/sl/torbirdy.dtd
@@ -6,7 +6,7 @@
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
 <!ENTITY torbirdy.accountprefs.cancel.button "Prekini">
 <!ENTITY torbirdy.accountprefs.save.button "Shrani">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "Shrani">
diff --git a/so/torbirdy.dtd b/so/torbirdy.dtd
index 50d9546..831031e 100644
--- a/so/torbirdy.dtd
+++ b/so/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/son/torbirdy.dtd b/son/torbirdy.dtd
index 50d9546..831031e 100644
--- a/son/torbirdy.dtd
+++ b/son/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/sq/torbirdy.dtd b/sq/torbirdy.dtd
index 5005c27..f971656 100644
--- a/sq/torbirdy.dtd
+++ b/sq/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
 <!ENTITY torbirdy.accountprefs.cancel.button "Anullo">
 <!ENTITY torbirdy.accountprefs.save.button "Ruaj">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "Ruaj">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Anullo">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/st/torbirdy.dtd b/st/torbirdy.dtd
index 50d9546..831031e 100644
--- a/st/torbirdy.dtd
+++ b/st/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/su/torbirdy.dtd b/su/torbirdy.dtd
index 50d9546..831031e 100644
--- a/su/torbirdy.dtd
+++ b/su/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/sv/torbirdy.dtd b/sv/torbirdy.dtd
index 31ca53f..ff0c7fb 100644
--- a/sv/torbirdy.dtd
+++ b/sv/torbirdy.dtd
@@ -16,10 +16,10 @@
 <!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "Testa proxyinstÃ¤llningar">
 <!ENTITY torbirdy.prefs.extra2.key "n">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Integritet">
 <!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
-<!ENTITY torbirdy.prefs.security.label "">
+<!ENTITY torbirdy.prefs.security.label "SÃ¤kerhet">
 <!ENTITY torbirdy.prefs.recommended.text "AnvÃ¤nd rekommenderade proxyinstÃ¤llningar fÃ¶r TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "VÃ¤lj en anonymiseringstjÃ¤nst">
diff --git a/sw/torbirdy.dtd b/sw/torbirdy.dtd
index 50d9546..831031e 100644
--- a/sw/torbirdy.dtd
+++ b/sw/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/ta/torbirdy.dtd b/ta/torbirdy.dtd
index e07901f..c5aa5a6 100644
--- a/ta/torbirdy.dtd
+++ b/ta/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
 <!ENTITY torbirdy.accountprefs.cancel.button "à®°à®¤à¯?à®¤à¯?à®?à¯?à®¯à¯?">
 <!ENTITY torbirdy.accountprefs.save.button "à®?à¯?à®®à®¿">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "à®?à¯?à®®à®¿">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "à®°à®¤à¯?à®¤à¯?à®?à¯?à®¯à¯?">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/te/torbirdy.dtd b/te/torbirdy.dtd
index 50d9546..831031e 100644
--- a/te/torbirdy.dtd
+++ b/te/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/tg/torbirdy.dtd b/tg/torbirdy.dtd
index 50d9546..831031e 100644
--- a/tg/torbirdy.dtd
+++ b/tg/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/th/torbirdy.dtd b/th/torbirdy.dtd
index 1625ef2..0ae2c3e 100644
--- a/th/torbirdy.dtd
+++ b/th/torbirdy.dtd
@@ -12,8 +12,8 @@
 <!ENTITY torbirdy.prefs.save.button "à¸?à¸±à¸?à¸?à¸¶à¸?">
 <!ENTITY torbirdy.prefs.save.key "à¸?">
 <!ENTITY torbirdy.prefs.cancel.button "à¸¢à¸?à¹?à¸¥à¸´à¸?">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "à¸?">
 <!ENTITY torbirdy.prefs.proxy.label "">
diff --git a/ti/torbirdy.dtd b/ti/torbirdy.dtd
index 50d9546..831031e 100644
--- a/ti/torbirdy.dtd
+++ b/ti/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/tk/torbirdy.dtd b/tk/torbirdy.dtd
index 50d9546..831031e 100644
--- a/tk/torbirdy.dtd
+++ b/tk/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/ur/torbirdy.dtd b/ur/torbirdy.dtd
index 50d9546..831031e 100644
--- a/ur/torbirdy.dtd
+++ b/ur/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/ve/torbirdy.dtd b/ve/torbirdy.dtd
index 50d9546..831031e 100644
--- a/ve/torbirdy.dtd
+++ b/ve/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/vi/torbirdy.dtd b/vi/torbirdy.dtd
index 93ac6d6..64c5604 100644
--- a/vi/torbirdy.dtd
+++ b/vi/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "y">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
 <!ENTITY torbirdy.accountprefs.cancel.button "Há»§y">
 <!ENTITY torbirdy.accountprefs.save.button "LÆ°u">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "LÆ°u">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Há»§y">
 <!ENTITY torbirdy.prefs.extra1.button "KhÃ´i phá»¥c Máº·c Ä?á»?nh">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "y">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -50,7 +50,7 @@
 <!ENTITY torbirdy.prefs.renegotiation.label "">
 <!ENTITY torbirdy.prefs.renegotiation.key "y">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/wa/torbirdy.dtd b/wa/torbirdy.dtd
index 50d9546..831031e 100644
--- a/wa/torbirdy.dtd
+++ b/wa/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/wo/torbirdy.dtd b/wo/torbirdy.dtd
index 50d9546..831031e 100644
--- a/wo/torbirdy.dtd
+++ b/wo/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/zh_HK/torbirdy.dtd b/zh_HK/torbirdy.dtd
index 50d9546..831031e 100644
--- a/zh_HK/torbirdy.dtd
+++ b/zh_HK/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
diff --git a/zu/torbirdy.dtd b/zu/torbirdy.dtd
index 50d9546..831031e 100644
--- a/zu/torbirdy.dtd
+++ b/zu/torbirdy.dtd
@@ -1,19 +1,19 @@
 <!ENTITY torbirdy.accountprefs.title "">
 <!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "">
 <!ENTITY torbirdy.accountprefs.minutes.key "">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "">
-<!ENTITY torbirdy.accountprefs.cancel.button "">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
 <!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "">
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
-<!ENTITY torbirdy.prefs.cancel.button "">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.cancel.button "Cancel">
+<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
@@ -21,26 +21,26 @@
 <!ENTITY torbirdy.prefs.enigmail.label "">
 <!ENTITY torbirdy.prefs.security.label "">
 <!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
+<!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "">
 <!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "">
 <!ENTITY torbirdy.prefs.socks_host.label "">
 <!ENTITY torbirdy.prefs.socks_host.key "">
 <!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "">
 <!ENTITY torbirdy.prefs.torification.key "">
 <!ENTITY torbirdy.prefs.global "">
 <!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
+<!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "">
 <!ENTITY torbirdy.prefs.startup_folder.key "">
 <!ENTITY torbirdy.prefs.timezone.label "">
 <!ENTITY torbirdy.prefs.timezone.key "">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "">
 <!ENTITY torbirdy.prefs.confirmemail.key "">
 <!ENTITY torbirdy.prefs.emailwizard.label "">
@@ -48,9 +48,9 @@
 <!ENTITY torbirdy.prefs.automatic.label "">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [translation/whisperback_completed] Update translations for whisperback_completed
Next by Author: [tor-commits] [translation/mat-gui] Update translations for mat-gui
Previous by thread: [tor-commits] [translation/torbirdy] Update translations for torbirdy
Next by thread: [tor-commits] [translation/torbirdy] Update translations for torbirdy
Index(es):
- Author
- Thread