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

Fri Sep 20 08:47:22 UTC 2013

commit 27e71c202e4f1b28a658f3303edac32232cb427c
Author: Translation commit bot <translation at torproject.org>
Date:   Fri Sep 20 08:47:21 2013 +0000

    Update translations for torbirdy
---
 af/torbirdy.dtd          |    4 ++--
 ak/torbirdy.dtd          |    4 ++--
 am/torbirdy.dtd          |    4 ++--
 ar/torbirdy.dtd          |    8 ++++----
 arn/torbirdy.dtd         |    4 ++--
 ast/torbirdy.dtd         |    4 ++--
 az/torbirdy.dtd          |    6 +++---
 be/torbirdy.dtd          |    4 ++--
 bg/torbirdy.dtd          |    4 ++--
 bg_BG/torbirdy.dtd       |    4 ++--
 bn/torbirdy.dtd          |    4 ++--
 bn_IN/torbirdy.dtd       |    4 ++--
 bo/torbirdy.dtd          |    4 ++--
 br/torbirdy.dtd          |    4 ++--
 bs/torbirdy.dtd          |    8 ++++----
 ca/torbirdy.dtd          |    6 +++---
 ca_ES/torbirdy.dtd       |    4 ++--
 cs/torbirdy.dtd          |    6 +++---
 csb/torbirdy.dtd         |    4 ++--
 cy/torbirdy.dtd          |    6 +++---
 da/torbirdy.dtd          |    8 ++++----
 de/torbirdy.dtd          |    8 ++++----
 dz/torbirdy.dtd          |    4 ++--
 el/torbirdy.dtd          |    8 ++++----
 el_GR/torbirdy.dtd       |    4 ++--
 en_GB/torbirdy.dtd       |    4 ++--
 eo/torbirdy.dtd          |    6 +++---
 es/torbirdy.dtd          |    8 ++++----
 es_AR/torbirdy.dtd       |    4 ++--
 et/torbirdy.dtd          |    4 ++--
 eu/torbirdy.dtd          |    6 +++---
 fa/torbirdy.dtd          |    6 +++---
 fi/torbirdy.dtd          |    6 +++---
 fil/torbirdy.dtd         |    4 ++--
 fo/torbirdy.dtd          |    4 ++--
 fr/torbirdy.dtd          |    8 ++++----
 fur/torbirdy.dtd         |    4 ++--
 fy/torbirdy.dtd          |    4 ++--
 ga/torbirdy.dtd          |    4 ++--
 gl/torbirdy.dtd          |    4 ++--
 gu/torbirdy.dtd          |    6 +++---
 gu_IN/torbirdy.dtd       |    6 +++---
 gun/torbirdy.dtd         |    4 ++--
 ha/torbirdy.dtd          |    4 ++--
 he/torbirdy.dtd          |    8 ++++----
 hi/torbirdy.dtd          |    6 +++---
 hr/torbirdy.dtd          |    6 +++---
 hr_HR/torbirdy.dtd       |    8 ++++----
 ht/torbirdy.dtd          |    4 ++--
 hu/torbirdy.dtd          |    6 +++---
 hy/torbirdy.dtd          |    4 ++--
 ia/torbirdy.dtd          |    4 ++--
 id/torbirdy.dtd          |    6 +++---
 is/torbirdy.dtd          |    4 ++--
 it/torbirdy.dtd          |   18 +++++++++---------
 it/torbirdy.properties   |    2 +-
 ja/torbirdy.dtd          |    8 ++++----
 jv/torbirdy.dtd          |    4 ++--
 ka/torbirdy.dtd          |    4 ++--
 km/torbirdy.dtd          |    4 ++--
 kn/torbirdy.dtd          |    4 ++--
 ko/torbirdy.dtd          |    6 +++---
 ko_KR/torbirdy.dtd       |    4 ++--
 ku/torbirdy.dtd          |    4 ++--
 kw/torbirdy.dtd          |    4 ++--
 ky/torbirdy.dtd          |    4 ++--
 lb/torbirdy.dtd          |    4 ++--
 lg/torbirdy.dtd          |    4 ++--
 ln/torbirdy.dtd          |    4 ++--
 lo/torbirdy.dtd          |    4 ++--
 lt/torbirdy.dtd          |    6 +++---
 lv/torbirdy.dtd          |    8 ++++----
 mg/torbirdy.dtd          |    4 ++--
 mi/torbirdy.dtd          |    4 ++--
 mk/torbirdy.dtd          |    6 +++---
 ml/torbirdy.dtd          |    4 ++--
 mn/torbirdy.dtd          |    4 ++--
 mr/torbirdy.dtd          |    4 ++--
 ms/torbirdy.dtd          |    4 ++--
 ms_MY/torbirdy.dtd       |    4 ++--
 mt/torbirdy.dtd          |    4 ++--
 my/torbirdy.dtd          |    6 +++---
 nah/torbirdy.dtd         |    4 ++--
 nap/torbirdy.dtd         |    4 ++--
 nb/torbirdy.dtd          |    6 +++---
 nds/torbirdy.dtd         |    4 ++--
 ne/torbirdy.dtd          |    4 ++--
 nl/torbirdy.dtd          |    6 +++---
 nn/torbirdy.dtd          |    4 ++--
 nso/torbirdy.dtd         |    4 ++--
 oc/torbirdy.dtd          |    4 ++--
 or/torbirdy.dtd          |    4 ++--
 pa/torbirdy.dtd          |    6 +++---
 pap/torbirdy.dtd         |    4 ++--
 pl/torbirdy.dtd          |    6 +++---
 pl_PL/torbirdy.dtd       |    4 ++--
 pms/torbirdy.dtd         |    4 ++--
 ps/torbirdy.dtd          |    4 ++--
 pt/torbirdy.dtd          |    8 ++++----
 pt_BR/torbirdy.dtd       |    8 ++++----
 ro/torbirdy.dtd          |    6 +++---
 ru/torbirdy.dtd          |    6 +++---
 ru at petr1708/torbirdy.dtd |    4 ++--
 sco/torbirdy.dtd         |    4 ++--
 si/torbirdy.dtd          |    4 ++--
 si_LK/torbirdy.dtd       |    6 +++---
 sk/torbirdy.dtd          |    4 ++--
 sk_SK/torbirdy.dtd       |    6 +++---
 sl/torbirdy.dtd          |    6 +++---
 sl_SI/torbirdy.dtd       |    4 ++--
 sn/torbirdy.dtd          |    4 ++--
 so/torbirdy.dtd          |    4 ++--
 son/torbirdy.dtd         |    4 ++--
 sq/torbirdy.dtd          |    4 ++--
 sr/torbirdy.dtd          |    6 +++---
 sr at latin/torbirdy.dtd    |    4 ++--
 st/torbirdy.dtd          |    4 ++--
 su/torbirdy.dtd          |    4 ++--
 sv/torbirdy.dtd          |    8 ++++----
 sw/torbirdy.dtd          |    4 ++--
 szl/torbirdy.dtd         |    4 ++--
 ta/torbirdy.dtd          |    4 ++--
 te/torbirdy.dtd          |    4 ++--
 te_IN/torbirdy.dtd       |    4 ++--
 templates/torbirdy.dtd   |    8 ++++----
 tg/torbirdy.dtd          |    4 ++--
 th/torbirdy.dtd          |    6 +++---
 ti/torbirdy.dtd          |    4 ++--
 tk/torbirdy.dtd          |    4 ++--
 tr/torbirdy.dtd          |    8 ++++----
 uk/torbirdy.dtd          |    6 +++---
 ur/torbirdy.dtd          |    4 ++--
 ur_PK/torbirdy.dtd       |    4 ++--
 uz/torbirdy.dtd          |    4 ++--
 ve/torbirdy.dtd          |    4 ++--
 vi/torbirdy.dtd          |    6 +++---
 wa/torbirdy.dtd          |    4 ++--
 wo/torbirdy.dtd          |    4 ++--
 zh_CN/torbirdy.dtd       |    8 ++++----
 zh_HK/torbirdy.dtd       |    4 ++--
 zh_TW/torbirdy.dtd       |    8 ++++----
 zu/torbirdy.dtd          |    4 ++--
 142 files changed, 357 insertions(+), 357 deletions(-)

diff --git a/af/torbirdy.dtd b/af/torbirdy.dtd
index 831031e..e2be581 100644
--- a/af/torbirdy.dtd
+++ b/af/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ak/torbirdy.dtd b/ak/torbirdy.dtd
index 831031e..e2be581 100644
--- a/ak/torbirdy.dtd
+++ b/ak/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/am/torbirdy.dtd b/am/torbirdy.dtd
index 831031e..e2be581 100644
--- a/am/torbirdy.dtd
+++ b/am/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ar/torbirdy.dtd b/ar/torbirdy.dtd
index f5e04d7..6fe2acc 100644
--- a/ar/torbirdy.dtd
+++ b/ar/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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 "d">
-<!ENTITY torbirdy.prefs.extra2.button "Ø§ÙØØµ Ø§Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø¨Ø±ÙˆÙƒØ³ÙŠ">
-<!ENTITY torbirdy.prefs.extra2.key "Ø§">
+<!ENTITY torbirdy.prefs.extra2.button "">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "Ø¨Ø±ÙˆÙƒØ³ÙŠ">
 <!ENTITY torbirdy.prefs.privacy.label "Ø®ØµÙˆØµÙŠØ©">
 <!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
diff --git a/arn/torbirdy.dtd b/arn/torbirdy.dtd
index 831031e..e2be581 100644
--- a/arn/torbirdy.dtd
+++ b/arn/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ast/torbirdy.dtd b/ast/torbirdy.dtd
index 831031e..e2be581 100644
--- a/ast/torbirdy.dtd
+++ b/ast/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/az/torbirdy.dtd b/az/torbirdy.dtd
index 66b891e..0b95e35 100644
--- a/az/torbirdy.dtd
+++ b/az/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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 "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "P">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/be/torbirdy.dtd b/be/torbirdy.dtd
index 831031e..e2be581 100644
--- a/be/torbirdy.dtd
+++ b/be/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/bg/torbirdy.dtd b/bg/torbirdy.dtd
index 9950324..fe9a0bc 100644
--- a/bg/torbirdy.dtd
+++ b/bg/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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 "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/bg_BG/torbirdy.dtd b/bg_BG/torbirdy.dtd
index 50d9546..fe510bd 100644
--- a/bg_BG/torbirdy.dtd
+++ b/bg_BG/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/bn/torbirdy.dtd b/bn/torbirdy.dtd
index 831031e..e2be581 100644
--- a/bn/torbirdy.dtd
+++ b/bn/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/bn_IN/torbirdy.dtd b/bn_IN/torbirdy.dtd
index 831031e..e2be581 100644
--- a/bn_IN/torbirdy.dtd
+++ b/bn_IN/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/bo/torbirdy.dtd b/bo/torbirdy.dtd
index 831031e..e2be581 100644
--- a/bo/torbirdy.dtd
+++ b/bo/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/br/torbirdy.dtd b/br/torbirdy.dtd
index 831031e..e2be581 100644
--- a/br/torbirdy.dtd
+++ b/br/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/bs/torbirdy.dtd b/bs/torbirdy.dtd
index d948103..57b3116 100644
--- a/bs/torbirdy.dtd
+++ b/bs/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "SaÄuvaj">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "OtkaÅ¾i">
-<!ENTITY torbirdy.prefs.extra1.button "Vrati poÄetno">
-<!ENTITY torbirdy.prefs.extra1.key "d">
-<!ENTITY torbirdy.prefs.extra2.button "Isprobaj Proxy postavke">
-<!ENTITY torbirdy.prefs.extra2.key "P">
+<!ENTITY torbirdy.prefs.extra2.button "">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ca/torbirdy.dtd b/ca/torbirdy.dtd
index 69e2221..29fe05f 100644
--- a/ca/torbirdy.dtd
+++ b/ca/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Desa">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "CancelÂ·la">
-<!ENTITY torbirdy.prefs.extra1.button "Reestableix predeterminats">
-<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "p">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ca_ES/torbirdy.dtd b/ca_ES/torbirdy.dtd
index 1a7a3f8..b194029 100644
--- a/ca_ES/torbirdy.dtd
+++ b/ca_ES/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Desa">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "CancelÂ·la">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/cs/torbirdy.dtd b/cs/torbirdy.dtd
index 9e6279a..9a4f1db 100644
--- a/cs/torbirdy.dtd
+++ b/cs/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "UloÅ¾it">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "ZruÅ¡it">
-<!ENTITY torbirdy.prefs.extra1.button "PÅ¯vodnÃ nastavenÃ">
-<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "g">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/csb/torbirdy.dtd b/csb/torbirdy.dtd
index 831031e..e2be581 100644
--- a/csb/torbirdy.dtd
+++ b/csb/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/cy/torbirdy.dtd b/cy/torbirdy.dtd
index fdc64bc..d2e7196 100644
--- a/cy/torbirdy.dtd
+++ b/cy/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Cadw">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Canslo">
-<!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.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/da/torbirdy.dtd b/da/torbirdy.dtd
index 3726272..ede9b15 100644
--- a/da/torbirdy.dtd
+++ b/da/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Gem">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Fortryd">
-<!ENTITY torbirdy.prefs.extra1.button "Gendan standardindstillinger">
-<!ENTITY torbirdy.prefs.extra1.key "d">
-<!ENTITY torbirdy.prefs.extra2.button "Test proxyindstillinger">
-<!ENTITY torbirdy.prefs.extra2.key "p">
+<!ENTITY torbirdy.prefs.extra2.button "">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "Proxy">
 <!ENTITY torbirdy.prefs.privacy.label "Privatliv">
 <!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
diff --git a/de/torbirdy.dtd b/de/torbirdy.dtd
index e008bf7..4d8ecdc 100644
--- a/de/torbirdy.dtd
+++ b/de/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Speichern">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Abbrechen">
-<!ENTITY torbirdy.prefs.extra1.button "Voreinstellungen wiederherstellen">
-<!ENTITY torbirdy.prefs.extra1.key "d">
-<!ENTITY torbirdy.prefs.extra2.button "Proxyeinstellungen Testen">
-<!ENTITY torbirdy.prefs.extra2.key "p">
+<!ENTITY torbirdy.prefs.extra2.button "">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "Proxy">
 <!ENTITY torbirdy.prefs.privacy.label "PrivatsphÃ¤re">
 <!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
diff --git a/dz/torbirdy.dtd b/dz/torbirdy.dtd
index 831031e..e2be581 100644
--- a/dz/torbirdy.dtd
+++ b/dz/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/el/torbirdy.dtd b/el/torbirdy.dtd
index b28e867..9fdb72a 100644
--- a/el/torbirdy.dtd
+++ b/el/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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 "d">
-<!ENTITY torbirdy.prefs.extra2.button "ÎˆÎ»ÎµÎ³Ï‡Î¿Ï‚ Î¡Ï…Î¸Î¼Î¯ÏƒÎµÏ‰Î½ Proxy">
-<!ENTITY torbirdy.prefs.extra2.key "g">
+<!ENTITY torbirdy.prefs.extra2.button "">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/el_GR/torbirdy.dtd b/el_GR/torbirdy.dtd
index 50d9546..fe510bd 100644
--- a/el_GR/torbirdy.dtd
+++ b/el_GR/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/en_GB/torbirdy.dtd b/en_GB/torbirdy.dtd
index 50d9546..fe510bd 100644
--- a/en_GB/torbirdy.dtd
+++ b/en_GB/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/eo/torbirdy.dtd b/eo/torbirdy.dtd
index bcb8975..c24b475 100644
--- a/eo/torbirdy.dtd
+++ b/eo/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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 "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "A">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/es/torbirdy.dtd b/es/torbirdy.dtd
index 597184e..b508dc1 100644
--- a/es/torbirdy.dtd
+++ b/es/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Guardar">
 <!ENTITY torbirdy.prefs.save.key "g">
 <!ENTITY torbirdy.prefs.cancel.button "Cancelar">
-<!ENTITY torbirdy.prefs.extra1.button "Restablecer valores predeterminados ">
-<!ENTITY torbirdy.prefs.extra1.key "r">
-<!ENTITY torbirdy.prefs.extra2.button "Probar configuraciÃ³n para proxy">
-<!ENTITY torbirdy.prefs.extra2.key "b">
+<!ENTITY torbirdy.prefs.extra2.button "">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "Proxy">
 <!ENTITY torbirdy.prefs.privacy.label "Privacidad">
 <!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
diff --git a/es_AR/torbirdy.dtd b/es_AR/torbirdy.dtd
index 5072a5d..7e33526 100644
--- a/es_AR/torbirdy.dtd
+++ b/es_AR/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Cancelar">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/et/torbirdy.dtd b/et/torbirdy.dtd
index 3c11d0b..a77c7cc 100644
--- a/et/torbirdy.dtd
+++ b/et/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Katkesta">
-<!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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/eu/torbirdy.dtd b/eu/torbirdy.dtd
index 92c1dd3..917604a 100644
--- a/eu/torbirdy.dtd
+++ b/eu/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Gorde">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Utzi">
-<!ENTITY torbirdy.prefs.extra1.button "Lehenetsiak berrezarri">
-<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "g">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/fa/torbirdy.dtd b/fa/torbirdy.dtd
index abf43f9..35f401d 100644
--- a/fa/torbirdy.dtd
+++ b/fa/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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 "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "g">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/fi/torbirdy.dtd b/fi/torbirdy.dtd
index 99626a3..99aa556 100644
--- a/fi/torbirdy.dtd
+++ b/fi/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Tallenna">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Peruuta">
-<!ENTITY torbirdy.prefs.extra1.button "Palauta Oletukset">
-<!ENTITY torbirdy.prefs.extra1.key "U">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "p">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/fil/torbirdy.dtd b/fil/torbirdy.dtd
index 5772214..6439d64 100644
--- a/fil/torbirdy.dtd
+++ b/fil/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Kanselahin">
-<!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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/fo/torbirdy.dtd b/fo/torbirdy.dtd
index 831031e..e2be581 100644
--- a/fo/torbirdy.dtd
+++ b/fo/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/fr/torbirdy.dtd b/fr/torbirdy.dtd
index d227f7c..4fa03ba 100644
--- a/fr/torbirdy.dtd
+++ b/fr/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Enregistrer">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Annuler">
-<!ENTITY torbirdy.prefs.extra1.button "Restaurer les valeurs par dÃ©faut">
-<!ENTITY torbirdy.prefs.extra1.key "d">
-<!ENTITY torbirdy.prefs.extra2.button "Tester les paramÃ¨tres du proxy">
-<!ENTITY torbirdy.prefs.extra2.key "n">
+<!ENTITY torbirdy.prefs.extra2.button "">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "Proxy">
 <!ENTITY torbirdy.prefs.privacy.label "Vie privÃ©e">
 <!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
diff --git a/fur/torbirdy.dtd b/fur/torbirdy.dtd
index 831031e..e2be581 100644
--- a/fur/torbirdy.dtd
+++ b/fur/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/fy/torbirdy.dtd b/fy/torbirdy.dtd
index 831031e..e2be581 100644
--- a/fy/torbirdy.dtd
+++ b/fy/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ga/torbirdy.dtd b/ga/torbirdy.dtd
index 831031e..e2be581 100644
--- a/ga/torbirdy.dtd
+++ b/ga/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/gl/torbirdy.dtd b/gl/torbirdy.dtd
index 05f395e..03df15b 100644
--- a/gl/torbirdy.dtd
+++ b/gl/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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 "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/gu/torbirdy.dtd b/gu/torbirdy.dtd
index 2bebd00..c1feb1b 100644
--- a/gu/torbirdy.dtd
+++ b/gu/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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 "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "P">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/gu_IN/torbirdy.dtd b/gu_IN/torbirdy.dtd
index f4d5c05..85f8500 100644
--- a/gu_IN/torbirdy.dtd
+++ b/gu_IN/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "n">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/gun/torbirdy.dtd b/gun/torbirdy.dtd
index 831031e..e2be581 100644
--- a/gun/torbirdy.dtd
+++ b/gun/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ha/torbirdy.dtd b/ha/torbirdy.dtd
index 831031e..e2be581 100644
--- a/ha/torbirdy.dtd
+++ b/ha/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/he/torbirdy.dtd b/he/torbirdy.dtd
index be5d9c9..1045df9 100644
--- a/he/torbirdy.dtd
+++ b/he/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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 "d">
-<!ENTITY torbirdy.prefs.extra2.button "×‘×—×Ÿ ×”×’×“×¨×•×ª Proxy">
-<!ENTITY torbirdy.prefs.extra2.key "g">
+<!ENTITY torbirdy.prefs.extra2.button "">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "×¤×¨×•×§×¡×™">
 <!ENTITY torbirdy.prefs.privacy.label "×¤×¨×˜×™×•×ª">
 <!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
diff --git a/hi/torbirdy.dtd b/hi/torbirdy.dtd
index 91d3ea1..568b078 100644
--- a/hi/torbirdy.dtd
+++ b/hi/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "à¤¸à¤‚à¤šà¤¯ à¤•à¤°à¥‡à¤‚ ">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "à¤°à¤¦à¥à¤¦ à¤•à¤°à¥‡à¤‚ ">
-<!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.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/hr/torbirdy.dtd b/hr/torbirdy.dtd
index d63ee76..78d8706 100644
--- a/hr/torbirdy.dtd
+++ b/hr/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/hr_HR/torbirdy.dtd b/hr_HR/torbirdy.dtd
index 3f02fb9..787b6e8 100644
--- a/hr_HR/torbirdy.dtd
+++ b/hr_HR/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Spremi">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Odustani">
-<!ENTITY torbirdy.prefs.extra1.button "Vrati uobiÄajeno">
-<!ENTITY torbirdy.prefs.extra1.key "d">
-<!ENTITY torbirdy.prefs.extra2.button "Isprobaj Proxy postavke">
-<!ENTITY torbirdy.prefs.extra2.key "n">
+<!ENTITY torbirdy.prefs.extra2.button "">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ht/torbirdy.dtd b/ht/torbirdy.dtd
index 831031e..e2be581 100644
--- a/ht/torbirdy.dtd
+++ b/ht/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/hu/torbirdy.dtd b/hu/torbirdy.dtd
index d788980..6de7898 100644
--- a/hu/torbirdy.dtd
+++ b/hu/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "MentÃ©s">
 <!ENTITY torbirdy.prefs.save.key "m">
 <!ENTITY torbirdy.prefs.cancel.button "MÃ©gsem">
-<!ENTITY torbirdy.prefs.extra1.button "AlapÃ©rtÃ©kek visszaÃ¡llÃtÃ¡sa">
-<!ENTITY torbirdy.prefs.extra1.key "a">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "t">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/hy/torbirdy.dtd b/hy/torbirdy.dtd
index 831031e..e2be581 100644
--- a/hy/torbirdy.dtd
+++ b/hy/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ia/torbirdy.dtd b/ia/torbirdy.dtd
index fb2ef1d..7619528 100644
--- a/ia/torbirdy.dtd
+++ b/ia/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Salveguardar">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Cancellar">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/id/torbirdy.dtd b/id/torbirdy.dtd
index 808becb..24ee11d 100644
--- a/id/torbirdy.dtd
+++ b/id/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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 "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "P">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/is/torbirdy.dtd b/is/torbirdy.dtd
index adbc009..9d8da9b 100644
--- a/is/torbirdy.dtd
+++ b/is/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Vista">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "HÃ¦tta viÃ°">
-<!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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/it/torbirdy.dtd b/it/torbirdy.dtd
index 0b994f2..0c1d994 100644
--- a/it/torbirdy.dtd
+++ b/it/torbirdy.dtd
@@ -12,14 +12,14 @@
 <!ENTITY torbirdy.prefs.save.button "Salva">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Annulla">
-<!ENTITY torbirdy.prefs.extra1.button "Ripristina i valori predefiniti">
-<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "g">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Sicurezza">
 <!ENTITY torbirdy.prefs.recommended.text "Utilizza le impostazioni consigliate per TorBirdy(Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "Scegli un servizio per l'anonimato">
@@ -39,13 +39,13 @@
 <!ENTITY torbirdy.prefs.startup_folder.key "l">
 <!ENTITY torbirdy.prefs.timezone.label "Non impostare il fuso orario di Thunderbird a UTC [default: impostato a UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "z">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Non inserire l'ID della chiave del destinatario nei messaggi cifrati [viene inserita di default]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "Conferma prima di inviare l'email se Enigmail Ã¨ attivo [predefinito: non confermare]">
 <!ENTITY torbirdy.prefs.confirmemail.key "c">
 <!ENTITY torbirdy.prefs.emailwizard.label "Attiva il wizard di configurazione automatica email di Thunderbird [default: disabilitato]">
 <!ENTITY torbirdy.prefs.emailwizard.key "w">
-<!ENTITY torbirdy.prefs.automatic.label "">
+<!ENTITY torbirdy.prefs.automatic.label "Controlla automaticamente nuovi messaggi per tutti gli account [disabilitato di default]">
 <!ENTITY torbirdy.prefs.automatic.key "">
 <!ENTITY torbirdy.prefs.renegotiation.label "Permetti connessioni a server che non supportano SSL/TLS con rinegoziazione sicura [predefinito: non permettere]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
diff --git a/it/torbirdy.properties b/it/torbirdy.properties
index 2663eb7..a874521 100644
--- a/it/torbirdy.properties
+++ b/it/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=Attenzione! Non Ã¨ consigliato modificare le impostazion
 torbirdy.email.advanced.nextwarning=Mostra questo avviso la prossima volta
 torbirdy.email.advanced.title=Impostazioni avanzate di Torbirdy
 
-# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+torbirdy.restart=Per applicare le impostazioni del fuso orario devi riavviare Thunderbird.
 
 torbirdy.firstrun=Stai ora usando TorBirdy.\n\nPer aiutarti a proteggere la tua anonimitÃ , TorBirdy bloccherÃ  le impostazioni di Thunderbird che ha cambiato, prevenendo eventuali modifiche da te o da qualsiasi add-on. Ci sono alcune impostazioni che possono essere modificate accessibili tramite la finestra delle preferenze di TorBirdy. Quando TorBirdy viene disinstallato o disabilitato, tutte le impostazioni che ha cambiato vengono reimpostate ai valori predefiniti (i valori precedenti all'installazione di TorBirdy).\n\nSe sei un nuovo utente, Ã¨ consigliato leggere il sito di TorBirdy per capire cosa stiamo tentando di compiere con TorBirdy per i nostri utenti.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/ja/torbirdy.dtd b/ja/torbirdy.dtd
index 0b65600..484730e 100644
--- a/ja/torbirdy.dtd
+++ b/ja/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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 "d">
-<!ENTITY torbirdy.prefs.extra2.button "ãƒ—ãƒã‚ã‚·è¨å®šã‚’ãƒ†ã‚¹ãƒˆã™ã‚‹">
-<!ENTITY torbirdy.prefs.extra2.key "n">
+<!ENTITY torbirdy.prefs.extra2.button "">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/jv/torbirdy.dtd b/jv/torbirdy.dtd
index 831031e..e2be581 100644
--- a/jv/torbirdy.dtd
+++ b/jv/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ka/torbirdy.dtd b/ka/torbirdy.dtd
index 831031e..e2be581 100644
--- a/ka/torbirdy.dtd
+++ b/ka/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/km/torbirdy.dtd b/km/torbirdy.dtd
index 831031e..e2be581 100644
--- a/km/torbirdy.dtd
+++ b/km/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/kn/torbirdy.dtd b/kn/torbirdy.dtd
index 831031e..e2be581 100644
--- a/kn/torbirdy.dtd
+++ b/kn/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ko/torbirdy.dtd b/ko/torbirdy.dtd
index 9935a69..72bdc5b 100644
--- a/ko/torbirdy.dtd
+++ b/ko/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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 "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "g">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ko_KR/torbirdy.dtd b/ko_KR/torbirdy.dtd
index a02a1ef..145081b 100644
--- a/ko_KR/torbirdy.dtd
+++ b/ko_KR/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ku/torbirdy.dtd b/ku/torbirdy.dtd
index 831031e..e2be581 100644
--- a/ku/torbirdy.dtd
+++ b/ku/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/kw/torbirdy.dtd b/kw/torbirdy.dtd
index 831031e..e2be581 100644
--- a/kw/torbirdy.dtd
+++ b/kw/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ky/torbirdy.dtd b/ky/torbirdy.dtd
index f97fa39..7fc8c0c 100644
--- a/ky/torbirdy.dtd
+++ b/ky/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Ð¡Ð°ÐºÑ‚Ð¾Ð¾">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "ÐÐ¹Ð½ÑƒÑƒ">
-<!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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/lb/torbirdy.dtd b/lb/torbirdy.dtd
index 831031e..e2be581 100644
--- a/lb/torbirdy.dtd
+++ b/lb/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/lg/torbirdy.dtd b/lg/torbirdy.dtd
index 1eea511..eff9238 100644
--- a/lg/torbirdy.dtd
+++ b/lg/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ln/torbirdy.dtd b/ln/torbirdy.dtd
index 831031e..e2be581 100644
--- a/ln/torbirdy.dtd
+++ b/ln/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/lo/torbirdy.dtd b/lo/torbirdy.dtd
index 831031e..e2be581 100644
--- a/lo/torbirdy.dtd
+++ b/lo/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/lt/torbirdy.dtd b/lt/torbirdy.dtd
index ab71b17..75b897e 100644
--- a/lt/torbirdy.dtd
+++ b/lt/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Ä®raÅ¡yti">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Atsisakyti">
-<!ENTITY torbirdy.prefs.extra1.button "Atstatyti numatytuosius">
-<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "p">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/lv/torbirdy.dtd b/lv/torbirdy.dtd
index 6c64512..c59c0bc 100644
--- a/lv/torbirdy.dtd
+++ b/lv/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "SaglabÄt">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Atcelt">
-<!ENTITY torbirdy.prefs.extra1.button "Atjaunot noklusÄ“juma vÄ“rtÄ«bas">
-<!ENTITY torbirdy.prefs.extra1.key "d">
-<!ENTITY torbirdy.prefs.extra2.button "PÄrbaudÄ«t starpnieka iestatÄ«jumus">
-<!ENTITY torbirdy.prefs.extra2.key "g">
+<!ENTITY torbirdy.prefs.extra2.button "Atjaunot noklusÄ“juma vÄ“rtÄ«bas">
+<!ENTITY torbirdy.prefs.extra2.key "d">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "Starpnieks">
 <!ENTITY torbirdy.prefs.privacy.label "PrivÄtums">
 <!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
diff --git a/mg/torbirdy.dtd b/mg/torbirdy.dtd
index 831031e..e2be581 100644
--- a/mg/torbirdy.dtd
+++ b/mg/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/mi/torbirdy.dtd b/mi/torbirdy.dtd
index 831031e..e2be581 100644
--- a/mi/torbirdy.dtd
+++ b/mi/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/mk/torbirdy.dtd b/mk/torbirdy.dtd
index 329a601..ab469b0 100644
--- a/mk/torbirdy.dtd
+++ b/mk/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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 "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "P">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ml/torbirdy.dtd b/ml/torbirdy.dtd
index 831031e..e2be581 100644
--- a/ml/torbirdy.dtd
+++ b/ml/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/mn/torbirdy.dtd b/mn/torbirdy.dtd
index 831031e..e2be581 100644
--- a/mn/torbirdy.dtd
+++ b/mn/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/mr/torbirdy.dtd b/mr/torbirdy.dtd
index 831031e..e2be581 100644
--- a/mr/torbirdy.dtd
+++ b/mr/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ms/torbirdy.dtd b/ms/torbirdy.dtd
index 831031e..e2be581 100644
--- a/ms/torbirdy.dtd
+++ b/ms/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ms_MY/torbirdy.dtd b/ms_MY/torbirdy.dtd
index 41cbb50..500b2f1 100644
--- a/ms_MY/torbirdy.dtd
+++ b/ms_MY/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Batal">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/mt/torbirdy.dtd b/mt/torbirdy.dtd
index 831031e..e2be581 100644
--- a/mt/torbirdy.dtd
+++ b/mt/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/my/torbirdy.dtd b/my/torbirdy.dtd
index 0dd6434..538aaba 100644
--- a/my/torbirdy.dtd
+++ b/my/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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 "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "P">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/nah/torbirdy.dtd b/nah/torbirdy.dtd
index 831031e..e2be581 100644
--- a/nah/torbirdy.dtd
+++ b/nah/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/nap/torbirdy.dtd b/nap/torbirdy.dtd
index 831031e..e2be581 100644
--- a/nap/torbirdy.dtd
+++ b/nap/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/nb/torbirdy.dtd b/nb/torbirdy.dtd
index bf47560..0ec6ebe 100644
--- a/nb/torbirdy.dtd
+++ b/nb/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Lagre">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Avbryt">
-<!ENTITY torbirdy.prefs.extra1.button "Tilbakestill til standard">
-<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "n">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/nds/torbirdy.dtd b/nds/torbirdy.dtd
index 50d9546..fe510bd 100644
--- a/nds/torbirdy.dtd
+++ b/nds/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ne/torbirdy.dtd b/ne/torbirdy.dtd
index 831031e..e2be581 100644
--- a/ne/torbirdy.dtd
+++ b/ne/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/nl/torbirdy.dtd b/nl/torbirdy.dtd
index c774a8e..6d69dbd 100644
--- a/nl/torbirdy.dtd
+++ b/nl/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Opslaan">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Annuleren">
-<!ENTITY torbirdy.prefs.extra1.button "Standaardwaarden herstellen">
-<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "g">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/nn/torbirdy.dtd b/nn/torbirdy.dtd
index 831031e..e2be581 100644
--- a/nn/torbirdy.dtd
+++ b/nn/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/nso/torbirdy.dtd b/nso/torbirdy.dtd
index 831031e..e2be581 100644
--- a/nso/torbirdy.dtd
+++ b/nso/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/oc/torbirdy.dtd b/oc/torbirdy.dtd
index 831031e..e2be581 100644
--- a/oc/torbirdy.dtd
+++ b/oc/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/or/torbirdy.dtd b/or/torbirdy.dtd
index 831031e..e2be581 100644
--- a/or/torbirdy.dtd
+++ b/or/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/pa/torbirdy.dtd b/pa/torbirdy.dtd
index fa6f892..cbd0a69 100644
--- a/pa/torbirdy.dtd
+++ b/pa/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "à¨ à©€à¨• à¨¹à©ˆ">
 <!ENTITY torbirdy.prefs.save.key "S">
 <!ENTITY torbirdy.prefs.cancel.button "à¨°à©±à¨¦ à¨•à¨°à©‹">
-<!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.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/pap/torbirdy.dtd b/pap/torbirdy.dtd
index 831031e..e2be581 100644
--- a/pap/torbirdy.dtd
+++ b/pap/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/pl/torbirdy.dtd b/pl/torbirdy.dtd
index 08c0096..c710184 100644
--- a/pl/torbirdy.dtd
+++ b/pl/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Zapisz">
 <!ENTITY torbirdy.prefs.save.key "z">
 <!ENTITY torbirdy.prefs.cancel.button "Anuluj">
-<!ENTITY torbirdy.prefs.extra1.button "PrzywrÃ³Ä‡ ustawienia">
-<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "w">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/pl_PL/torbirdy.dtd b/pl_PL/torbirdy.dtd
index 734e252..a630170 100644
--- a/pl_PL/torbirdy.dtd
+++ b/pl_PL/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Anuluj">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/pms/torbirdy.dtd b/pms/torbirdy.dtd
index 831031e..e2be581 100644
--- a/pms/torbirdy.dtd
+++ b/pms/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ps/torbirdy.dtd b/ps/torbirdy.dtd
index 831031e..e2be581 100644
--- a/ps/torbirdy.dtd
+++ b/ps/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/pt/torbirdy.dtd b/pt/torbirdy.dtd
index 019b1cb..1674a86 100644
--- a/pt/torbirdy.dtd
+++ b/pt/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Guardar">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancelar">
-<!ENTITY torbirdy.prefs.extra1.button "Restaurar ConfiguraÃ§Ãµes por Defeito">
-<!ENTITY torbirdy.prefs.extra1.key "d">
-<!ENTITY torbirdy.prefs.extra2.button "Testar ConfiguraÃ§Ãµes de Proxy">
-<!ENTITY torbirdy.prefs.extra2.key "n">
+<!ENTITY torbirdy.prefs.extra2.button "">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/pt_BR/torbirdy.dtd b/pt_BR/torbirdy.dtd
index db859c1..26b50d6 100644
--- a/pt_BR/torbirdy.dtd
+++ b/pt_BR/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Salvar">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancelar">
-<!ENTITY torbirdy.prefs.extra1.button "Restaurar configuraÃ§Ãµes padrÃ£o">
-<!ENTITY torbirdy.prefs.extra1.key "d">
-<!ENTITY torbirdy.prefs.extra2.button "Testar as ConfiguraÃ§Ãµes do Proxy">
-<!ENTITY torbirdy.prefs.extra2.key "c">
+<!ENTITY torbirdy.prefs.extra2.button "">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ro/torbirdy.dtd b/ro/torbirdy.dtd
index aa8dec6..ea105e7 100644
--- a/ro/torbirdy.dtd
+++ b/ro/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "SalveazÄƒ">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Revocare">
-<!ENTITY torbirdy.prefs.extra1.button "SetÄƒri implicite">
-<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "p">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ru/torbirdy.dtd b/ru/torbirdy.dtd
index 6bb7248..0a568b1 100644
--- a/ru/torbirdy.dtd
+++ b/ru/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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 "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "g">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ru at petr1708/torbirdy.dtd b/ru at petr1708/torbirdy.dtd
index 50d9546..fe510bd 100644
--- a/ru at petr1708/torbirdy.dtd
+++ b/ru at petr1708/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/sco/torbirdy.dtd b/sco/torbirdy.dtd
index 831031e..e2be581 100644
--- a/sco/torbirdy.dtd
+++ b/sco/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/si/torbirdy.dtd b/si/torbirdy.dtd
index 50d9546..fe510bd 100644
--- a/si/torbirdy.dtd
+++ b/si/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/si_LK/torbirdy.dtd b/si_LK/torbirdy.dtd
index e6000d0..6bc2172 100644
--- a/si_LK/torbirdy.dtd
+++ b/si_LK/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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 "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "n">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/sk/torbirdy.dtd b/sk/torbirdy.dtd
index a995567..5b23aab 100644
--- a/sk/torbirdy.dtd
+++ b/sk/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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 "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/sk_SK/torbirdy.dtd b/sk_SK/torbirdy.dtd
index b404306..7e2a893 100644
--- a/sk_SK/torbirdy.dtd
+++ b/sk_SK/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "UloÅ¾iÅ¥">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "ZruÅ¡iÅ¥">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "p">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/sl/torbirdy.dtd b/sl/torbirdy.dtd
index a2e2c7d..16ec9f9 100644
--- a/sl/torbirdy.dtd
+++ b/sl/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Shrani">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Prekini">
-<!ENTITY torbirdy.prefs.extra1.button "Obnovi privzete nastavitve">
-<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "P">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/sl_SI/torbirdy.dtd b/sl_SI/torbirdy.dtd
index 50d9546..fe510bd 100644
--- a/sl_SI/torbirdy.dtd
+++ b/sl_SI/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/sn/torbirdy.dtd b/sn/torbirdy.dtd
index 50d9546..fe510bd 100644
--- a/sn/torbirdy.dtd
+++ b/sn/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/so/torbirdy.dtd b/so/torbirdy.dtd
index 831031e..e2be581 100644
--- a/so/torbirdy.dtd
+++ b/so/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/son/torbirdy.dtd b/son/torbirdy.dtd
index 831031e..e2be581 100644
--- a/son/torbirdy.dtd
+++ b/son/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/sq/torbirdy.dtd b/sq/torbirdy.dtd
index f971656..62c56e5 100644
--- a/sq/torbirdy.dtd
+++ b/sq/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Ruaj">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Anullo">
-<!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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/sr/torbirdy.dtd b/sr/torbirdy.dtd
index e595bc9..0e6d2dc 100644
--- a/sr/torbirdy.dtd
+++ b/sr/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "g">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/sr at latin/torbirdy.dtd b/sr at latin/torbirdy.dtd
index b8c3e19..2e3c6ec 100644
--- a/sr at latin/torbirdy.dtd
+++ b/sr at latin/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "OtkaÅ¾i">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/st/torbirdy.dtd b/st/torbirdy.dtd
index 831031e..e2be581 100644
--- a/st/torbirdy.dtd
+++ b/st/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/su/torbirdy.dtd b/su/torbirdy.dtd
index 831031e..e2be581 100644
--- a/su/torbirdy.dtd
+++ b/su/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/sv/torbirdy.dtd b/sv/torbirdy.dtd
index ff0c7fb..6f16fda 100644
--- a/sv/torbirdy.dtd
+++ b/sv/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Spara">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Avbryt">
-<!ENTITY torbirdy.prefs.extra1.button "Ã…terstÃ¤ll till standard">
-<!ENTITY torbirdy.prefs.extra1.key "d">
-<!ENTITY torbirdy.prefs.extra2.button "Testa proxyinstÃ¤llningar">
-<!ENTITY torbirdy.prefs.extra2.key "n">
+<!ENTITY torbirdy.prefs.extra2.button "">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "Proxy">
 <!ENTITY torbirdy.prefs.privacy.label "Integritet">
 <!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
diff --git a/sw/torbirdy.dtd b/sw/torbirdy.dtd
index 831031e..e2be581 100644
--- a/sw/torbirdy.dtd
+++ b/sw/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/szl/torbirdy.dtd b/szl/torbirdy.dtd
index 50d9546..fe510bd 100644
--- a/szl/torbirdy.dtd
+++ b/szl/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ta/torbirdy.dtd b/ta/torbirdy.dtd
index c5aa5a6..6fe5a4b 100644
--- a/ta/torbirdy.dtd
+++ b/ta/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "à®šà¯‡à®®à®¿">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "à®°à®¤à¯à®¤à¯à®šà¯†à®¯à¯">
-<!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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/te/torbirdy.dtd b/te/torbirdy.dtd
index 831031e..e2be581 100644
--- a/te/torbirdy.dtd
+++ b/te/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/te_IN/torbirdy.dtd b/te_IN/torbirdy.dtd
index 50d9546..fe510bd 100644
--- a/te_IN/torbirdy.dtd
+++ b/te_IN/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/templates/torbirdy.dtd b/templates/torbirdy.dtd
index f1acf7e..de5ecf9 100644
--- a/templates/torbirdy.dtd
+++ b/templates/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "Save">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
-<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults">
-<!ENTITY torbirdy.prefs.extra1.key "d">
-<!ENTITY torbirdy.prefs.extra2.button "Test Proxy Settings">
-<!ENTITY torbirdy.prefs.extra2.key "n">
+<!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra2.key "d">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
 <!ENTITY torbirdy.prefs.proxy.label "Proxy">
 <!ENTITY torbirdy.prefs.privacy.label "Privacy">
 <!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
diff --git a/tg/torbirdy.dtd b/tg/torbirdy.dtd
index 831031e..e2be581 100644
--- a/tg/torbirdy.dtd
+++ b/tg/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/th/torbirdy.dtd b/th/torbirdy.dtd
index 0ae2c3e..c782601 100644
--- a/th/torbirdy.dtd
+++ b/th/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "à¸šà¸±à¸™à¸—à¸¶à¸">
 <!ENTITY torbirdy.prefs.save.key "à¸š">
 <!ENTITY torbirdy.prefs.cancel.button "à¸¢à¸à¹€à¸¥à¸´à¸">
-<!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.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ti/torbirdy.dtd b/ti/torbirdy.dtd
index 831031e..e2be581 100644
--- a/ti/torbirdy.dtd
+++ b/ti/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/tk/torbirdy.dtd b/tk/torbirdy.dtd
index 831031e..e2be581 100644
--- a/tk/torbirdy.dtd
+++ b/tk/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/tr/torbirdy.dtd b/tr/torbirdy.dtd
index 08fa8e6..b18896a 100644
--- a/tr/torbirdy.dtd
+++ b/tr/torbirdy.dtd
@@ -13,10 +13,10 @@
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Ä°ptal
             ">
-<!ENTITY torbirdy.prefs.extra1.button "VarsayÄ±lanÄ± ayarla">
-<!ENTITY torbirdy.prefs.extra1.key "d">
-<!ENTITY torbirdy.prefs.extra2.button "Vekil AyarlarÄ±nÄ± SÄ±na">
-<!ENTITY torbirdy.prefs.extra2.key "n">
+<!ENTITY torbirdy.prefs.extra2.button "">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/uk/torbirdy.dtd b/uk/torbirdy.dtd
index b418d4b..bd1acd0 100644
--- a/uk/torbirdy.dtd
+++ b/uk/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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 "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "p">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ur/torbirdy.dtd b/ur/torbirdy.dtd
index 831031e..e2be581 100644
--- a/ur/torbirdy.dtd
+++ b/ur/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ur_PK/torbirdy.dtd b/ur_PK/torbirdy.dtd
index 4e32703..67510d2 100644
--- a/ur_PK/torbirdy.dtd
+++ b/ur_PK/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/uz/torbirdy.dtd b/uz/torbirdy.dtd
index 50d9546..fe510bd 100644
--- a/uz/torbirdy.dtd
+++ b/uz/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/ve/torbirdy.dtd b/ve/torbirdy.dtd
index 831031e..e2be581 100644
--- a/ve/torbirdy.dtd
+++ b/ve/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/vi/torbirdy.dtd b/vi/torbirdy.dtd
index 64c5604..09368b6 100644
--- a/vi/torbirdy.dtd
+++ b/vi/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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 "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "y">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/wa/torbirdy.dtd b/wa/torbirdy.dtd
index 831031e..e2be581 100644
--- a/wa/torbirdy.dtd
+++ b/wa/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/wo/torbirdy.dtd b/wo/torbirdy.dtd
index 831031e..e2be581 100644
--- a/wo/torbirdy.dtd
+++ b/wo/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/zh_CN/torbirdy.dtd b/zh_CN/torbirdy.dtd
index f73ac12..94e16bc 100644
--- a/zh_CN/torbirdy.dtd
+++ b/zh_CN/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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 "d">
-<!ENTITY torbirdy.prefs.extra2.button "æµ‹è¯•ä»£ç†è®¾ç½®">
-<!ENTITY torbirdy.prefs.extra2.key "g">
+<!ENTITY torbirdy.prefs.extra2.button "">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "ä»£ç†">
 <!ENTITY torbirdy.prefs.privacy.label "éšç§">
 <!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
diff --git a/zh_HK/torbirdy.dtd b/zh_HK/torbirdy.dtd
index 831031e..e2be581 100644
--- a/zh_HK/torbirdy.dtd
+++ b/zh_HK/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/zh_TW/torbirdy.dtd b/zh_TW/torbirdy.dtd
index 4c1eb92..fa80092 100644
--- a/zh_TW/torbirdy.dtd
+++ b/zh_TW/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!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 "d">
-<!ENTITY torbirdy.prefs.extra2.button "æ¸¬è©¦ä¼ºæœå™¨è¨å®š">
-<!ENTITY torbirdy.prefs.extra2.key "n">
+<!ENTITY torbirdy.prefs.extra2.button "">
+<!ENTITY torbirdy.prefs.extra2.key "">
+<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">
diff --git a/zu/torbirdy.dtd b/zu/torbirdy.dtd
index 831031e..e2be581 100644
--- a/zu/torbirdy.dtd
+++ b/zu/torbirdy.dtd
@@ -12,10 +12,10 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.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.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.key "">
 <!ENTITY torbirdy.prefs.proxy.label "">
 <!ENTITY torbirdy.prefs.privacy.label "">
 <!ENTITY torbirdy.prefs.enigmail.label "">

