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

Wed Aug 21 08:48:30 UTC 2013

commit d0c0ead51c2d2d5d33310f9f19bcd1a89dacc23c
Author: Translation commit bot <translation at torproject.org>
Date:   Wed Aug 21 08:48:29 2013 +0000

    Update translations for torbirdy
---
 af/torbirdy.dtd               |    1 -
 af/torbirdy.properties        |   19 +++++++++++++++++++
 ar/torbirdy.dtd               |    7 +++----
 ar/torbirdy.properties        |    2 +-
 ast/torbirdy.dtd              |    1 -
 ast/torbirdy.properties       |   19 +++++++++++++++++++
 az/torbirdy.dtd               |    5 ++---
 az/torbirdy.properties        |   19 +++++++++++++++++++
 bg/torbirdy.dtd               |    3 +--
 bg/torbirdy.properties        |   19 +++++++++++++++++++
 bg_BG/torbirdy.dtd            |    1 -
 bg_BG/torbirdy.properties     |   19 +++++++++++++++++++
 bn_IN/torbirdy.dtd            |    1 -
 bn_IN/torbirdy.properties     |   19 +++++++++++++++++++
 bs/torbirdy.dtd               |    5 ++---
 bs/torbirdy.properties        |   19 +++++++++++++++++++
 ca/torbirdy.dtd               |    7 +++----
 ca/torbirdy.properties        |   19 +++++++++++++++++++
 ca_ES/torbirdy.dtd            |    1 -
 ca_ES/torbirdy.properties     |   19 +++++++++++++++++++
 cs/torbirdy.dtd               |    7 +++----
 cs/torbirdy.properties        |    2 +-
 cy/torbirdy.dtd               |    1 -
 cy/torbirdy.properties        |   19 +++++++++++++++++++
 da/torbirdy.dtd               |    7 +++----
 da/torbirdy.properties        |    2 +-
 de/torbirdy.dtd               |    7 +++----
 de/torbirdy.properties        |    2 +-
 el/torbirdy.dtd               |    7 +++----
 el/torbirdy.properties        |    2 +-
 el_GR/torbirdy.dtd            |    1 -
 el_GR/torbirdy.properties     |   19 +++++++++++++++++++
 en_GB/torbirdy.dtd            |    1 -
 en_GB/torbirdy.properties     |   19 +++++++++++++++++++
 eo/torbirdy.dtd               |    3 +--
 eo/torbirdy.properties        |    2 +-
 es/torbirdy.dtd               |    7 +++----
 es/torbirdy.properties        |    2 +-
 es_AR/torbirdy.dtd            |    1 -
 es_AR/torbirdy.properties     |    2 +-
 et/torbirdy.dtd               |    1 -
 et/torbirdy.properties        |   19 +++++++++++++++++++
 eu/torbirdy.dtd               |    7 +++----
 eu/torbirdy.properties        |    2 +-
 fa/torbirdy.dtd               |    7 +++----
 fa/torbirdy.properties        |    2 +-
 fi/torbirdy.dtd               |    7 +++----
 fi/torbirdy.properties        |    2 +-
 fil/torbirdy.dtd              |    1 -
 fil/torbirdy.properties       |    2 +-
 fr/torbirdy.dtd               |    7 +++----
 fr/torbirdy.properties        |    2 +-
 gl/torbirdy.dtd               |    3 +--
 gl/torbirdy.properties        |    2 +-
 gu/torbirdy.dtd               |    5 ++---
 gu/torbirdy.properties        |   19 +++++++++++++++++++
 gu_IN/torbirdy.dtd            |    3 +--
 gu_IN/torbirdy.properties     |    2 +-
 he/torbirdy.dtd               |    7 +++----
 he/torbirdy.properties        |    2 +-
 hi/torbirdy.dtd               |    3 +--
 hi/torbirdy.properties        |   19 +++++++++++++++++++
 hr/torbirdy.dtd               |    1 -
 hr/torbirdy.properties        |   19 +++++++++++++++++++
 hr_HR/torbirdy.dtd            |    3 +--
 hr_HR/torbirdy.properties     |    2 +-
 hu/torbirdy.dtd               |    7 +++----
 hu/torbirdy.properties        |    2 +-
 ia/torbirdy.dtd               |    1 -
 ia/torbirdy.properties        |   19 +++++++++++++++++++
 id/torbirdy.dtd               |    5 ++---
 id/torbirdy.properties        |    2 +-
 is/torbirdy.dtd               |    1 -
 is/torbirdy.properties        |   19 +++++++++++++++++++
 it/torbirdy.dtd               |    7 +++----
 it/torbirdy.properties        |    2 +-
 ja/torbirdy.dtd               |    7 +++----
 ja/torbirdy.properties        |    2 +-
 ka/torbirdy.dtd               |    1 -
 ka/torbirdy.properties        |    2 +-
 kn/torbirdy.dtd               |    1 -
 kn/torbirdy.properties        |    2 +-
 ko/torbirdy.dtd               |    7 +++----
 ko/torbirdy.properties        |    2 +-
 ko_KR/torbirdy.dtd            |    3 +--
 ko_KR/torbirdy.properties     |   19 +++++++++++++++++++
 ku/torbirdy.dtd               |    1 -
 ku/torbirdy.properties        |    2 +-
 ky/torbirdy.dtd               |    1 -
 ky/torbirdy.properties        |   19 +++++++++++++++++++
 lt/torbirdy.dtd               |    7 +++----
 lt/torbirdy.properties        |   19 +++++++++++++++++++
 lv/torbirdy.dtd               |    7 +++----
 lv/torbirdy.properties        |    2 +-
 mk/torbirdy.dtd               |    5 ++---
 mk/torbirdy.properties        |   19 +++++++++++++++++++
 mr/torbirdy.dtd               |    1 -
 mr/torbirdy.properties        |    2 +-
 ms/torbirdy.dtd               |    1 -
 ms/torbirdy.properties        |   19 +++++++++++++++++++
 ms_MY/torbirdy.dtd            |    1 -
 ms_MY/torbirdy.properties     |   19 +++++++++++++++++++
 my/torbirdy.dtd               |    7 +++----
 my/torbirdy.properties        |   19 +++++++++++++++++++
 nb/torbirdy.dtd               |    7 +++----
 nb/torbirdy.properties        |    2 +-
 nds/torbirdy.dtd              |    1 -
 nds/torbirdy.properties       |   19 +++++++++++++++++++
 nl/torbirdy.dtd               |    7 +++----
 nl/torbirdy.properties        |    2 +-
 pa/torbirdy.dtd               |    3 +--
 pa/torbirdy.properties        |    2 +-
 pl/torbirdy.dtd               |    7 +++----
 pl/torbirdy.properties        |    2 +-
 pl_PL/torbirdy.dtd            |    1 -
 pl_PL/torbirdy.properties     |   19 +++++++++++++++++++
 pt/torbirdy.dtd               |    7 +++----
 pt/torbirdy.properties        |    2 +-
 pt_BR/torbirdy.dtd            |    7 +++----
 pt_BR/torbirdy.properties     |    2 +-
 ro/torbirdy.dtd               |    7 +++----
 ro/torbirdy.properties        |   19 +++++++++++++++++++
 ru/torbirdy.dtd               |    7 +++----
 ru/torbirdy.properties        |    2 +-
 sco/torbirdy.dtd              |    1 -
 sco/torbirdy.properties       |   19 +++++++++++++++++++
 si/torbirdy.dtd               |    1 -
 si/torbirdy.properties        |    2 +-
 si_LK/torbirdy.dtd            |    7 +++----
 si_LK/torbirdy.properties     |    2 +-
 sk/torbirdy.dtd               |    3 +--
 sk/torbirdy.properties        |    2 +-
 sk_SK/torbirdy.dtd            |    5 ++---
 sk_SK/torbirdy.properties     |   19 +++++++++++++++++++
 sl/torbirdy.dtd               |    7 +++----
 sl/torbirdy.properties        |   19 +++++++++++++++++++
 sl_SI/torbirdy.dtd            |    1 -
 sl_SI/torbirdy.properties     |   19 +++++++++++++++++++
 sn/torbirdy.dtd               |    1 -
 sn/torbirdy.properties        |   19 +++++++++++++++++++
 sq/torbirdy.dtd               |    1 -
 sq/torbirdy.properties        |   19 +++++++++++++++++++
 sr/torbirdy.dtd               |    7 +++----
 sr/torbirdy.properties        |    2 +-
 sr at latin/torbirdy.dtd         |    1 -
 sr at latin/torbirdy.properties  |   19 +++++++++++++++++++
 sv/torbirdy.dtd               |    7 +++----
 sv/torbirdy.properties        |    2 +-
 sw/torbirdy.dtd               |    1 -
 sw/torbirdy.properties        |   19 +++++++++++++++++++
 szl/torbirdy.dtd              |    1 -
 szl/torbirdy.properties       |    2 +-
 ta/torbirdy.dtd               |    1 -
 ta/torbirdy.properties        |   19 +++++++++++++++++++
 te_IN/torbirdy.dtd            |    1 -
 te_IN/torbirdy.properties     |    2 +-
 templates/torbirdy.dtd        |    7 +++----
 templates/torbirdy.properties |    2 +-
 th/torbirdy.dtd               |    3 +--
 th/torbirdy.properties        |    2 +-
 tr/torbirdy.dtd               |    7 +++----
 tr/torbirdy.properties        |    2 +-
 uk/torbirdy.dtd               |    7 +++----
 uk/torbirdy.properties        |    2 +-
 ur_PK/torbirdy.dtd            |    3 +--
 ur_PK/torbirdy.properties     |   19 +++++++++++++++++++
 uz/torbirdy.dtd               |    1 -
 uz/torbirdy.properties        |    2 +-
 vi/torbirdy.dtd               |    5 ++---
 vi/torbirdy.properties        |    2 +-
 zh_CN/torbirdy.dtd            |    7 +++----
 zh_CN/torbirdy.properties     |    2 +-
 zh_TW/torbirdy.dtd            |    5 ++---
 zh_TW/torbirdy.properties     |    2 +-
 174 files changed, 900 insertions(+), 265 deletions(-)

diff --git a/af/torbirdy.dtd b/af/torbirdy.dtd
index ed13453..7ce5163 100644
--- a/af/torbirdy.dtd
+++ b/af/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/af/torbirdy.properties b/af/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/af/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/ar/torbirdy.dtd b/ar/torbirdy.dtd
index 9cc2e37..49e9250 100644
--- a/ar/torbirdy.dtd
+++ b/ar/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!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.extra1.button "Ø§Ø³ØªØ±Ø¬Ø¹ Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø§ÙØªØ±Ø§Ø¶ÙŠØ©">
+<!ENTITY torbirdy.prefs.extra1.key "d">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "Ø§">
 <!ENTITY torbirdy.prefs.proxy.label "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø¨Ø±ÙˆÙƒØ³ÙŠ">
 <!ENTITY torbirdy.prefs.privacy.label "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø®ØµÙˆØµÙŠØ©">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "Ø§ÙØªØ ØªÙØ¶ÙŠÙ„Ø§Øª ØªÙˆØ±Ø¨ÙŠØ±Ø¯ÙŠ">
 
 <!ENTITY torbirdy.firstrun.title "ØªÙˆØ±Ø¨ÙŠØ±Ø¯ÙŠ Ø£ÙˆÙ„ ØªØ´ØºÙŠÙ„">
-<!ENTITY torbirdy.troubleshoot.title "Ø¥Ø³ØªÙƒØ´Ø§Ù Ø§Ù„Ø£Ø®Ø·Ø§Ø¡ ÙˆØ¥ØµÙ„Ø§ØÙ‡Ø§">
diff --git a/ar/torbirdy.properties b/ar/torbirdy.properties
index 1204a8c..1c632b8 100644
--- a/ar/torbirdy.properties
+++ b/ar/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=Ø§Ù„Ø±Ø¬Ø§Ø¡ Ø§Ù„Ù…Ù„Ø§ØØ¸Ø© Ø§Ù† ØªØºÙŠØ± Ø§Ù„Ø¥Ø¹Ø¯Ø§
 torbirdy.email.advanced.nextwarning=Ø§Ø¸Ù‡Ø§Ø± Ù‡Ø°Ø§ Ø§Ù„ØªØØ°ÙŠØ± ÙÙŠ Ø§Ù„Ù…Ø±Ø© Ø§Ù„Ù‚Ø§Ø¯Ù…Ø©
 torbirdy.email.advanced.title=Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ù…ØªÙ‚Ø¯Ù…Ø© Ù„ØªÙˆØ±Ø¨ÙŠØ±Ø¯ÙŠ
 
-torbirdy.restart=ØØªÙŠ ÙŠÙÙØ¹Ù„ ØªÙØ¶ÙŠÙ„Ùƒ Ù„Ù„ØªÙˆÙ‚ÙŠØª Ø§Ù„Ø¬Ø¯ÙŠØ¯, Ø±Ø¬Ø§Ø¡Ø§Ù‹ Ø§ØºÙ„Ù‚ Ø«Ù†Ø¯Ø±Ø¨ÙŠØ±Ø¯ Ùˆ Ø£Ø¹Ø¯ ÙØªØÙ‡ Ù…Ù† Ø¬Ø¯ÙŠØ¯.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=Ø§Ù†Øª Ø§Ù„Ø§Ù† ØªØ¹Ù…Ù„ Ø¨ØªÙˆØ±Ø¨ÙŠØ±Ø¯ÙŠ.\n\nÙ„Ù„Ù…Ø³Ø§Ø¹Ø¯Ø© Ø¹Ù„Ù‰ ØÙ…Ø§ÙŠØ© Ù‡ÙˆÙŠØªÙƒ, ØªÙˆØ±Ø¨ÙŠØ±Ø¯ÙŠ Ø³ÙˆÙ ÙŠÙØ±Ø¶ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø«Ø§Ù†Ø¯Ø±Ø¨ÙŠØ±Ø¯ Ø§Ù„ØªÙŠ Ø§Ø¹Ø¯Ù‡Ø§, Ùˆ Ø°Ù„Ùƒ ÙŠØ¤Ø¯ÙŠ Ø¥Ù„ÙŠ Ù…Ù†Ø¹Ùƒ Ø§Ù†Øª Ø§Ùˆ Ø§ÙŠ Ø¨Ø±Ù†Ø§Ù…Ø¬ Ø¥Ø¶Ø§ÙÙŠ Ù…Ù† ØªØºÙŠØ±Ù‡Ø§. ÙˆÙ„ÙƒÙ† ÙŠÙˆØ¬Ø¯ Ø¨Ø¹Ø¶ Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„ØªÙŠ ÙŠÙ…ÙƒÙ† ØªØºÙŠÙŠØ±Ù‡Ø§ Ùˆ ØªØ³ØªØ·ÙŠØ¹ Ø§Ù„ÙˆØµÙˆÙ„ Ù„ØªÙ„Ùƒ Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ù†Ø§ÙØ°Ø© Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ØªÙˆØ±Ø¨ÙŠØ±Ø¯ÙŠ. ÙˆÙÙŠ ØØ§Ù„Ø© Ø¥Ù„ØºØ§Ø¡ Ø§Ùˆ ØªØ¹Ø·ÙŠÙ„ ØªÙˆØ±Ø¨ÙŠØ±Ø¯ÙŠ, Ø³ÙŠØªÙ… Ø§Ø³ØªØ±Ø¬Ø§Ø¹ ÙƒÙ„ Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª (Ø§Ù„ØªÙŠ ÙƒØ§Ù†Øª Ù…ÙˆØ¬ÙˆØ¯Ø© Ù‚Ø¨Ù„ ØªØ«Ø¨ÙŠØª ØªÙˆØ±Ø¨ÙŠØ±Ø¯ÙŠ).\n\nØ¥Ø°Ø§ ÙƒÙ†Øª Ù…Ø³ØªØ®Ø¯Ù… Ø¬Ø¯ÙŠØ¯, ÙÙ…Ù† Ø§Ù„Ù…Ø³ØªØØ³Ù† Ø£Ù† ØªÙ‚Ø±Ø£ Ù…ØØªÙˆÙŠØ§Øª Ù…ÙˆÙ‚Ø¹ ØªÙˆØ±Ø¨ÙŠØ±Ø¯ÙŠ ØØªÙŠ ØªØ³ØªØ·ÙŠØ¹ Ø§Ù† ØªÙÙ‡Ù… Ù…Ø§ Ø§Ù„Ø°ÙŠ Ù†ØØ§ÙˆÙ„ Ø¥Ù†Ø¬Ø§Ø²Ù‡ Ø¨ØªÙˆØ±Ø¨ÙŠØ±Ø¯ÙŠ Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ†Ø§.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/ast/torbirdy.dtd b/ast/torbirdy.dtd
index ed13453..7ce5163 100644
--- a/ast/torbirdy.dtd
+++ b/ast/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/ast/torbirdy.properties b/ast/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/ast/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/az/torbirdy.dtd b/az/torbirdy.dtd
index c3a3ce3..1c8c551 100644
--- a/az/torbirdy.dtd
+++ b/az/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "LÉ™ÄŸv et">
-<!ENTITY torbirdy.prefs.extra1.button "">
+<!ENTITY torbirdy.prefs.extra1.button "VarsayÄ±lanlarÄ± yenidÉ™n yÃ¼klÉ™">
 <!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "Test qurÄŸularÄ±">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "P">
 <!ENTITY torbirdy.prefs.proxy.label "Proksi qurÄŸularÄ±">
 <!ENTITY torbirdy.prefs.privacy.label "">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/az/torbirdy.properties b/az/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/az/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/bg/torbirdy.dtd b/bg/torbirdy.dtd
index f1e50fa..87760be 100644
--- a/bg/torbirdy.dtd
+++ b/bg/torbirdy.dtd
@@ -12,7 +12,7 @@
 <!ENTITY torbirdy.prefs.save.button "Ð—Ð°Ð¿Ð¸ÑˆÐ¸">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "ÐžÑ‚ÐºÐ°Ð·">
-<!ENTITY torbirdy.prefs.extra1.button "">
+<!ENTITY torbirdy.prefs.extra1.button "Ð’ÑŠÐ·ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸ ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ‚Ðµ">
 <!ENTITY torbirdy.prefs.extra1.key "">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/bg/torbirdy.properties b/bg/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/bg/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/bg_BG/torbirdy.dtd b/bg_BG/torbirdy.dtd
index ed13453..7ce5163 100644
--- a/bg_BG/torbirdy.dtd
+++ b/bg_BG/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/bg_BG/torbirdy.properties b/bg_BG/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/bg_BG/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/bn_IN/torbirdy.dtd b/bn_IN/torbirdy.dtd
index ed13453..7ce5163 100644
--- a/bn_IN/torbirdy.dtd
+++ b/bn_IN/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/bn_IN/torbirdy.properties b/bn_IN/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/bn_IN/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/bs/torbirdy.dtd b/bs/torbirdy.dtd
index cd3da8e..30e0713 100644
--- a/bs/torbirdy.dtd
+++ b/bs/torbirdy.dtd
@@ -12,8 +12,8 @@
 <!ENTITY torbirdy.prefs.save.button "SaÄuvaj">
 <!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.extra1.button "Vrati poÄetno">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "P">
 <!ENTITY torbirdy.prefs.proxy.label "Proksi postavke">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/bs/torbirdy.properties b/bs/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/bs/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/ca/torbirdy.dtd b/ca/torbirdy.dtd
index a4d3a98..8fffc91 100644
--- a/ca/torbirdy.dtd
+++ b/ca/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!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 "Test de configuraciÃ³">
+<!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.proxy.label "PreferÃ¨ncies del servidor intermediari">
 <!ENTITY torbirdy.prefs.privacy.label "">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/ca/torbirdy.properties b/ca/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/ca/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/ca_ES/torbirdy.dtd b/ca_ES/torbirdy.dtd
index 66e66b1..63e5a69 100644
--- a/ca_ES/torbirdy.dtd
+++ b/ca_ES/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/ca_ES/torbirdy.properties b/ca_ES/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/ca_ES/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/cs/torbirdy.dtd b/cs/torbirdy.dtd
index 9ee62e4..7dbf97b 100644
--- a/cs/torbirdy.dtd
+++ b/cs/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!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 "">
-<!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "TestovacÃ nastavenÃ">
+<!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.proxy.label "NastavenÃ Proxy">
 <!ENTITY torbirdy.prefs.privacy.label "NastavenÃ soukromÃ½">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "OtevÅ™Ãt TorBirdy preference">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/cs/torbirdy.properties b/cs/torbirdy.properties
index 6c076ad..cc32a5c 100644
--- a/cs/torbirdy.properties
+++ b/cs/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=ProsÃm berte na vÄ›domÃ, Å¾e zmÄ›na pokroÄilÃ½ch nast
 torbirdy.email.advanced.nextwarning=Zobraz toto upozornÄ›nÃ pÅ™ÃÅ¡tÄ›
 torbirdy.email.advanced.title=TorBirdy PokroÄilÃ© nastavenÃ
 
-torbirdy.restart=Aby se projevily zmÄ›ny nastavenÃ ÄasovÃ©ho pÃ¡sma, prosÃm vypnÄ›te a znovu zapnÄ›te Thunderbird.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 # torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
 # torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/cy/torbirdy.dtd b/cy/torbirdy.dtd
index 20f9857..f39a6c0 100644
--- a/cy/torbirdy.dtd
+++ b/cy/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/cy/torbirdy.properties b/cy/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/cy/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/da/torbirdy.dtd b/da/torbirdy.dtd
index 38f27fb..b21f35d 100644
--- a/da/torbirdy.dtd
+++ b/da/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "Gem">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Fortryd">
-<!ENTITY torbirdy.prefs.extra1.button "Fejlfinding">
-<!ENTITY torbirdy.prefs.extra1.key "o">
-<!ENTITY torbirdy.prefs.extra2.button "Test Indstillinger">
+<!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.proxy.label "Proxy-indstillinger">
 <!ENTITY torbirdy.prefs.privacy.label "Privatlivs-indstillinger">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "Ã…bn TorBirdy prÃ¦ferencer">
 
 <!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
-<!ENTITY torbirdy.troubleshoot.title "Fejlfinding">
diff --git a/da/torbirdy.properties b/da/torbirdy.properties
index ddb8805..dec5e87 100644
--- a/da/torbirdy.properties
+++ b/da/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=BemÃ¦rk venligst at Ã¦ndring af de avancerede indstillin
 torbirdy.email.advanced.nextwarning=Vis denne advarsel nÃ¦ste gang
 torbirdy.email.advanced.title=TorBirdy - avancerede indstillinger
 
-torbirdy.restart=For at tidszoneprÃ¦ferencen trÃ¦der i kraft, sÃ¥ luk venligst Thunderbird og start den igen.
+torbirdy.restart=Du skal genstarte Thunderbird fÃ¸r indstillingerne for tidszonen trÃ¦der i effekt.
 
 torbirdy.firstrun=Du kÃ¸rer nu TorBirdy.\n\nFor at beskytte din anonymitet, vil TorBirdy med tvang benytte sine egne Thunderbirdindstillinger, sÃ¥ de forhindres i at blive Ã¦ndret af dig eller eventuelle tilfÃ¸jelser. Der er nogle Ã¦ndringer som kan Ã¦ndres og disse tilgÃ¥s via TorBirdys dialog for prÃ¦ferencer. NÃ¥r TorBirdy afinstalleres eller deaktiveres, bliver alle indstillinger programmet bruger nulstillet til deres standardvÃ¦rdi (vÃ¦rdierne fÃ¸r TorBirdys installation).\n\nHvis du er ny bruger, sÃ¥ anbefales det at du lÃ¦ser TorBirdys hjemmeside for at forstÃ¥ hvad vi forsÃ¸ger at opnÃ¥ med TorBirdy for vores brugere.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/de/torbirdy.dtd b/de/torbirdy.dtd
index 8896198..bb2efa9 100644
--- a/de/torbirdy.dtd
+++ b/de/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "Speichern">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Abbrechen">
-<!ENTITY torbirdy.prefs.extra1.button "Fehlersuche">
-<!ENTITY torbirdy.prefs.extra1.key "o">
-<!ENTITY torbirdy.prefs.extra2.button "Einstellungen prÃ¼fen">
+<!ENTITY torbirdy.prefs.extra1.button "Voreinstellungen wiederherstellen">
+<!ENTITY torbirdy.prefs.extra1.key "d">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "p">
 <!ENTITY torbirdy.prefs.proxy.label "Proxy Einstellungen">
 <!ENTITY torbirdy.prefs.privacy.label "Privacy Einstellungen">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "TorBirdy Einstellungen Ã¶ffnen">
 
 <!ENTITY torbirdy.firstrun.title "TorBirdy's Erster Start">
-<!ENTITY torbirdy.troubleshoot.title "Fehlerbehebung">
diff --git a/de/torbirdy.properties b/de/torbirdy.properties
index 3e6f0aa..04131d8 100644
--- a/de/torbirdy.properties
+++ b/de/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=Es wird NICHT empfohlen, die erweiterten Einstellungen v
 torbirdy.email.advanced.nextwarning=Zeige diese Warnung weiterhin an
 torbirdy.email.advanced.title=TorBirdy Erweiterte Einstellungen
 
-torbirdy.restart=Damit die Ã„nderungen an der Zeitzoneneinstellung wirksam werden, starten Sie bitte Thunderbird neu.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=Sie benutzen jetzt TorBirdy.\n\nUm ihre AnonymitÃ¤t zu schÃ¼tzen, wird TorBirdy die Einstellungen des Thunderbirds, mit einigen Ausnahmen, die bei TorBirdy direkt eingestellt werden, sperren. Also werden weder Sie als Nutzer, noch irgendwelche AddOns in der Lage sein, die Thunderbird Einstellungen zu verÃ¤ndern. Sollte TorBirdy deinstalliert oder deaktiviert werden, dann werden alle Thunderbird Einstellungen auf ihre Standardwerte gesetzt (also die Werte, die vor der Installation eingestellt waren).\n\nSollten Sie ein neuer Benutzen sein, empfehlen wir ihnen die TorBirdy website grÃ¼ndlich zu lesen, damit Sie verstehen kÃ¶nnen, was wir mit TorBirdy fÃ¼r unsere Nutzer erreichen wollen.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/el/torbirdy.dtd b/el/torbirdy.dtd
index 48f84a4..72d8256 100644
--- a/el/torbirdy.dtd
+++ b/el/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!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.extra1.button "Î•Ï€Î±Î½Î±Ï†Î¿ÏÎ¬ Ï€ÏÎ¿ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Ï‰Î½">
+<!ENTITY torbirdy.prefs.extra1.key "d">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "g">
 <!ENTITY torbirdy.prefs.proxy.label "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Proxy">
 <!ENTITY torbirdy.prefs.privacy.label "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î±Ï€Î¿ÏÏÎ®Ï„Î¿Ï…">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "Î‘Î½Î¿Î¹Î³Î¼Î± Ï„Ï‰Î½ TorBirdy ÏÏ…Î¸Î¼Î¹ÏƒÎµÏ‰Î½">
 
 <!ENTITY torbirdy.firstrun.title "TorBirdy Ï€ÏÏ‰Ï„Î· ÎµÎºÎºÎ¹Î½Î·ÏƒÎ·">
-<!ENTITY torbirdy.troubleshoot.title "Î‘Î½Ï„Î¹Î¼ÎµÏ„ÏŽÏ€Î¹ÏƒÎ· Ï€ÏÎ¿Î²Î»Î·Î¼Î¬Ï„Ï‰Î½">
diff --git a/el/torbirdy.properties b/el/torbirdy.properties
index ba183fc..a829d4e 100644
--- a/el/torbirdy.properties
+++ b/el/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÏƒÎ·Î¼ÎµÎ¹ÏŽÏƒÏ„Îµ ÏŒÏ„Î¹ Î±Î»Î»Î¬Î¶Î¿
 torbirdy.email.advanced.nextwarning=Î”ÎµÎ¯Î¾Îµ Î¼Î¿Ï… Î±Ï…Ï„Î® Ï„Î·Î½ ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ· Ï„Î·Î½ ÎµÏ€ÏŒÎ¼ÎµÎ½Î· Ï†Î¿ÏÎ¬ 
 torbirdy.email.advanced.title=TorBirdy: Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î³Î¹Î± Ï€ÏÎ¿Ï‡Ï‰ÏÎ·Î¼ÎÎ½Î¿Ï…Ï‚ 
 
-torbirdy.restart=Î“Î¹Î± Ï„Î·Î½ Ï€ÏÎ¿Ï„Î¯Î¼Î·ÏƒÎ· Î¶ÏŽÎ½Î·Ï‚ ÏŽÏÎ±Ï‚ Î³Î¹Î± Î½Î± Ï„ÎµÎ¸ÎµÎ¯ ÏƒÎµ Î¹ÏƒÏ‡Ï, Ï€Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ ÎºÎ»ÎµÎ¯ÏƒÏ„Îµ Ï„Î¿Î½ Thunderbird ÎºÎ±Î¹ Î±Î½Î¿Î¯Î¾Ï„ÎµÏ„Î¿Î½ Î¾Î±Î½Î¬.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=You are now running TorBirdy.âŽ âŽ To help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).âŽ âŽ If you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/el_GR/torbirdy.dtd b/el_GR/torbirdy.dtd
index ed13453..7ce5163 100644
--- a/el_GR/torbirdy.dtd
+++ b/el_GR/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/el_GR/torbirdy.properties b/el_GR/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/el_GR/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/en_GB/torbirdy.dtd b/en_GB/torbirdy.dtd
index ed13453..7ce5163 100644
--- a/en_GB/torbirdy.dtd
+++ b/en_GB/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/en_GB/torbirdy.properties b/en_GB/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/en_GB/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/eo/torbirdy.dtd b/eo/torbirdy.dtd
index 808a20f..1f48eee 100644
--- a/eo/torbirdy.dtd
+++ b/eo/torbirdy.dtd
@@ -12,7 +12,7 @@
 <!ENTITY torbirdy.prefs.save.button "Konservi">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Rezigni">
-<!ENTITY torbirdy.prefs.extra1.button "">
+<!ENTITY torbirdy.prefs.extra1.button "RestaÅri defaÅltojn">
 <!ENTITY torbirdy.prefs.extra1.key "">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "A">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/eo/torbirdy.properties b/eo/torbirdy.properties
index e0ab005..47c84fd 100644
--- a/eo/torbirdy.properties
+++ b/eo/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.disabled=TorBirdy:    malÅaltita!
 # torbirdy.email.advanced.nextwarning=Show this warning next time
 # torbirdy.email.advanced.title=TorBirdy Advanced Settings
 
-# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 # torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
 # torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/es/torbirdy.dtd b/es/torbirdy.dtd
index 59cce21..fbba5ab 100644
--- a/es/torbirdy.dtd
+++ b/es/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "Guardar">
 <!ENTITY torbirdy.prefs.save.key "g">
 <!ENTITY torbirdy.prefs.cancel.button "Cancelar">
-<!ENTITY torbirdy.prefs.extra1.button "Resolver problema">
-<!ENTITY torbirdy.prefs.extra1.key "o">
-<!ENTITY torbirdy.prefs.extra2.button "Probar la configuraciÃ³n">
+<!ENTITY torbirdy.prefs.extra1.button "Restablecer valores predeterminados ">
+<!ENTITY torbirdy.prefs.extra1.key "v">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "g">
 <!ENTITY torbirdy.prefs.proxy.label "ConfiguraciÃ³n para proxy">
 <!ENTITY torbirdy.prefs.privacy.label "ParÃ¡metros de privacidad">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "Abrir Preferencias de TorBirdy">
 
 <!ENTITY torbirdy.firstrun.title "Primera ejecuciÃ³n de TorBirdy">
-<!ENTITY torbirdy.troubleshoot.title "ResoluciÃ³n de problemas">
diff --git a/es/torbirdy.properties b/es/torbirdy.properties
index e907559..c1349cc 100644
--- a/es/torbirdy.properties
+++ b/es/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=Por favor, observe que NO es recomendable cambiar la con
 torbirdy.email.advanced.nextwarning=Mostrar esta advertencia la prÃ³xima vez
 torbirdy.email.advanced.title=ConfiguraciÃ³n avanzada de TorBirdy
 
-torbirdy.restart=Para que la configuraciÃ³n de zona horaria sea efectiva, cierre Thunderbird e inÃcielo de nuevo.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=EstÃ¡ ejecutando TorBirdy en este momento.\n\nPara proteger su anonimato, TorBirdy implementarÃ¡ las preferencias que ha establecido sobre Thunderbird, evitando que sean cambiadas por usted o por otro complemento (add-on). Hay algunas preferencias que pueden ser cambiadas, y a ellas se accede a travÃ©s del cuadro de preferencias de TorBirdy. Cuando TorBirdy se desinstale o deshabilite, todas las preferencias que este cambia se restablecen a sus valores predeterminados (los valores previos a la instaciÃ³n de TorBirdy).\n\nSi usted es un usuario novel, es recomendable que lea el sitio web de TorBirdy para comprender quÃ© es lo que estamos estamos intentado que TorBirdy consiga para nuestros usuarios.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/es_AR/torbirdy.dtd b/es_AR/torbirdy.dtd
index 8764f95..e959744 100644
--- a/es_AR/torbirdy.dtd
+++ b/es_AR/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/es_AR/torbirdy.properties b/es_AR/torbirdy.properties
index cbdb5b2..b999de2 100644
--- a/es_AR/torbirdy.properties
+++ b/es_AR/torbirdy.properties
@@ -13,7 +13,7 @@
 # torbirdy.email.advanced.nextwarning=Show this warning next time
 # torbirdy.email.advanced.title=TorBirdy Advanced Settings
 
-# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 # torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
 # torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/et/torbirdy.dtd b/et/torbirdy.dtd
index b038b38..fc65ec8 100644
--- a/et/torbirdy.dtd
+++ b/et/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/et/torbirdy.properties b/et/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/et/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/eu/torbirdy.dtd b/eu/torbirdy.dtd
index 803ab5c..2e381d8 100644
--- a/eu/torbirdy.dtd
+++ b/eu/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "Gorde">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Utzi">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "Ezarpenak frogatu">
+<!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.proxy.label "Proxy ezarpenak">
 <!ENTITY torbirdy.prefs.privacy.label "Pribatutasun ezarpenak">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "Ireki TorBirdy hobespenak">
 
 <!ENTITY torbirdy.firstrun.title "TorBirdy lehen-abioa">
-<!ENTITY torbirdy.troubleshoot.title "Arazoen konponketa">
diff --git a/eu/torbirdy.properties b/eu/torbirdy.properties
index adddefb..f16cf97 100644
--- a/eu/torbirdy.properties
+++ b/eu/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=Mesedez jakin ezazu TorBirdyren ezarpen aurreratuak alda
 torbirdy.email.advanced.nextwarning=Abisu hau hurrengo aldian erakutsi
 torbirdy.email.advanced.title=TorBirdy ezarpen aurreratuak
 
-torbirdy.restart=Denbora gunearen hobespena efektua izan dezan, itxi ezazu mesedez Thunderbird eta ireki ezazu berriz.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=Orain TorBirdy erabiltzen ari zara.\n\nZure anonimotasuna babesten laguntzeko, TorBirdyk ezarri dituen Thunderbirden ezarpenak betearaziko ditu, hauek zu edo gehigarriren batez aldatuak izatea eragotziz. Aldatuak izan daitezkeen ezarpen batzuk daude eta hauetara TorBirdyren hobespen elkarrizketa-koadroaren bitartez sar zaitezke. TorBirdy desinstalatzen edo ezgaitzen denean, aldatu dituen ezarpen guztiak euren balio lehenetsietara berrezartzen dira (TorBirdyren instalazioaren aurreko balioetara).\n\nErabiltzaile berria bazara, TorBirdyren webgunean zehar irakurtzea gomendatuta dago gure erabiltzaileentzako TorBirdyrekin lortu nahi duguna ulertzeko.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/fa/torbirdy.dtd b/fa/torbirdy.dtd
index cdf13dd..e332ac9 100644
--- a/fa/torbirdy.dtd
+++ b/fa/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!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.extra1.button "Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù†Ø¯Ù† ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ø¨Ù‡ ØØ§Ù„Øª Ù¾ÛŒØ´â€ŒÙØ±Ø¶">
+<!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 "ØªÙ†Ø¸ÛŒÙ…Ø§Øª ØØ±ÛŒÙ… Ø®ØµÙˆØµÛŒ">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "ØªÙ†Ø¸ÛŒÙ…Ø§Øª ØªÙˆØ±Ø¨ÙØ±Ø¯ÛŒ Ø±Ø§ Ø¨Ø§Ø² Ú©Ù†">
 
 <!ENTITY torbirdy.firstrun.title "Ø§ÙˆÙ„ÛŒÙ† Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ TorBirdy">
-<!ENTITY torbirdy.troubleshoot.title "Ø¹ÛŒØ¨ ÛŒØ§Ø¨ÛŒ">
diff --git a/fa/torbirdy.properties b/fa/torbirdy.properties
index d54a2d7..79dc5d6 100644
--- a/fa/torbirdy.properties
+++ b/fa/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=Ø®ÙˆØ§Ù‡Ø´Ù…Ù†Ø¯ÛŒÙ… Ø¯Ø± Ù†Ø¸Ø± Ø¯Ø§Ø´ØªÙ‡ Ø¨Ø§Ø´ÛŒØ¯ 
 torbirdy.email.advanced.nextwarning=Ø§ÛŒÙ† Ù‡Ø´Ø¯Ø§Ø± Ø±Ø§ Ø¯ÙØ¹Ù‡ Ø¨Ø¹Ø¯ Ù†Ù…Ø§ÛŒØ´ Ø¨Ø¯Ù‡
 torbirdy.email.advanced.title=ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ù¾ÛŒØ´Ø±ÙØªÙ‡ ØªÙˆØ±Ø¨Ø±Ø¯ÛŒ
 
-torbirdy.restart=Ø¨Ø±Ø§ÛŒ Ø§Ø¹Ù…Ø§Ù„ Ø´Ø¯Ù† ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ù…Ù†Ø·Ù‚Ù‡ Ø²Ù…Ø§Ù†ÛŒØŒ Ø®ÙˆØ§Ù‡Ø´Ù…Ù†Ø¯ÛŒÙ… ØªØ§Ù†Ø¯Ø±Ø¨Ø±Ø¯ Ø±Ø§ Ø¨Ø³ØªÙ‡ Ùˆ Ø¯ÙˆØ¨Ø§Ø±Ù‡ Ø§Ø¬Ø±Ø§ Ú©Ù†ÛŒØ¯.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/fi/torbirdy.dtd b/fi/torbirdy.dtd
index e1cb915..5057398 100644
--- a/fi/torbirdy.dtd
+++ b/fi/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "Tallenna">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Peruuta">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "Testaa Asetukset">
+<!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.proxy.label "VÃ¤lityspalvelin Asetukset">
 <!ENTITY torbirdy.prefs.privacy.label "">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "Vianselvitys">
diff --git a/fi/torbirdy.properties b/fi/torbirdy.properties
index cbdb5b2..b999de2 100644
--- a/fi/torbirdy.properties
+++ b/fi/torbirdy.properties
@@ -13,7 +13,7 @@
 # torbirdy.email.advanced.nextwarning=Show this warning next time
 # torbirdy.email.advanced.title=TorBirdy Advanced Settings
 
-# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 # torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
 # torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/fil/torbirdy.dtd b/fil/torbirdy.dtd
index 0f0f05b..07e920a 100644
--- a/fil/torbirdy.dtd
+++ b/fil/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/fil/torbirdy.properties b/fil/torbirdy.properties
index 1db4065..238be3e 100644
--- a/fil/torbirdy.properties
+++ b/fil/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.enabled.custom=TorBirdy Pinaganang: Pasadyang Proxy
 # torbirdy.email.advanced.nextwarning=Show this warning next time
 # torbirdy.email.advanced.title=TorBirdy Advanced Settings
 
-# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 # torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
 # torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/fr/torbirdy.dtd b/fr/torbirdy.dtd
index 71afb1e..dba5e2f 100644
--- a/fr/torbirdy.dtd
+++ b/fr/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "Sauvegarder">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Annuler">
-<!ENTITY torbirdy.prefs.extra1.button "RÃ©gler un problÃ¨me">
-<!ENTITY torbirdy.prefs.extra1.key "o">
-<!ENTITY torbirdy.prefs.extra2.button "Test des paramÃ¨tres">
+<!ENTITY torbirdy.prefs.extra1.button "Restaurer les valeurs par dÃ©faut">
+<!ENTITY torbirdy.prefs.extra1.key "d">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "g">
 <!ENTITY torbirdy.prefs.proxy.label "ParamÃ¨tres proxy">
 <!ENTITY torbirdy.prefs.privacy.label "ParamÃ¨tres de vie privÃ©">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "Ouvrir les prÃ©fÃ©rences de TorBirdy">
 
 <!ENTITY torbirdy.firstrun.title "TorBirdy Premier Lancement">
-<!ENTITY torbirdy.troubleshoot.title "DÃ©pannage">
diff --git a/fr/torbirdy.properties b/fr/torbirdy.properties
index f0136eb..bd02e74 100644
--- a/fr/torbirdy.properties
+++ b/fr/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=Veuiller noter qu'il n'est PAS recommandÃ© de modifier l
 torbirdy.email.advanced.nextwarning=Afficher cet avertissement la prochaine fois
 torbirdy.email.advanced.title=ParamÃ¨tres AvancÃ©s de TorBirdy
 
-torbirdy.restart=Pour appliquer le fuseau horaire, merci de fermer et redÃ©marrer Thunderbird Ã  nouveau.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=TorBirdy est maintenant en cours d'exÃ©cution.\n\nPour vous aider Ã  protÃ©ger votre anonymat, TorBirdy va appliquer les paramÃ¨tres de Thunderbird qu'il a lui-mÃªme configurÃ©, les empÃªchant d'Ãªtre modifiÃ©s par vous-mÃªme ou tout autre module complÃ©mentaire. Il y a certains paramÃ¨tres qui peuvent Ãªtre changÃ©s et ceux-ci sont accessibles par le biais de la boÃ®te de dialogue de TorBirdy. Lorsque TorBirdy est dÃ©sinstallÃ© ou dÃ©sactivÃ©, les paramÃ¨tres qu'il a modifiÃ© sont rÃ©initialisÃ©s Ã  leurs valeurs par dÃ©faut (valeurs avant l'installation de TorBirdy).\n\nSi vous Ãªtes un nouvel utilisateur, il vous est conseillÃ© de lire le site Internet de TorBirdy afin de comprendre ce que nous essayons d'accomplir pour nos utilisateurs.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/gl/torbirdy.dtd b/gl/torbirdy.dtd
index fa0e6dc..bcd8843 100644
--- a/gl/torbirdy.dtd
+++ b/gl/torbirdy.dtd
@@ -12,7 +12,7 @@
 <!ENTITY torbirdy.prefs.save.button "Gardar">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Cancelar">
-<!ENTITY torbirdy.prefs.extra1.button "">
+<!ENTITY torbirdy.prefs.extra1.button "Restabelecer valores predeterminados">
 <!ENTITY torbirdy.prefs.extra1.key "">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "SoluciÃ³n de problemas">
diff --git a/gl/torbirdy.properties b/gl/torbirdy.properties
index 2daedcd..156fa07 100644
--- a/gl/torbirdy.properties
+++ b/gl/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=TeÃ±a en conta que NON Ã© recomendÃ¡bel cambiar os axust
 torbirdy.email.advanced.nextwarning=Amosar este aviso a prÃ³xima vez
 torbirdy.email.advanced.title=Axustes avanzados de TorBirdy
 
-torbirdy.restart=Para que a preferencia do fuso horario teÃ±a efecto, peche o Thunderbird e inÃcieo de novo.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=TorBirdy estÃ¡ en execuciÃ³n neste momento.\n\nPara axudarlle a protexer o seu anonimato, TorBirdy farÃ¡ cumprir os axustes de Thunderbird que foron fixados, evitando que sexan cambiados por vostede ou por calquera outro complemento. Hai algÃºns axustes que poden cambiarse e aos que se accede a travÃ©s do diÃ¡logo de preferencias de TorBirdy. Cando se desinstala ou desactiva TorBirdy, todos os axustes que cambie restablÃ©cense aos seus valores predeterminados (os valores anteriores Ã¡ instalaciÃ³n de TorBirdy).\n\nSe vostede Ã© un usuario novel, recomendÃ¡moslle que lea o sitio web de TorBirdy para comprender que Ã© o que estamos tentado que TorBirdy consiga para os nosos usuarios.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/gu/torbirdy.dtd b/gu/torbirdy.dtd
index 7cbfd12..11e4f0a 100644
--- a/gu/torbirdy.dtd
+++ b/gu/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "àª¸àª‚àª—à«àª°àª¹à«‹">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "àª°àª¦à« àª•àª°à«‹">
-<!ENTITY torbirdy.prefs.extra1.button "">
+<!ENTITY torbirdy.prefs.extra1.button "àª®à«‚àª³àªà«‚àª¤ àªªàª¾àª›à«àª‚ àª²àª¾àªµà«‹">
 <!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "àªšàª•àª¾àª¸àª£à«€ àª—à«‹àª àªµàª£à«€àª“">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "P">
 <!ENTITY torbirdy.prefs.proxy.label "àªªà«àª°à«‹àª•à«àª¸à«€ àª—à«‹àª àªµàª£à«€àª“">
 <!ENTITY torbirdy.prefs.privacy.label "">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/gu/torbirdy.properties b/gu/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/gu/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/gu_IN/torbirdy.dtd b/gu_IN/torbirdy.dtd
index cdf2ca7..b3ea850 100644
--- a/gu_IN/torbirdy.dtd
+++ b/gu_IN/torbirdy.dtd
@@ -14,7 +14,7 @@
 <!ENTITY torbirdy.prefs.cancel.button "àª°àª¦ àª•àª°à«‹">
 <!ENTITY torbirdy.prefs.extra1.button "">
 <!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "àªšàª•àª¾àª¸àª£à«€ àª—à«‹àª àªµàª£à«€àª“">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "n">
 <!ENTITY torbirdy.prefs.proxy.label "àªªà«àª°à«‹àª•à«àª¸à«€ àª—à«‹àª àªµàª£à«€àª“">
 <!ENTITY torbirdy.prefs.privacy.label "àª…àª‚àª—àª¤àª¤àª¾ àª—à«‹àª àªµàª£à«€àª“">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "àªŸà«‹àª°àª¬àª°à«àª¡àª¿ àªªà«àª°àª¾àª¥àª®àª¿àª•àª¤àª¾àª“ àª–à«‹àª²à«‹">
 
 <!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/gu_IN/torbirdy.properties b/gu_IN/torbirdy.properties
index 6cd52c4..be87448 100644
--- a/gu_IN/torbirdy.properties
+++ b/gu_IN/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=àª®àª¹à«‡àª°àª¬àª¾àª¨à«€ àª•àª°à«€ àª§à«àª¯àª¾àª¨àª®àª¾
 torbirdy.email.advanced.nextwarning=àª«àª°à«€ àªªàª¾àª›à«€ àª† àªšà«‡àª¤àªµàª£à«€ àª¬àª¤àª¾àªµà«‹
 torbirdy.email.advanced.title=àªŸà«‹àª°àª¬àª°à«àª¡àª¿ àª‰àªšà«àªš àª—à«‹àª àªµàª£à«€àª“
 
-torbirdy.restart=àª¸àª®àª¯ àªµàª¿àª¸à«àª¤àª¾àª° àªªà«àª°àª¾àª¥àª®àª¿àª•àª¤àª¾àª“àª¨à«‡ àª…àª¸àª°àª®àª¾àª‚ àª²àª¾àªµàªµàª¾ àª®àª¾àªŸà«‡, àª®àª¹à«‡àª°àª¬àª¾àª¨à«€ àª•àª°à«€ àª¥àª¨à«àª¡àª°àª¬àª°à«àª¡ àª¬àª‚àª§ àª•àª°à«€ àª¤à«‡àª¨à«‡ àª«àª°à«€ àª¶àª°à« àª•àª°à«‹.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/he/torbirdy.dtd b/he/torbirdy.dtd
index bdd6369..70394b7 100644
--- a/he/torbirdy.dtd
+++ b/he/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!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.extra1.button "×—×–×¨×” ×œ×‘×¨×™×¨×ª ×ž×—×“×œ">
+<!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 "×”×’×“×¨×•×ª ×¤×¨×˜×™×•×ª">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "×¤×ª×— ×¢×“×™×¤×•×™×•×ª TorBirdy">
 
 <!ENTITY torbirdy.firstrun.title "×”×¤×¢×œ×” ×¨××©×•× ×” ×©×œ TorBirdy">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/he/torbirdy.properties b/he/torbirdy.properties
index 32c94f0..9890a8d 100644
--- a/he/torbirdy.properties
+++ b/he/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=×œ×ª×©×•×ž×ª ×œ×‘×š, ×œ× ×ž×•×ž×œ×¥ ×œ×©× ×•×ª ××ª ×”
 torbirdy.email.advanced.nextwarning=×”×¦×’ ××–×”×¨×” ×–×• ×‘×¤×¢× ×”×‘××”
 torbirdy.email.advanced.title=×”×’×“×¨×•×ª ×ž×ª×§×“×ž×•×ª ×¢×‘×•×¨ TorBirdy
 
-torbirdy.restart=×¢×œ ×ž× ×ª ×©×”×¢×“×¤×•×ª ××™×–×•×¨ ×”×–×ž×Ÿ ×™×‘×•××• ×œ×™×“×™ ×‘×™×˜×•×™, ×× × ×”×¤×¢×œ ×ž×—×“×© ××ª Thunderbird
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=×˜×•×¨×‘×™×¨×“×™ ×ž×•×¤×¢×œ ×›×¢×ª. \\n\\n ×¢×œ ×ž× ×ª ×œ×”×’×Ÿ ×¢×œ ×”×× ×•× ×™×ž×™×•×ª ×©×œ×š, ×˜×•×¨×‘×™×¨×“×™ ×˜×•×¨×‘×™×¨×“×™ ×ª××›×•×£ ××ª ×”×”×’×“×¨×•×ª ×©×§×‘×¢×”, ×¢×œ ×ž× ×ª ×©×œ× ×™×©×•× ×• ×¢×œ ×™×“×™×š ××• ×¢×œ ×™×“×™ ×ª×•×¡×£ ××—×¨. ×™×©× ×Ÿ ×”×’×“×¨×•×ª ×©×‘××¤×©×¨×•×ª×š ×œ×©× ×•×ª ×•×”×Ÿ ×ž×•×¤×™×¢×•×ª ×‘×¢×”×“×¤×•×ª ×©×œ ×˜×•×¨×‘×™×¨×“×™. ×‘×ž×™×“×” ×•×˜×•×¨×‘×™×¨×“×™ ×ª×•×¡×¨ ××• ×ª× ×•×˜×¨×œ, ×”×”×’×“×¨×•×ª ×”× "×œ ×™×©×•× ×• ×—×–×¨×” ×œ×¢×¨×›×™ ×‘×¨×™×¨×ª ×”×ž×—×“×œ ×©×œ×”× (×œ×¤× ×™ ×”×ª×§× ×ª ×˜×•×¨×‘×™×¨×“×™). \\n\\n ×× ×”×™× ×š ×ž×©×ª×ž×© ×—×“×©, ×ž×•×ž×œ×¥ ×©×ª×§×¨× ×‘××ª×¨ ×©×œ ×˜×•×¨×‘×™×¨×“×™ ×•×ª×‘×™×Ÿ ×ž×” ×ž×˜×¨×ª ×”×ª×•×¡×£ ×¢×‘×•×¨ ×”×ž×©×ª×ž×©×™×.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/hi/torbirdy.dtd b/hi/torbirdy.dtd
index 48bbc2e..28e70e9 100644
--- a/hi/torbirdy.dtd
+++ b/hi/torbirdy.dtd
@@ -14,7 +14,7 @@
 <!ENTITY torbirdy.prefs.cancel.button "à¤°à¤¦à¥à¤¦ à¤•à¤°à¥‡à¤‚ ">
 <!ENTITY torbirdy.prefs.extra1.button "">
 <!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "à¤ªà¤°à¥€à¤•à¥à¤·à¤£ à¤•à¥‡ à¤²à¤¿à¤ à¤ªà¤¤à¤¿à¤¸à¥à¤¥à¤¿à¤¤à¤¿à¤¯à¤¾à¤‚">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "P/à¤ª">
 <!ENTITY torbirdy.prefs.proxy.label "à¤ªà¥à¤°à¥‹à¤•à¥à¤¸à¥€ à¤ªà¤¤à¤¿à¤¸à¥à¤¥à¤¿à¤¤à¤¿à¤¯à¤¾à¤‚">
 <!ENTITY torbirdy.prefs.privacy.label "à¤à¤•à¤¾à¤‚à¤¤ à¤•à¥‡ à¤²à¤¿à¤ à¤ªà¤¤à¤¿à¤¸à¥à¤¥à¤¿à¤¤à¤¿à¤¯à¤¾à¤‚">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/hi/torbirdy.properties b/hi/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/hi/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/hr/torbirdy.dtd b/hr/torbirdy.dtd
index 5aa5e76..1f42192 100644
--- a/hr/torbirdy.dtd
+++ b/hr/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/hr/torbirdy.properties b/hr/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/hr/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/hr_HR/torbirdy.dtd b/hr_HR/torbirdy.dtd
index 6d76b11..c47a15c 100644
--- a/hr_HR/torbirdy.dtd
+++ b/hr_HR/torbirdy.dtd
@@ -12,7 +12,7 @@
 <!ENTITY torbirdy.prefs.save.button "Spremi">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Odustani">
-<!ENTITY torbirdy.prefs.extra1.button "">
+<!ENTITY torbirdy.prefs.extra1.button "Vrati uobiÄajeno">
 <!ENTITY torbirdy.prefs.extra1.key "">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/hr_HR/torbirdy.properties b/hr_HR/torbirdy.properties
index ba4d21c..000197c 100644
--- a/hr_HR/torbirdy.properties
+++ b/hr_HR/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=Imajte na umu da mijenjanje naprednih postavki TorPtiÄi
 torbirdy.email.advanced.nextwarning=PokaÅ¾i ovo upozorenje iduÄ‡i put
 torbirdy.email.advanced.title=TorPtiÄica Napredne Postavke
 
-torbirdy.restart=Da bi postavke vremenske zone poÄele raditi, molimo zatvorite Thunderbird i ponovno ga pokrenite.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=Sada koristite TorPtiÄicu.\n\nDa bi zaÅ¡titila vaÅ¡u anonimnost, TorPtiÄica Ä‡e provesti Thunderbird postavke koje je postavila, sprjeÄavajuÄ‡i njihovo mijenjanje od stane vas ili bilo kojeg dodatka. Postoje neke postavke koje se mogu promijeniti, a do njih se dolazi preko TorPtiÄica okvira s postavkama. Kad je TorPtiÄica deinstalirana ili onemoguÄ‡ena, sve postavke koje mijenja budu resetirane na njihove poÄetne vrijednosti(prije nego Å¡to je TorPtiÄica bila instalirana).\n\nAko ste novi korisnik, preporuÄeno je da proÄitati TorPtiÄica web stranicu kako bi razumjeli Å¡to pokuÅ¡avamo postiÄ‡i s TorPtiÄicom za naÅ¡e korisnike.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/hu/torbirdy.dtd b/hu/torbirdy.dtd
index 871ff29..273f845 100644
--- a/hu/torbirdy.dtd
+++ b/hu/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!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 "">
-<!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "BeÃ¡llÃtÃ¡sok tesztelÃ©se">
+<!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.proxy.label "Proxy BeÃ¡llÃtÃ¡sok">
 <!ENTITY torbirdy.prefs.privacy.label "AdatvÃ©delmi BeÃ¡llÃtÃ¡sok">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "TorBirdy BeÃ¡llÃtÃ¡sok megnyitÃ¡sa">
 
 <!ENTITY torbirdy.firstrun.title "TorBirdy ElsÅ‘ futtatÃ¡s">
-<!ENTITY torbirdy.troubleshoot.title "HibaelhÃ¡rÃtÃ¡s">
diff --git a/hu/torbirdy.properties b/hu/torbirdy.properties
index 6afc488..ce44ca9 100644
--- a/hu/torbirdy.properties
+++ b/hu/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=KÃ©rjÃ¼k jegyezze meg, hogy a TorBirdy SpeciÃ¡lis beÃ¡ll
 torbirdy.email.advanced.nextwarning=A figyelmeztetÃ©s mutatÃ¡sa legkÃ¶zelebb is.
 torbirdy.email.advanced.title=TorBirdy SpeciÃ¡lis beÃ¡llÃtÃ¡sok
 
-torbirdy.restart=Az idÅ‘zÃ³na beÃ¡llÃtÃ¡sok Ã©letbe lÃ©pÃ©shez zÃ¡rja be, majd indÃtsa el Ãºjra a Thunderbird-Ã¶t.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=Most futtatja a TorBirdy-t.\n\nAz anonimitÃ¡sÃ¡nak biztosÃtÃ¡sÃ¡hoz a TorBirdy erÅ‘lteti a Thunderbird beÃ¡llÃtÃ¡sokat, amit beÃ¡llÃtott, hogy megÃ³vj azokat attÃ³l, hogy Ã–n vagy egy add-on megvÃ¡ltoztathassa azt. NÃ©hÃ¡ny beÃ¡llÃtÃ¡s vÃ¡ltoztathatÃ³, Ã©s azok elÃ©rhetÅ‘k a TorBirdy beÃ¡llÃtÃ¡sok ablakÃ¡ban. Ha a TorBirdy eltÃ¡volÃtÃ¡sra vagy kikapcsolÃ¡sra kerÃ¼l, minden beÃ¡llÃtÃ¡s, amit Ã¡tÃ¡llÃt, visszaÃ¡ll a  korÃ¡bbi Ã©rtÃ©kekre (az Ã©rtÃ©kekre, amelyek a TorBirdy telepÃtÃ©se elÅ‘tt voltak).\n\nHa Ãºj felhasznÃ¡lÃ³, javasoljuk, hogy olvassa el a TorBirdy weboldalÃ¡t, Ã©s prÃ³bÃ¡lja megÃ©rteni, hogy mit is prÃ³bÃ¡lunk a TorBirdy-vel nyÃºjtani a felhasznÃ¡lÃ³inknak.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/ia/torbirdy.dtd b/ia/torbirdy.dtd
index e71638f..3f7debf 100644
--- a/ia/torbirdy.dtd
+++ b/ia/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/ia/torbirdy.properties b/ia/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/ia/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/id/torbirdy.dtd b/id/torbirdy.dtd
index 7e85443..7235874 100644
--- a/id/torbirdy.dtd
+++ b/id/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "Simpan">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Batal">
-<!ENTITY torbirdy.prefs.extra1.button "">
+<!ENTITY torbirdy.prefs.extra1.button "Kembalikan Default">
 <!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "Uji pengaturan">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "P">
 <!ENTITY torbirdy.prefs.proxy.label "Pengaturan Proxy">
 <!ENTITY torbirdy.prefs.privacy.label "">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/id/torbirdy.properties b/id/torbirdy.properties
index cbdb5b2..b999de2 100644
--- a/id/torbirdy.properties
+++ b/id/torbirdy.properties
@@ -13,7 +13,7 @@
 # torbirdy.email.advanced.nextwarning=Show this warning next time
 # torbirdy.email.advanced.title=TorBirdy Advanced Settings
 
-# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 # torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
 # torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/is/torbirdy.dtd b/is/torbirdy.dtd
index b1ac23c..2963966 100644
--- a/is/torbirdy.dtd
+++ b/is/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/is/torbirdy.properties b/is/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/is/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/it/torbirdy.dtd b/it/torbirdy.dtd
index 1cb5bdd..46c35f5 100644
--- a/it/torbirdy.dtd
+++ b/it/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "Salva">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Annulla">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "Test Impostazioni">
+<!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 "Impostazioni Proxy">
 <!ENTITY torbirdy.prefs.privacy.label "Impostazioni Privacy">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "Apri le preferenze di TorBirdy">
 
 <!ENTITY torbirdy.firstrun.title "Primo Avvio di TorBirdy">
-<!ENTITY torbirdy.troubleshoot.title "Risoluzione dei problemi">
diff --git a/it/torbirdy.properties b/it/torbirdy.properties
index a10ba4e..2663eb7 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=AffinchÃ© le preferenze sul fuso orario abbiano effetto devi chiudere Thunderbird e riavviarlo.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 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 bf13c22..0800f0e 100644
--- a/ja/torbirdy.dtd
+++ b/ja/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!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 "o">
-<!ENTITY torbirdy.prefs.extra2.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.proxy.label "ãƒ—ãƒã‚¯ã‚·è¨å®š">
 <!ENTITY torbirdy.prefs.privacy.label "ãƒ—ãƒ©ã‚¤ãƒã‚·ãƒ¼è¨å®š">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "TorBirdyã®è¨å®šã‚’é–‹ã">
 
 <!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
-<!ENTITY torbirdy.troubleshoot.title "å•é¡Œã®è§£æ±º">
diff --git a/ja/torbirdy.properties b/ja/torbirdy.properties
index 478e0ca..53ce4fc 100644
--- a/ja/torbirdy.properties
+++ b/ja/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=TorBirdyã®é«˜åº¦ãªè¨å®šã‚’å¤‰æ›´ã™ã‚‹ã“ã¨ã¯æŽ¨å¥¨
 torbirdy.email.advanced.nextwarning=æ¬¡å›žã‚‚ã“ã®è¦å‘Šã‚’è¡¨ç¤º
 torbirdy.email.advanced.title=TorBirdyã®é«˜åº¦ãªè¨å®š
 
-torbirdy.restart=åŠ¹æžœçš„ãªã‚¿ã‚¤ãƒ ã‚¾ãƒ¼ãƒ³ã®è¨å®šã®ãŸã‚ã«ã€Thunderbirdã‚’é–‰ã˜ã¦ã€ã‚‚ã†ä¸€åº¦é–‹ãç›´ã—ã¦ãã ã•ã„ã€‚
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=ç¾åœ¨TorBirdyèµ·å‹•ä¸ã§ã™ã€‚\n\nåŒ¿åæ€§ã®ä¿è·ã‚’åŠ©ã‘ã‚‹ãŸã‚ã«ã€TorBirdyã¯è¨å®šã—ãŸThunderbirdã®è¨å®šã‚’å¼·åˆ¶ã—ã€ã‚ãªãŸã‹ã€ã©ã‚“ãªã‚¢ãƒ‰ã‚ªãƒ³ã«ã‚ˆã£ã¦ã‚‚ãã‚Œã‚‰ãŒå¤‰æ›´ã•ã‚Œãªã„ã‚ˆã†ã«ã—ã¾ã™ã€‚ å¤‰æ›´ã§ãã‚‹è¨å®šã‚‚ã‚ã‚Šã€ã“ã‚Œã‚‰ã¯TorBirdyã®åˆæœŸè¨å®šãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’é€šã—ã‚¢ã‚¯ã‚»ã‚¹ã•ã‚Œã¾ã™ã€‚ TorBirdyãŒã‚¢ãƒ³ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚ŒãŸã‹ã€ç„¡åŠ¹ã«ãªã£ãŸæ™‚ã€å¤‰æ›´ã—ãŸã™ã¹ã¦ã®è¨å®šãŒãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®å€¤ (TorBirdyã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã®å‰ã®å€¤)ã«ãƒªã‚»ãƒƒãƒˆã•ã‚Œã¾ã™ã€‚\n\nã‚ãªãŸãŒæ–°ã—ã„ãƒ¦ãƒ¼ã‚¶ãƒ¼ã§ã‚ã‚‹å ´åˆã€ç§é”ãŒTorBirdyã§ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®ãŸã‚ã«æˆã—é‚ã’ã‚ˆã†ã¨ã—ã¦ã„ã‚‹ã“ã¨ã‚’ç†è§£ã—ã¦ã„ãŸã ããŸã‚ã«ã€TorBirdyã®ã‚¦ã‚§ãƒ–ã‚µã‚¤ãƒˆã‚’ä¸€èªã™ã‚‹ã“ã¨ãŒæŽ¨å¥¨ã•ã‚Œã¾ã™ã€‚
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/ka/torbirdy.dtd b/ka/torbirdy.dtd
index ed13453..7ce5163 100644
--- a/ka/torbirdy.dtd
+++ b/ka/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/ka/torbirdy.properties b/ka/torbirdy.properties
index cbdb5b2..b999de2 100644
--- a/ka/torbirdy.properties
+++ b/ka/torbirdy.properties
@@ -13,7 +13,7 @@
 # torbirdy.email.advanced.nextwarning=Show this warning next time
 # torbirdy.email.advanced.title=TorBirdy Advanced Settings
 
-# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 # torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
 # torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/kn/torbirdy.dtd b/kn/torbirdy.dtd
index ed13453..7ce5163 100644
--- a/kn/torbirdy.dtd
+++ b/kn/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/kn/torbirdy.properties b/kn/torbirdy.properties
index 714da70..dd4d8db 100644
--- a/kn/torbirdy.properties
+++ b/kn/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=à²—à²®à²¨à²¿à²¸à²¿: à²Ÿà²¾à²°à³ à²¬à²°à³à²¡à²¿à²¯ à²¸
 torbirdy.email.advanced.nextwarning=à²®à³à²‚à²¦à²¿à²¨ à²¸à²² à²ˆ à²Žà²šà³à²šà²°à²¿à²•à³†à²¯à²¨à³à²¨ à²®à²¤à³à²¤à³† à²¤à³‹à²°à²¿à²¸à²¿.
 torbirdy.email.advanced.title=à²Ÿà²¾à²°à³ à²¬à²°à³à²¡à²¿à²¯ à²¸à³‚à²•à³à²¶à³à²® à²œà³‹à²¡à²£à³†à²—à²³à³.
 
-torbirdy.restart=à²¸à²®à²¯ à²µà²²à²¯à²¦ à²à²°à³à²ªà²¾à²¡à³ à²¸à²¨à³à²¨à²¦à³à²§à²µà²¾à²—à²²à³, à²¥à²‚à²¡à²°à³â€Œà²¬à²°à³à²¡à³ à²…à²¨à³à²¨à³ à²’à²®à³à²®à³† à²®à³à²šà³à²šà²¿ à²¨à²‚à²¤à²° à²¶à³à²°à³ à²®à²¾à²¡à²¿à²°à²¿.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=à²¨à³€à²µà³€à²— à²Ÿà²¾à²°à³ à²¬à²°à³à²¡à²¿à²¯à²¨à³à²¨ à²“à²¡à²¿à²¸à³à²¤à²¾ à²‡à²¦à³à²¦à³€à²°à²¿.\n\nà²¨à²¿à²®à³à²® à²—à³Œà²ªà³à²¯à²¤à³† à²•à²¾à²ªà²¾à²¡à²²à³, à²Ÿà²¾à²°à³ à²¬à²°à³à²¡à²¿à²¯à³ à²¥à²‚à²¡à²°à³ à²¬à²°à³à²¡à³à²¨ à²œà³‹à²¡à²£à³†à²—à²²à²¨à³à²¨ \n\nà²¨à³€à²µà³ à²¹à³Šà²¸ à²¬à²³à²•à³†à²¦à²¾à²°à²°à³‹? à²¹à²¾à²—à²¿à²¦à³à²°à³† à²Ÿà²¾à²°à³ à²¬à²°à³à²¡à²¿à²¯ à²µà³†à²¬à³â€Œà²¸à³ˆà²Ÿà³â€Œà²¨à²²à³à²²à²¿à²°à³‹ à²…à²‚à²¶à²—à²³à³à²¨ à²“à²¦à²¿-à²…à²°à²¿à²¤ à²¨à²‚à²¤à²° à²¨à²¾à²µà³ à²Ÿà²¾à²°à³ à²¬à²°à³à²¡à²¿ à²¬à²³à²•à³†à²¦à²¾à²°à²°à²¿à²—à³† à²¨à³€à²¡à³à²µ à²¸à³Œà²²à²à³à²¯à²—à²³ à²¬à²—à³à²—à³† à²¤à²¿à²³à²•à³Šà²³à³à²³à²¿.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/ko/torbirdy.dtd b/ko/torbirdy.dtd
index 289d90e..84f12db 100644
--- a/ko/torbirdy.dtd
+++ b/ko/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!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.extra1.button "ì„¤ì • ì´ˆê¸°í™”">
+<!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 "ê°œì¸ ì •ë³´ ì„¤ì •">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "Torbirdy ê°œì¸ ì„¤ì • ì—´ê¸°">
 
 <!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
-<!ENTITY torbirdy.troubleshoot.title "ë¬¸ì œ í•´ê²° - ë¬¸ì œê°€ ìžˆìœ¼ì‹ ê°€ìš”?">
diff --git a/ko/torbirdy.properties b/ko/torbirdy.properties
index 42118af..7118e10 100644
--- a/ko/torbirdy.properties
+++ b/ko/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=TorBirdyì˜ ê³ ê¸‰ ì„¤ì •ì„ ë°”ê¾¸ëŠ” ê²ƒì€ ì¶”ì²œë˜
 torbirdy.email.advanced.nextwarning=ë‹¤ìŒë²ˆì— ê²½ê³  ë³´ì—¬ì£¼ê¸°
 torbirdy.email.advanced.title=TorBirdy ê³ ê¸‰ ì„¤ì •
 
-torbirdy.restart=ì‹œê°„ëŒ€ ì„¤ì •ì´ íš¨ê³¼ë¥¼ ë°œíœ˜í•˜ë ¤ë©´ ì¬ë”ë²„ë“œë¥¼ ìž¬ì‹œìž‘í•˜ì‹ì‹œì˜¤.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=ê·€í•˜ëŠ” ì§€ê¸ˆ TorBirdyë¥¼ ì‚¬ìš©ì¤‘ìž…ë‹ˆë‹¤. \n\nê·€í•˜ì˜ ìµëª…ì„±ì„ ë•ê¸° ìœ„í•´ì„œ TorBirdyëŠ”, ê·€í•˜ë‚˜ ë‹¤ë¥¸ í”ŒëŸ¬ê·¸ì¸ì— ì˜í•´ ì„¤ì •ì´ ë°”ë€ŒëŠ” ê²ƒì„ ë§‰ê¸° ìœ„í•´ ì¬ë”ë²„ë“œì˜ ì„¤ì •ì„ ì´ë¯¸ ì„¤ì •ëœ ê²ƒìœ¼ë¡œ ê³ ì •í•  ê²ƒìž…ë‹ˆë‹¤.  TorBirdyë¥¼ í†µí•´ ì ‘ê·¼í•  ìˆ˜ ìžˆê³  ë°”ë€” ìˆ˜ ìžˆëŠ” ëª‡ëª‡ ì„¤ì •ì´ ìžˆìŠµë‹ˆë‹¤.  TorBirdyê°€ ì‚ì œë˜ê±°ë‚˜ ë¹„í™œì„±í™”ë ë•Œ, ë°”ë€ ëª¨ë“  ì„¤ì •ì€ ê¸°ë³¸ê°’ìœ¼ë¡œ ìž¬ì„¤ì •ë  ê²ƒìž…ë‹ˆë‹¤ (TorBirdyì˜ ê¸°ë³¸ê°’ì„ ìš°ì„ í•¨).\n\në§Œì•½ ìƒˆë¡œìš´ ì‚¬ìš©ìžì´ì‹œë¼ë©´,  ìš°ë¦¬ê°€ ìš°ë¦¬ì˜ ì‚¬ìš©ìžë¥¼ ìœ„í•´ ì´ë£¨ì–´ë‚´ê¸° ìœ„í•´ ì‹œë„í•˜ê³  ìžˆëŠ” ê²ƒì„ ì´í•´í•˜ê¸° ìœ„í•´ì„œ, TorBirdy ì›¹ì‚¬ì´íŠ¸ë¥¼ ì½ëŠ” ê²ƒì„ ì¶”ì²œí•©ë‹ˆë‹¤.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/ko_KR/torbirdy.dtd b/ko_KR/torbirdy.dtd
index 66b7530..16bad6c 100644
--- a/ko_KR/torbirdy.dtd
+++ b/ko_KR/torbirdy.dtd
@@ -12,7 +12,7 @@
 <!ENTITY torbirdy.prefs.save.button "ì €ìž¥">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "ì·¨ì†Œ">
-<!ENTITY torbirdy.prefs.extra1.button "">
+<!ENTITY torbirdy.prefs.extra1.button "ê¸°ë³¸ê°’ìœ¼ë¡œ ëŒë¦¼">
 <!ENTITY torbirdy.prefs.extra1.key "">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/ko_KR/torbirdy.properties b/ko_KR/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/ko_KR/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/ku/torbirdy.dtd b/ku/torbirdy.dtd
index ed13453..7ce5163 100644
--- a/ku/torbirdy.dtd
+++ b/ku/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/ku/torbirdy.properties b/ku/torbirdy.properties
index cbdb5b2..b999de2 100644
--- a/ku/torbirdy.properties
+++ b/ku/torbirdy.properties
@@ -13,7 +13,7 @@
 # torbirdy.email.advanced.nextwarning=Show this warning next time
 # torbirdy.email.advanced.title=TorBirdy Advanced Settings
 
-# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 # torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
 # torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/ky/torbirdy.dtd b/ky/torbirdy.dtd
index 4518205..0acbeee 100644
--- a/ky/torbirdy.dtd
+++ b/ky/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/ky/torbirdy.properties b/ky/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/ky/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/lt/torbirdy.dtd b/lt/torbirdy.dtd
index 696b5ea..285f755 100644
--- a/lt/torbirdy.dtd
+++ b/lt/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "Ä®raÅ¡yti">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Atsisakyti">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "Patikrinti nustatymus">
+<!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.proxy.label "Proxy nustatymai">
 <!ENTITY torbirdy.prefs.privacy.label "">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/lt/torbirdy.properties b/lt/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/lt/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/lv/torbirdy.dtd b/lv/torbirdy.dtd
index 34ffe55..f8dd8ed 100644
--- a/lv/torbirdy.dtd
+++ b/lv/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "SaglabÄt">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Atcelt">
-<!ENTITY torbirdy.prefs.extra1.button "NovÄ“rst problÄ“mas">
-<!ENTITY torbirdy.prefs.extra1.key "o">
-<!ENTITY torbirdy.prefs.extra2.button "Testa iestatÄ«jumi">
+<!ENTITY torbirdy.prefs.extra1.button "Atjaunot noklusÄ“juma vÄ“rtÄ«bas">
+<!ENTITY torbirdy.prefs.extra1.key "d">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "g">
 <!ENTITY torbirdy.prefs.proxy.label "Starpniekdatora iestatÄ«jumi">
 <!ENTITY torbirdy.prefs.privacy.label "PrivÄtuma iestatÄ«jumi">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "AtvÄ“rt TorBirdy preferences">
 
 <!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
-<!ENTITY torbirdy.troubleshoot.title "ProblÄ“mu novÄ“rÅ¡ana">
diff --git a/lv/torbirdy.properties b/lv/torbirdy.properties
index 2ec6345..eb57d7e 100644
--- a/lv/torbirdy.properties
+++ b/lv/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=LÅ«dzu Å†emt vÄ“rÄ, ka TorBirdy lietpratÄ«go iestatÄ«ju
 torbirdy.email.advanced.nextwarning=NÄkamreiz rÄdÄ«t Å¡o brÄ«dinÄjumu
 torbirdy.email.advanced.title=TorBirdy LietpratÄ«gie iestatÄ«jumi
 
-torbirdy.restart=LÅ«dzu aizveriet Thunderbird'u un startÄ“jiet to vÄ“lreiz, lai laika zonu preferences stÄtos spÄ“kÄ.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=Tagad JÅ«s izpildÄt TorBirdy.\n\nLai palÄ«dzÄ“tu aizsargÄt JÅ«su anonimitÄti, TorBirdy ieviesÄ«s noteiktos Thunderbird iestatÄ«jumus, novÄ“rÅ¡ot to maiÅ†u no JÅ«su vai pievienojumu puses. Ir atseviÅ¡Ä·i mainÄmi iestatÄ«jumi. Pie tiem var piekÄ¼Å«t no TorBirdy preferenÄu dialogekrÄna. Kad TorBirdy ir atinstalÄ“ts vai atspÄ“jots, tad visi tÄ mainÄmie iestatÄ«jumi tiek atiestatÄ«ti uz savÄm noklusÄ“jumvÄ“rtÄ«bÄm (vÄ“rtÄ«bÄm pirms TorBirdy instalÄcijas).\n\nJa esat jauns, tad iesakÄm iepazÄ«ties ar TorBirdy tÄ«mekÄ¼a vietnÄ“ ievietotajiem materiÄliem, lai saprastu, kÄdus risinÄjumus mÄ“s tiecamies sniegt mÅ«su lietotÄjiem ar TorBirdy.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/mk/torbirdy.dtd b/mk/torbirdy.dtd
index 96da1d0..110a6e7 100644
--- a/mk/torbirdy.dtd
+++ b/mk/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "ÐžÑ‚ÐºÐ°Ð¶Ð¸ ÑÐµ">
-<!ENTITY torbirdy.prefs.extra1.button "">
+<!ENTITY torbirdy.prefs.extra1.button "Ð¡Ñ‚Ð°Ð½Ð´Ð°Ñ€Ð´Ð½Ð¸ Ð¿Ð¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐ°">
 <!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "Ð¢ÐµÑÑ‚Ð¸Ñ€Ð°Ñ˜ Ð³Ð¸ Ð¿Ð¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐ°Ñ‚Ð°">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "P">
 <!ENTITY torbirdy.prefs.proxy.label "ÐŸÐ¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐ° Ð½Ð° Ð¿Ñ€Ð¾ÐºÑÐ¸">
 <!ENTITY torbirdy.prefs.privacy.label "">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/mk/torbirdy.properties b/mk/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/mk/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/mr/torbirdy.dtd b/mr/torbirdy.dtd
index ed13453..7ce5163 100644
--- a/mr/torbirdy.dtd
+++ b/mr/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/mr/torbirdy.properties b/mr/torbirdy.properties
index cbdb5b2..b999de2 100644
--- a/mr/torbirdy.properties
+++ b/mr/torbirdy.properties
@@ -13,7 +13,7 @@
 # torbirdy.email.advanced.nextwarning=Show this warning next time
 # torbirdy.email.advanced.title=TorBirdy Advanced Settings
 
-# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 # torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
 # torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/ms/torbirdy.dtd b/ms/torbirdy.dtd
index ed13453..7ce5163 100644
--- a/ms/torbirdy.dtd
+++ b/ms/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/ms/torbirdy.properties b/ms/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/ms/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/ms_MY/torbirdy.dtd b/ms_MY/torbirdy.dtd
index eb0e875..3c428e3 100644
--- a/ms_MY/torbirdy.dtd
+++ b/ms_MY/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/ms_MY/torbirdy.properties b/ms_MY/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/ms_MY/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/my/torbirdy.dtd b/my/torbirdy.dtd
index 96d8c6d..0bb8c9a 100644
--- a/my/torbirdy.dtd
+++ b/my/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!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.extra1.button " á€™á€°á€œá€¡á€á€á€¯á€„á€ºá€¸ á€•á€¼á€”á€ºá€‘á€¬á€¸á€›á€”á€º">
+<!ENTITY torbirdy.prefs.extra1.key "d">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "P">
 <!ENTITY torbirdy.prefs.proxy.label "á€•á€›á€±á€¬á€€á€ºá€‡á€® á€á€»á€á€”á€ºá€Šá€¾á€á€á€»á€€á€ºá€™á€»á€¬á€¸">
 <!ENTITY torbirdy.prefs.privacy.label "">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "á€¡á€€á€°á€¡á€Šá€®">
diff --git a/my/torbirdy.properties b/my/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/my/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/nb/torbirdy.dtd b/nb/torbirdy.dtd
index c95cde3..9755046 100644
--- a/nb/torbirdy.dtd
+++ b/nb/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "Lagre">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Avbryt">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "Test innstillinger">
+<!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.proxy.label "Proxy innstillinger">
 <!ENTITY torbirdy.prefs.privacy.label "Personvern Innstillinger">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "Ã…pne TorBirdy Innstillinger">
 
 <!ENTITY torbirdy.firstrun.title "FÃ¸rstegangskjÃ¸ring av TorBirdy">
-<!ENTITY torbirdy.troubleshoot.title "FeilsÃ¸king">
diff --git a/nb/torbirdy.properties b/nb/torbirdy.properties
index 357867a..369f3ae 100644
--- a/nb/torbirdy.properties
+++ b/nb/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=VÃ¦r oppmerksom pÃ¥ at Ã¥ endre TorBirdys avanserte inns
 torbirdy.email.advanced.nextwarning=Vis denne advarselen neste gang
 torbirdy.email.advanced.title=TorBirdy Avanserte Innstillinger
 
-torbirdy.restart=For at tidssoneinnstillingene skal tre i kraft, vennligst restart Thunderbird.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=Du kjÃ¸rer TorBirdy nÃ¥.\n\nFor Ã¥ beskytte anonymiteten din vil TorBirdy hÃ¥ndheve innstillingene det har satt i Thunderbird, dette for Ã¥ forhinde at de blir endret av deg eller andre tillegg. Det er noen innstillinger du kan endre og disse er tilgjengelige via en egen dialogboks i TorBirdy. NÃ¥r TorBirdy er avinstallert eller deaktivert, vil alle innstillingene som er gjort tilbakestilles til standardverdiene (fra fÃ¸r du installerte TorBirdy).\n\nHvis du er en ny bruker, er det anbefalt at du leser gjennom TorBirdys nettside for Ã¥ forstÃ¥ hva det er vi prÃ¸ver Ã¥ oppnÃ¥ med TorBirdy for brukerne vÃ¥re.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/nds/torbirdy.dtd b/nds/torbirdy.dtd
index ed13453..7ce5163 100644
--- a/nds/torbirdy.dtd
+++ b/nds/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/nds/torbirdy.properties b/nds/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/nds/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/nl/torbirdy.dtd b/nl/torbirdy.dtd
index 49ba9c6..e8cc85c 100644
--- a/nl/torbirdy.dtd
+++ b/nl/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "Opslaan">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Annuleren">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "Configuratie controleren">
+<!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.proxy.label "Proxy configuratie">
 <!ENTITY torbirdy.prefs.privacy.label "Privacy configuratie">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "Open TorBirdy voorkeuren">
 
 <!ENTITY torbirdy.firstrun.title "Eerste gebruik van TorBirdy">
-<!ENTITY torbirdy.troubleshoot.title "Probleem oplossen">
diff --git a/nl/torbirdy.properties b/nl/torbirdy.properties
index 4de8119..6bfae36 100644
--- a/nl/torbirdy.properties
+++ b/nl/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=Hou er rekening mee dat het aanpassen van de geavanceerd
 torbirdy.email.advanced.nextwarning=Toon deze waarschuwing ook in de toekomst
 torbirdy.email.advanced.title=TorBirdy geavanceerde instellingen
 
-torbirdy.restart=Om de tijdzone aanpassing door te voeren, sluit Thunderbird en start het opnieuw.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=Je gebruikt nu TorBirdy.\n\nOm je anonimiteit te beschermen zal TorBirdy de Thunderbird instellingen die het heeft ingesteld vastzetten. Dit voorkomt aanpassingen door jou of add-ons. Er zijn sommige instellingen die aangepast kunnen worden; deze zijn beschikbaar in TorBirdy's voorkeurenvenster. Wanneer TorBirdy gedeÃ¯nstalleerd wordt, worden alle instellingen die aangepast zijn weer teruggezet naar hun standaard waardes (de waardes die gebruikt werden voor de installatie van TorBirdy)\n\nAls je een nieuwe gebruiker bent, raden we aan om de TorBirdy website te lezen om te begrijpen wat we proberen te bereiken met TorBirdy voor onze gebruikers.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/pa/torbirdy.dtd b/pa/torbirdy.dtd
index dec2be1..bf06c6e 100644
--- a/pa/torbirdy.dtd
+++ b/pa/torbirdy.dtd
@@ -14,7 +14,7 @@
 <!ENTITY torbirdy.prefs.cancel.button "à¨°à©±à¨¦ à¨•à¨°à©‹">
 <!ENTITY torbirdy.prefs.extra1.button "">
 <!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "à¨Ÿà©‡à¨¸à¨Ÿ à¨¸à©ˆà¨Ÿà¨¿à©°à¨—">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "g">
 <!ENTITY torbirdy.prefs.proxy.label "à¨ªà¨°à¨¾à¨•à¨¸à©€ à¨¸à©ˆà¨Ÿà¨¿à©°à¨—">
 <!ENTITY torbirdy.prefs.privacy.label "à¨ªà¨°à¨¾à¨ˆà¨µà©‡à¨¸à©€ à¨¸à©ˆà¨Ÿà¨¿à©°à¨—">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "à¨Ÿà©Œà¨°à¨¬à¨°à¨¡à©€ à¨¸à©ˆà¨Ÿà¨¿à©°à¨—">
 
 <!ENTITY torbirdy.firstrun.title "à¨Ÿà©Œà¨°à¨¬à¨°à¨¡à©€ à¨ªà¨¹à¨¿à¨²à©€ à¨µà¨¾à¨°">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/pa/torbirdy.properties b/pa/torbirdy.properties
index bf3a7e4..4423cb5 100644
--- a/pa/torbirdy.properties
+++ b/pa/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=à¨§à¨¿à¨†à¨¨ à¨¨à¨¾à¨²! à¨Ÿà©Œà¨°à¨¬à¨°à¨¡à©€ à¨¦à©€ à¨¤
 torbirdy.email.advanced.nextwarning=à¨‡à¨¹ à¨šà©‡à¨¤à¨¾à¨µà¨¨à©€ à¨«à©‡à¨° à¨µà¨¿à¨–à¨¾à¨“
 torbirdy.email.advanced.title=à¨Ÿà©Œà¨°à¨¬à¨°à¨¡à©€ à¨¤à¨•à¨¨à©€à¨•à©€ à¨¸à©ˆà¨Ÿà¨¿à©°à¨—
 
-torbirdy.restart=à¨Ÿà¨¾à¨‡à¨® à¨œà¨¼à©‹à¨¨ à¨¸à©ˆà¨Ÿà¨¿à©°à¨— à¨¨à©‚à©° à¨ªà©‚à¨°à¨¾ à¨•à¨°à¨¨ à¨µà¨¾à¨¸à¨¤à©‡ à¨¥à©°à¨¡à¨°à¨¬à¨°à¨¡ à¨¨à©‚à©° à¨°à©€à¨¸à¨Ÿà¨¾à¨°à¨Ÿ à¨•à¨°à©‹
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=à¨¤à©à¨¸à©€à¨‚ à¨Ÿà©Œà¨°à¨¬à¨°à¨¡à©€ à¨šà¨²à¨¾ à¨°à¨¹à©‡ à¨¹à©‹à¥¤\n\nà¨¤à©à¨¹à¨¾à¨¨à©‚à©° à¨—à©à¨ªà¨¤ à¨°à¨–à¨£ à¨µà¨¾à¨¸à¨¤à©‡ à¨Ÿà©Œà¨°à¨¬à¨°à¨¡à©€ à¨¨à©‡ à¨¥à©°à¨¡à¨°à¨¬à¨°à¨¡ à¨¦à©€ à¨ªà¨°à¨¿à¨¸à¨¥à¨¿à¨¤à©€à¨†à¨‚ à¨¦à©€ à¨¬à¨¦à¨²à©€ à¨•à©€à¨¤à©€ à¨¹à©ˆà¥¤ à¨¤à©à¨¸à©€à¨‚ à¨†à¨¹ à¨ªà¨°à¨¿à¨¸à¨¥à¨¿à¨¤à©€à¨†à¨‚ à¨¨à©‚à©° à¨¬à¨¦à¨² à¨¨à¨¹à©€à¨‚ à¨¸à¨•à¨¦à©‡ à¥¤\n\nà¨œà©‡ à¨¤à©à¨¸à©€à¨‚ à¨ªà¨¹à¨¿à¨²à©€ à¨µà¨¾à¨° à¨Ÿà©Œà¨°à¨¬à¨°à¨¡à©€ à¨¦à©€ à¨µà¨°à¨¤à©‹à¨‚ à¨•à¨° à¨°à¨¹à©‡ à¨¹à©‹ à¨¤à¨¾à¨‚ à¨•à¨¿à¨°à¨ªà¨¾ à¨•à¨° à¨•à©‡ à¨Ÿà©Œà¨°à¨¬à¨°à¨¡à©€ à¨¦à©€ à¨µà©‡à¨¬ à¨¸à¨¾à¨‡à¨Ÿ à¨ªà©œà©à¨¹à©‹ à¨œà©€à¥¤
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/pl/torbirdy.dtd b/pl/torbirdy.dtd
index c46befa..c48c9b7 100644
--- a/pl/torbirdy.dtd
+++ b/pl/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "Zapisz">
 <!ENTITY torbirdy.prefs.save.key "z">
 <!ENTITY torbirdy.prefs.cancel.button "Anuluj">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "SprawdÅº ustawienia">
+<!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.proxy.label "Ustawienia Proxy">
 <!ENTITY torbirdy.prefs.privacy.label "Ustawienia PrywatnoÅ›ci">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "OtwÃ³rz Preferencje TorBirdy">
 
 <!ENTITY torbirdy.firstrun.title "Pierwsze uruchomienie TorBirdy">
-<!ENTITY torbirdy.troubleshoot.title "RozwiÄ…zywanie problemÃ³w">
diff --git a/pl/torbirdy.properties b/pl/torbirdy.properties
index c6372f7..9a5918d 100644
--- a/pl/torbirdy.properties
+++ b/pl/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=Zmiana ustawieÅ„ zaawansowanych TorBirdy NIE jest zaleca
 torbirdy.email.advanced.nextwarning=PokaÅ¼ to ostrzeÅ¼enie nastÄ™pnym razem
 torbirdy.email.advanced.title=Zaawansowane Ustawienia TorBirdy
 
-torbirdy.restart=Aby ustawienie strefy czasowej odniosÅ‚o skutek, proszÄ™ zamknÄ…Ä‡ Thunderbirda i ponownie go uruchomiÄ‡.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=TorBirdy jest teraz uruchomiony\n\nAby chroniÄ‡ TwojÄ… anonimowoÅ›Ä‡, TorBirdy bÄ™dzie pilnowaÅ‚ ustawionych przez siebie ustawieÅ„ Thunderbirda, zapobiegajÄ…c ich zmianie przez Ciebie lub inne dodatki. MoÅ¼na zmieniÄ‡ niektÃ³re ustawienia, do ktÃ³rych jest dostÄ™p z okna ustawieÅ„ TorBirdy. Gdy TorBirdy jest odinstalowany lub wyÅ‚Ä…czony, wszystkie zmienione przez niego ustawienia sÄ… resetowane do wartoÅ›ci domyÅ›lnych (sprzed instalacji TorBirdy).\n\nJeÅ›li jesteÅ› nowym uÅ¼ytkownikiem, zalecane jest przeczytanie strony internetowej TorBirdy, aby zrozumieÄ‡, co chcemy osiÄ…gnÄ…Ä‡ z TorBirdy dla naszych uÅ¼ytkownikÃ³w.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/pl_PL/torbirdy.dtd b/pl_PL/torbirdy.dtd
index 681b997..371bf3a 100644
--- a/pl_PL/torbirdy.dtd
+++ b/pl_PL/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/pl_PL/torbirdy.properties b/pl_PL/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/pl_PL/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/pt/torbirdy.dtd b/pt/torbirdy.dtd
index 55842b1..855f524 100644
--- a/pt/torbirdy.dtd
+++ b/pt/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "Guardar">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancelar">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "Testar configuraÃ§Ãµes">
+<!ENTITY torbirdy.prefs.extra1.button "Restaurar definiÃ§Ãµes originais">
+<!ENTITY torbirdy.prefs.extra1.key "d">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "P">
 <!ENTITY torbirdy.prefs.proxy.label "ConfiguraÃ§Ãµes do Proxy">
 <!ENTITY torbirdy.prefs.privacy.label "DefiniÃ§Ãµes de Privacidade">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "Abrir as PreferÃªncias TorBirdy">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/pt/torbirdy.properties b/pt/torbirdy.properties
index 4e64e52..efb340b 100644
--- a/pt/torbirdy.properties
+++ b/pt/torbirdy.properties
@@ -13,7 +13,7 @@
 torbirdy.email.advanced.nextwarning=Mostrar este aviso na prÃ³xima vez
 # torbirdy.email.advanced.title=TorBirdy Advanced Settings
 
-# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 # torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
 # torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/pt_BR/torbirdy.dtd b/pt_BR/torbirdy.dtd
index 9da1437..f8ced04 100644
--- a/pt_BR/torbirdy.dtd
+++ b/pt_BR/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "Salvar">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancelar">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "Testar ConfiguraÃ§Ãµes">
+<!ENTITY torbirdy.prefs.extra1.button "Restaurar configuraÃ§Ãµes padrÃ£o">
+<!ENTITY torbirdy.prefs.extra1.key "d">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "c">
 <!ENTITY torbirdy.prefs.proxy.label "ConfiguraÃ§Ãµes de Proxy">
 <!ENTITY torbirdy.prefs.privacy.label "ConfiguraÃ§Ãµes de Privacidade">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "Abrir PreferÃªncias do TorBirdy">
 
 <!ENTITY torbirdy.firstrun.title "Primeira execuÃ§Ã£o do TorBirdy">
-<!ENTITY torbirdy.troubleshoot.title "SoluÃ§Ã£o de Problemas">
diff --git a/pt_BR/torbirdy.properties b/pt_BR/torbirdy.properties
index 1886e92..e28cd13 100644
--- a/pt_BR/torbirdy.properties
+++ b/pt_BR/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=Por favor, tenha em mente que mudar as configuraÃ§Ãµes a
 torbirdy.email.advanced.nextwarning=Mostrar esse aviso no futuro
 torbirdy.email.advanced.title=ConfiguraÃ§Ãµes AvanÃ§adas do TorBirdy
 
-torbirdy.restart=Para que as configuraÃ§Ãµes de fuso horÃ¡rio tenham efeito, por favor reinicie o Thunderbird.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=VocÃª agora estÃ¡ executando o TorBirdy.\n\nPara melhorar a sua anonimidade o TorBirdy irÃ¡ forÃ§ar as configuraÃ§Ãµes do Thunderbird que ele criou, prevenindo que ela seja modificada por vocÃª ou por um acessÃ³rio.  HÃ¡ algumas configuraÃ§Ãµes que podem ser modificadas atravÃ©s das preferÃªncias do TorBirdy.  Quando o TorBirdy for removido ou desativado, todas suas configuraÃ§Ãµes sÃ£o restauradas a seus valores padrÃµes (os valores anteriores ao TorBirdy ser instalado)\n\nSe vocÃª for um novo usuÃ¡rio, recomenda-se que leia a pÃ¡gina do TorBirdy para entender o que estamos almejando para nossos usuÃ¡rios com o TorBirdy.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/ro/torbirdy.dtd b/ro/torbirdy.dtd
index 395226e..c35d7ca 100644
--- a/ro/torbirdy.dtd
+++ b/ro/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "SalveazÄƒ">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Revocare">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "SetÄƒrile pentru testÄƒri">
+<!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.proxy.label "SetÄƒri proxy">
 <!ENTITY torbirdy.prefs.privacy.label "">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/ro/torbirdy.properties b/ro/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/ro/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/ru/torbirdy.dtd b/ru/torbirdy.dtd
index 21954fc..4e4895c 100644
--- a/ru/torbirdy.dtd
+++ b/ru/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!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.extra1.button "Ð’Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ñ‹Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸">
+<!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 "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚Ð¸">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ TorBirdy">
 
 <!ENTITY torbirdy.firstrun.title "ÐŸÐµÑ€Ð²Ñ‹Ð¹ Ð·Ð°Ð¿ÑƒÑÐº TorBirdy">
-<!ENTITY torbirdy.troubleshoot.title "Ð£ÑÑ‚Ñ€Ð°Ð½ÐµÐ½Ð¸Ðµ Ð½ÐµÐ¿Ð¾Ð»Ð°Ð´Ð¾Ðº">
diff --git a/ru/torbirdy.properties b/ru/torbirdy.properties
index 7348197..8f3552c 100644
--- a/ru/torbirdy.properties
+++ b/ru/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¾Ð±Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ,
 torbirdy.email.advanced.nextwarning=ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ ÑÑ‚Ð¾ Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð² ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ð¹ Ñ€Ð°Ð·
 torbirdy.email.advanced.title=TorBirdy Ñ€Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ‹Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸
 
-torbirdy.restart=Ð”Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ Ð·Ð¾Ð½Ñ‹ Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ close Ð¸ Ð·Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚Ðµ ÐµÑ‰Ñ‘ Ñ€Ð°Ð·.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=Ð’Ñ‹ Ð·Ð°Ð¿ÑƒÑÑ‚Ð¸Ð»Ð¸ TorBirdy.\nÐ§Ñ‚Ð¾ Ð±Ñ‹ Ð¿Ð¾Ð¼Ð¾Ñ‡ÑŒ Ð·Ð°Ñ‰Ð¸Ñ‚Ð¸Ñ‚ÑŒ Ð²Ð°ÑˆÑƒ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾ÑÑ‚ÑŒ, TorBirdy Ð±ÑƒÐ´ÐµÑ‚ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Thunderbird, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¾Ð½ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ð», Ð¿Ñ€ÐµÐ´Ð¾Ñ‚Ð²Ñ€Ð°Ñ‰Ð°Ñ Ð¸Ñ… Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð’Ð°Ð¼Ð¸ Ð¸Ð»Ð¸ Ð»ÑŽÐ±Ñ‹Ð¼ Ð´Ð¾Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸ÐµÐ¼. Ð•ÑÑ‚ÑŒ Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐº, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¼Ð¾Ð³ÑƒÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ñ‹ Ð¸ Ð¾Ð½Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹ Ð² Ð¾ÐºÐ½Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐº TorBirdy. Ð’ ÑÐ»ÑƒÑ‡Ð°Ðµ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ TorBirdy, Ð²ÑÐµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¾Ð½ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð» ÑÐ±Ñ€Ð¾ÑÑÑ‚ÑÑ Ðº ÑÐ²Ð¾Ð¸Ð¼ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸ÑÐ¼ Ð¿Ð¾-ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ (Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸ÑÐ¼ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð±Ñ‹Ð»Ð¸ Ð´Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ TorBirdy).\nÐ•ÑÐ»Ð¸ Ð’Ñ‹ Ð½Ð¾Ð²Ñ‹Ð¹ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ, Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼ Ð’Ð°Ð¼ Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼Ð¸Ñ‚ÑŒÑÑ Ñ ÑÐ°Ð¹Ñ‚Ð¾Ð¼ TorBirdy Ñ‡Ñ‚Ð¾ Ð±Ñ‹ Ð¿Ð¾Ð½ÑÑ‚ÑŒ Ñ‡Ñ‚Ð¾ Ð¼Ñ‹ Ð¿Ñ‹Ñ‚Ð°ÐµÐ¼ÑÑ
  ÑÐ´ÐµÐ»Ð°Ñ‚ÑŒ Ð¿Ð¾ÑÑ€ÐµÐ´ÑÑ‚Ð²Ð¾Ð¼ TorBirdy Ð´Ð»Ñ Ð½Ð°ÑˆÐ¸Ñ… Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/sco/torbirdy.dtd b/sco/torbirdy.dtd
index ed13453..7ce5163 100644
--- a/sco/torbirdy.dtd
+++ b/sco/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/sco/torbirdy.properties b/sco/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/sco/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/si/torbirdy.dtd b/si/torbirdy.dtd
index ed13453..7ce5163 100644
--- a/si/torbirdy.dtd
+++ b/si/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/si/torbirdy.properties b/si/torbirdy.properties
index cbdb5b2..b999de2 100644
--- a/si/torbirdy.properties
+++ b/si/torbirdy.properties
@@ -13,7 +13,7 @@
 # torbirdy.email.advanced.nextwarning=Show this warning next time
 # torbirdy.email.advanced.title=TorBirdy Advanced Settings
 
-# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 # torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
 # torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/si_LK/torbirdy.dtd b/si_LK/torbirdy.dtd
index 162c555..b2bd53f 100644
--- a/si_LK/torbirdy.dtd
+++ b/si_LK/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!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.extra1.button "à¶´à·™à¶»à¶±à·’à¶¸à·’ à¶¯à·š à¶´à·Šâ€à¶»à¶à·’à·ƒà·Šà¶®à·à¶´à¶±à¶º à¶šà¶»à¶±à·Šà¶± ">
+<!ENTITY torbirdy.prefs.extra1.key "d">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "n">
 <!ENTITY torbirdy.prefs.proxy.label "à·ƒà·šà·€à·à¶¯à·à¶ºà¶š à·ƒà·à¶šà·ƒà·”à¶¸à·Š">
 <!ENTITY torbirdy.prefs.privacy.label "à¶´à·žà¶¯à·Šà¶œà¶½à·’à¶š à·ƒà·’à¶§à·€à·”à¶¸à·Š ">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "TorBirdy à¶¸à¶±à·à¶´à¶ºà¶±à·Š à·€à·’à·€à·˜à¶ à¶šà¶»à¶±à·Šà¶± ">
 
 <!ENTITY torbirdy.firstrun.title "TorBirdy à¶´à·…à¶¸à·”-à¶¯à·’à¶œà·„à·à¶»à·”à¶¸">
-<!ENTITY torbirdy.troubleshoot.title "à¶¯à·œà·ƒà·Š à·ƒà·™à·€à·“à¶¸">
diff --git a/si_LK/torbirdy.properties b/si_LK/torbirdy.properties
index c462c3e..a0a37cb 100644
--- a/si_LK/torbirdy.properties
+++ b/si_LK/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=TorBirdy à¶à·”à¶½ à¶‹à·ƒà·ƒà·Š à·ƒà·’à¶§à·”à·€à¶¸à·Š 
 torbirdy.email.advanced.nextwarning=à¶¸à·™à¶¸ à¶…à·€à·€à·à¶¯à¶º à¶Šà¶½à¶œ à·€à¶à·à·€à·šà¶¯à·“ à¶±à·à·€à¶ à¶´à·™à¶±à·Šà·€à¶±à·Šà¶±.
 torbirdy.email.advanced.title=TorBirdy à¶‹à·ƒà·ƒà·Š à·ƒà·’à¶§à·”à·€à¶¸à·Š
 
-torbirdy.restart=à·€à·šà¶½à· à¶šà¶½à·à¶´ à¶…à¶·à·’à¶»à·”à¶ à·’à¶º à¶šà·Šâ€à¶»à·’à¶ºà·à¶à·Šà¶¸à¶š à¶šà·’à¶»à·“à¶¸à¶§ à¶šà¶»à·”à¶«à·à¶šà¶» Thunderbird à·€à·ƒà· à¶¯à¶¸à· à¶±à·à·€à¶ à¶´à¶§à¶±à·Š à¶œà¶±à·Šà¶±.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=à¶”à¶¶ à¶¯à·à¶±à·Š TorBirdy à¶šà·Šâ€à¶»à·’à¶ºà·à¶à·Šà¶¸à¶š à¶šà¶» à¶‡à¶. \n\nà¶”à¶¶à·š à¶±à·’à¶»à·Šà¶±à·à¶¸à·’à¶šà¶·à·à·€à¶º à¶†à¶»à¶šà·Šà·‚à· à¶šà·’à¶»à·“à¶¸à¶§ TorBirdy à¶¸à¶œà·’à¶±à·Š Thunderbird à·„à·’ à·ƒà·Šà¶®à·à·€à¶» à·ƒà·’à¶§à·€à·”à¶¸à·Š à¶¶à¶½à¶œà¶±à·Šà·€à¶ºà·’. à¶‘à¶¸à¶œà·’à¶±à·Š à¶”à¶¶à¶§ à·„à· à¶•à¶±à·‘à¶¸ à¶ˆà¶¯à·”à¶¸à¶šà·Š à·„à¶§ à¶‘à·„à·’ à·€à·™à¶±à·ƒà·Šà¶šà¶¸à·Š à·ƒà·’à¶¯à·”à¶šà¶½ à¶±à·œà·„à·à¶š. à¶±à¶¸à·”à¶à·Š TorBirdy à·„à·“ à¶…à¶·à·’à¶»à·”à¶ à·’ à·ƒà¶‚à·€à·à¶¯à¶ºà·™à·„à·’ à¶‡à¶à·’ à·ƒà·’à¶§à·€à·”à¶¸à·Š à·€à·™à¶±à·ƒà·Š à¶šà¶½ à·„à·à¶š. TorBirdy à¶…à·ƒà·Šà¶®à·à¶´à¶±à¶º à¶šà¶½à·€à·’à¶§ à·„à· à¶…à¶šà·Šâ€à¶»à·’à¶º à¶šà¶½à·€à·’à¶§ à·€à·™à¶±à·ƒà·Š à·€à¶± à·ƒà·’à¶ºà·…à·” à·ƒà·’à¶§à·€à·”à¶¸à·Š à¶’à·€à·à¶ºà·š à¶´à·™à¶»à¶±à·’à¶¸à·’ à¶…à¶œà¶ºà¶±à·Š (TorBirdy à·ƒà·Šà¶®à·à¶´à¶±à¶ºà¶§ à¶´à·™à¶» à¶…à¶œà¶ºà¶±à·Š) à·„à¶§ à¶´à·Šâ€à¶»à¶à·Šâ€à¶ºà·à¶»à¶¸à·Šà¶· à·€à·š.\n\nà¶”à¶¶ à¶±à·€ à¶´à¶»à·’à·à·“à¶½à¶šà¶ºà·™à¶šà·Š à¶±à¶¸à·Š, TorBirdy à·€à·™
 à¶¶à·Š à¶…à¶©à·€à·’à¶º à¶šà·’à¶ºà·€à·“à¶¸à·™à¶±à·Š TorBirdy à¶…à¶´ à¶ºà·œà¶¯à·à¶œà·à¶±à·“à¶¸à¶§ à·„à·šà¶à·”à·€ à¶´à·’à·…à·’à¶¶à¶¯ à¶¯à·à¶±à·”à·€à¶à·Š à·€à·’à¶º à·„à·à¶š.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/sk/torbirdy.dtd b/sk/torbirdy.dtd
index 914dda9..5aeac5a 100644
--- a/sk/torbirdy.dtd
+++ b/sk/torbirdy.dtd
@@ -12,7 +12,7 @@
 <!ENTITY torbirdy.prefs.save.button "UloÅ¾iÅ¥">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "ZruÅ¡iÅ¥">
-<!ENTITY torbirdy.prefs.extra1.button "">
+<!ENTITY torbirdy.prefs.extra1.button "ObnoviÅ¥ predvolenÃ©">
 <!ENTITY torbirdy.prefs.extra1.key "">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/sk/torbirdy.properties b/sk/torbirdy.properties
index 6c24d63..5baf8ee 100644
--- a/sk/torbirdy.properties
+++ b/sk/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=ProsÃm berte na vedomie, Å¾e zmena pokroÄilÃ½ch nastav
 torbirdy.email.advanced.nextwarning=ZobraziÅ¥ tÃºto vÃ½strahu nabudÃºce
 torbirdy.email.advanced.title=PokroÄilÃ© nastavenia TorBirdy
 
-torbirdy.restart=Aby sa uplatnili nastavenia Äasovej zÃ³ny, prosÃm zavrite Thunderbird a spustite ho znovu.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=PrÃ¡ve pouÅ¾Ãvate TorBirdy.\n\nPre ochranu VaÅ¡ej anonymity, TorBirdy vynÃºti svoje nastavenia Thunderbird-u, aby nemohli byÅ¥ zmenenÃ© Vami alebo nejakÃ½m doplnkom. NiektorÃ© nastavenia je moÅ¾nÃ© zmeniÅ¥ a sÃº prÃstupnÃ© cez nastavenia TorBirdy. Ak odinÅ¡talujete TorBirdy, tak sa vÅ¡etky nastavenia vrÃ¡tia na vÃ½chodzie hodnoty (hodnoty po inÅ¡talÃ¡cii TorBirdy).\n\nAk ste novÃ½ pouÅ¾ÃvateÄ¾, je odporÃºÄanÃ© aby ste si preÄÃtali strÃ¡nku TorBirdy a pochopili Äo sa snaÅ¾Ãme docieliÅ¥ pre uÅ¾ÃvateÄ¾ov TorBirdy.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/sk_SK/torbirdy.dtd b/sk_SK/torbirdy.dtd
index 88ed63f..d87296e 100644
--- a/sk_SK/torbirdy.dtd
+++ b/sk_SK/torbirdy.dtd
@@ -13,8 +13,8 @@
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "ZruÅ¡iÅ¥">
 <!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "SkontrolovaÅ¥ nastavenia">
+<!ENTITY torbirdy.prefs.extra1.key "d">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "p">
 <!ENTITY torbirdy.prefs.proxy.label "Nastavenia proxy">
 <!ENTITY torbirdy.prefs.privacy.label "Nastavenia sÃºkromia">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "Otvor nastavenia TorBirdy">
 
 <!ENTITY torbirdy.firstrun.title "PrvÃ© spustenie TorBirdy">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/sk_SK/torbirdy.properties b/sk_SK/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/sk_SK/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/sl/torbirdy.dtd b/sl/torbirdy.dtd
index 30e215d..e4a6b38 100644
--- a/sl/torbirdy.dtd
+++ b/sl/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "Shrani">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Prekini">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "Preveri nastavitve">
+<!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.proxy.label "Nastavitve posredniÅ¡kega (proxy) streÅ¾nika">
 <!ENTITY torbirdy.prefs.privacy.label "">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/sl/torbirdy.properties b/sl/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/sl/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/sl_SI/torbirdy.dtd b/sl_SI/torbirdy.dtd
index ed13453..7ce5163 100644
--- a/sl_SI/torbirdy.dtd
+++ b/sl_SI/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/sl_SI/torbirdy.properties b/sl_SI/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/sl_SI/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/sn/torbirdy.dtd b/sn/torbirdy.dtd
index dce756b..b29f818 100644
--- a/sn/torbirdy.dtd
+++ b/sn/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/sn/torbirdy.properties b/sn/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/sn/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/sq/torbirdy.dtd b/sq/torbirdy.dtd
index 9298277..d905bba 100644
--- a/sq/torbirdy.dtd
+++ b/sq/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/sq/torbirdy.properties b/sq/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/sq/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/sr/torbirdy.dtd b/sr/torbirdy.dtd
index 3c90da5..696cc54 100644
--- a/sr/torbirdy.dtd
+++ b/sr/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!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.extra1.button "ÐŸÐ¾Ð²Ñ€Ð°Ñ‚Ð¸ Ð¿Ð¾Ð´Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ²Ð°Ð½Ð¾">
+<!ENTITY torbirdy.prefs.extra1.key "Ð´">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "g">
 <!ENTITY torbirdy.prefs.proxy.label "ÐŸÑ€Ð¾ÐºÑÐ¸ Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐ°">
 <!ENTITY torbirdy.prefs.privacy.label "ÐŸÐ¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐ° Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚Ð¸">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "Otvori TorBirdy Preferences">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/sr/torbirdy.properties b/sr/torbirdy.properties
index 0418453..5ac829c 100644
--- a/sr/torbirdy.properties
+++ b/sr/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=Ð£Ð¿Ð¾Ð·Ð¾Ñ€Ð¸Ñ›ÐµÐ¼Ð¾ Ð²Ð°Ñ Ð´Ð° Ð½Ð°Ð¿Ñ€ÐµÐ´Ð½Ð° Ð¿Ð¾
 torbirdy.email.advanced.nextwarning=ÐŸÐ¾ÐºÐ°Ð¶Ð¸ Ð¾Ð²Ð¾ ÑƒÐ¿Ð¾Ð·Ð¾Ñ€ÐµÑšÐµ Ð¿Ñ€Ð¸ ÑÐ»ÐµÐ´ÐµÑ›ÐµÐ¼ Ð¿Ð¾ÐºÑ€ÐµÑ‚Ð°ÑšÑƒ
 torbirdy.email.advanced.title=TorBirdy ÐÐ°Ð¿Ñ€ÐµÐ´Ð½Ð° Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐ°
 
-torbirdy.restart=Ð”Ð° Ð±Ð¸ Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ Ð²ÐµÐ·Ð°Ð½Ð¾ Ð·Ð° Ð²Ñ€ÐµÐ¼ÐµÐ½ÑÐºÑƒ Ð·Ð¾Ð½Ñƒ Ð¿Ð¾Ñ‡ÐµÐ»Ð¾ Ð´Ð° ÑÐµ Ð¿Ñ€Ð¸Ð¼ÐµÑšÑƒÑ˜Ðµ, Ð¼Ð¾Ð»Ð¸Ð¼Ð¾ Ð´Ð° Ð·Ð°Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ðµ Thunderbird Ð¸ Ð´Ð° Ð³Ð° Ð¿Ð¾Ð½Ð¾Ð²Ð¾ Ð¿Ð¾ÐºÑ€ÐµÐ½Ñ‚Ðµ.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=Sada koristite TorBirdy.\n\nDa bi zastili vasu anonimnost, TorBirdy ce sprovesti Thunderbird postavke koje su podesene, sprecavajuci da pobudu promenjene od strane vas ili nekog dodatka.\n\nPostoje neke postavke koje se mogu menjati i njima mozete pristupiti preko Preferences opcije u TorBirdy. Kada izbrisete TorBirdy, sve postavke ce biti vracenje na njihove pocetne vrednosti. (Vrednosti pre instalacije TorBirdy programa)\n\nAko ste vi novi korisnik, preporucujemo vam da pregledate TorBirdy websajt da bi bolje razumeli sta pokusavamo da ostavarimo sa TorBirdy programom.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/sr at latin/torbirdy.dtd b/sr at latin/torbirdy.dtd
index 8b7973f..607790a 100644
--- a/sr at latin/torbirdy.dtd
+++ b/sr at latin/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/sr at latin/torbirdy.properties b/sr at latin/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/sr at latin/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/sv/torbirdy.dtd b/sv/torbirdy.dtd
index 998f7f6..b651db8 100644
--- a/sv/torbirdy.dtd
+++ b/sv/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "Spara">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Avbryt">
-<!ENTITY torbirdy.prefs.extra1.button "FelsÃ¶k">
-<!ENTITY torbirdy.prefs.extra1.key "o">
-<!ENTITY torbirdy.prefs.extra2.button "Testa instÃ¤llningar">
+<!ENTITY torbirdy.prefs.extra1.button "Ã…terstÃ¤ll till standard">
+<!ENTITY torbirdy.prefs.extra1.key "d">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "n">
 <!ENTITY torbirdy.prefs.proxy.label "ProxyinstÃ¤llningar">
 <!ENTITY torbirdy.prefs.privacy.label "SekretessinstÃ¤llningar">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "Ã–ppna instÃ¤llningarna fÃ¶r TorBirdy">
 
 <!ENTITY torbirdy.firstrun.title "TorBirdy FÃ¶rsta starten">
-<!ENTITY torbirdy.troubleshoot.title "FelsÃ¶kning">
diff --git a/sv/torbirdy.properties b/sv/torbirdy.properties
index cf579f3..051b0f4 100644
--- a/sv/torbirdy.properties
+++ b/sv/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=VÃ¤nligen notera att Ã¤ndringar av avancerade instÃ¤llni
 torbirdy.email.advanced.nextwarning=Visa denna varningstext nÃ¤sta gÃ¥ng
 torbirdy.email.advanced.title=TorBirdy Avancerade InstÃ¤llningar
 
-torbirdy.restart=FÃ¶r att tidzonsintsÃ¤llningar skall tas i bruk var god stÃ¤ng Thunderbird och starta det igen.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=Du kÃ¶r nu TorBirdy.\n\nFÃ¶r att skydda din anonymitet kommer TorBirdy att Ã¶vervaka de Thunderbird instÃ¤llningar som det satt och hindra dem att Ã¤ndras av dig eller nÃ¥got tillÃ¤ggsprogram. Det finns vissa instÃ¤llningar som kan Ã¤ndras och du kan nÃ¥ dessa genom TorBirdys instÃ¤llningsdialog. NÃ¤r TorBirdy avinstalleras eller inaktiveras kommer alla instÃ¤llningar som det gjort att Ã¥terstÃ¤llas till dess standardval (de val som var gjorda innan TorBirdy installeraders).\n\nOm du Ã¤r en ny anvÃ¤ndare rekommenderar vi att du lÃ¤ser igenom TorBirdys websidor fÃ¶r att fÃ¶rstÃ¥ vad vi fÃ¶rsÃ¶ker uppnÃ¥ fÃ¶r vÃ¥ra anvÃ¤ndare med hjÃ¤lp av TorBirdy.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/sw/torbirdy.dtd b/sw/torbirdy.dtd
index ed13453..7ce5163 100644
--- a/sw/torbirdy.dtd
+++ b/sw/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/sw/torbirdy.properties b/sw/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/sw/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/szl/torbirdy.dtd b/szl/torbirdy.dtd
index ed13453..7ce5163 100644
--- a/szl/torbirdy.dtd
+++ b/szl/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/szl/torbirdy.properties b/szl/torbirdy.properties
index cbdb5b2..b999de2 100644
--- a/szl/torbirdy.properties
+++ b/szl/torbirdy.properties
@@ -13,7 +13,7 @@
 # torbirdy.email.advanced.nextwarning=Show this warning next time
 # torbirdy.email.advanced.title=TorBirdy Advanced Settings
 
-# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 # torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
 # torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/ta/torbirdy.dtd b/ta/torbirdy.dtd
index 61408af..d7772ec 100644
--- a/ta/torbirdy.dtd
+++ b/ta/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/ta/torbirdy.properties b/ta/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/ta/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/te_IN/torbirdy.dtd b/te_IN/torbirdy.dtd
index ed13453..7ce5163 100644
--- a/te_IN/torbirdy.dtd
+++ b/te_IN/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/te_IN/torbirdy.properties b/te_IN/torbirdy.properties
index cbdb5b2..b999de2 100644
--- a/te_IN/torbirdy.properties
+++ b/te_IN/torbirdy.properties
@@ -13,7 +13,7 @@
 # torbirdy.email.advanced.nextwarning=Show this warning next time
 # torbirdy.email.advanced.title=TorBirdy Advanced Settings
 
-# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 # torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
 # torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/templates/torbirdy.dtd b/templates/torbirdy.dtd
index e8ebfa3..2880b9a 100644
--- a/templates/torbirdy.dtd
+++ b/templates/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "Save">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
-<!ENTITY torbirdy.prefs.extra1.button "Troubleshoot">
-<!ENTITY torbirdy.prefs.extra1.key "o">
-<!ENTITY torbirdy.prefs.extra2.button "Test Settings">
+<!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.proxy.label "Proxy Settings">
 <!ENTITY torbirdy.prefs.privacy.label "Privacy Settings">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
 
 <!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
-<!ENTITY torbirdy.troubleshoot.title "Troubleshooting">
diff --git a/templates/torbirdy.properties b/templates/torbirdy.properties
index b18d850..fcc69a3 100644
--- a/templates/torbirdy.properties
+++ b/templates/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=Please note that changing the advanced settings of TorBi
 torbirdy.email.advanced.nextwarning=Show this warning next time
 torbirdy.email.advanced.title=TorBirdy Advanced Settings
 
-torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again.
+torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/th/torbirdy.dtd b/th/torbirdy.dtd
index 3437070..abef572 100644
--- a/th/torbirdy.dtd
+++ b/th/torbirdy.dtd
@@ -14,7 +14,7 @@
 <!ENTITY torbirdy.prefs.cancel.button "à¸¢à¸à¹€à¸¥à¸´à¸">
 <!ENTITY torbirdy.prefs.extra1.button "">
 <!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¸—à¸”à¸ªà¸à¸š">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "à¸ž">
 <!ENTITY torbirdy.prefs.proxy.label "à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¸žà¸£à¹‡à¸à¸à¸‹à¸µ">
 <!ENTITY torbirdy.prefs.privacy.label "à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¸„à¸§à¸²à¸¡à¹€à¸›à¹‡à¸™à¸ªà¹ˆà¸§à¸™à¸•à¸±à¸§">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "à¹€à¸›à¸´à¸”à¸à¸²à¸£à¸›à¸£à¸±à¸šà¹à¸•à¹ˆà¸‡ TorBirdy">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/th/torbirdy.properties b/th/torbirdy.properties
index 3b31076..8c6e502 100644
--- a/th/torbirdy.properties
+++ b/th/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=à¹‚à¸›à¸£à¸”à¸—à¸£à¸²à¸šà¸§à¹ˆà¸²à¸à¸²à¸£à¹€à¸›à¸¥à¸µ
 torbirdy.email.advanced.nextwarning=à¹à¸ªà¸”à¸‡à¸„à¸³à¹€à¸•à¸·à¸à¸™à¸™à¸µà¹‰à¹ƒà¸™à¸„à¸£à¸±à¹‰à¸‡à¸•à¹ˆà¸à¹„à¸›
 torbirdy.email.advanced.title=à¸„à¹ˆà¸²à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸Šà¸±à¹‰à¸™à¸ªà¸¹à¸‡à¸‚à¸à¸‡ TorBirdy
 
-torbirdy.restart=à¹€à¸žà¸·à¹ˆà¸à¹ƒà¸«à¹‰à¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸à¹€à¸‚à¸•à¹€à¸§à¸¥à¸²à¸¡à¸µà¸œà¸¥à¸šà¸±à¸‡à¸„à¸±à¸šà¹ƒà¸Šà¹‰ à¸à¸£à¸¸à¸“à¸²à¸›à¸´à¸” Thunderbird à¹à¸¥à¹‰à¸§à¹€à¸›à¸´à¸”à¹ƒà¸«à¸¡à¹ˆ
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=à¸„à¸¸à¸“à¸à¸³à¸¥à¸±à¸‡à¹ƒà¸Šà¹‰ TorBirdy\n\nà¹€à¸žà¸·à¹ˆà¸à¸—à¸µà¹ˆà¸ˆà¸°à¸›à¸à¸›à¹‰à¸à¸‡à¸„à¸§à¸²à¸¡à¹€à¸›à¹‡à¸™à¸™à¸´à¸£à¸™à¸²à¸¡ TorBirdy à¸ˆà¸°à¸šà¸±à¸‡à¸„à¸±à¸šà¸„à¹ˆà¸²à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸‚à¸à¸‡ Thunderbird à¸—à¸µà¹ˆà¸•à¸±à¹‰à¸‡à¹„à¸§à¹‰ à¹€à¸žà¸·à¹ˆà¸à¸›à¹‰à¸à¸‡à¸à¸±à¸™à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡à¹‚à¸”à¸¢à¸„à¸¸à¸“à¸«à¸£à¸·à¸à¸ªà¹ˆà¸§à¸™à¹€à¸ªà¸£à¸´à¸¡à¸à¸·à¹ˆà¸™à¹† à¸¡à¸µà¸„à¹ˆà¸²à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸šà¸²à¸‡à¸à¸¢à¹ˆà¸²à¸‡à¸—à¸µà¹ˆà¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹„à¸”à¹‰à¸ˆà¸²à¸à¸«à¸™à¹‰à¸²à¸•à¹ˆà¸²à¸‡à¸à¸²à¸£à¸›à¸£à¸±à¸šà¹à¸•à¹ˆà¸‡à¸‚à¸à¸‡ TorBirdy à¹€à¸¡à¸·à¹ˆà¸ TorBirdy à¸–à¸¹à¸à¸›à¸´à¸”à¸à¸²à¸£à¸—à¸³à¸‡à¸²à¸™à¸«à¸£à¸·à¸à¸–à¸à¸™à¸à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ à¸„à¹ˆà¸²à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”à¸ˆà¸°à¸–à¸¹à¸à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹€à¸›à¹‡à¸™à¸„à¹ˆà¸²à¸šà¸£à¸´à¸¢à¸²à¸¢ (à¸„à¹ˆà¸²à¸—à¸µà¹ˆà¸£à¸°à¸šà¸¸à¹„à¸§à¹‰à¸à¹ˆà¸à¸™à¸—à¸µà¹ˆà¸ˆà¸°à¸¡à¸µà¸à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡ TorBirdy)\n\nà¸–à¹‰à¸²à¸„à¸¸à¸“à¹€à¸›à¹‡à
 ¸™à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¹ƒà¸«à¸¡à¹ˆ à¹€à¸£à¸²à¹à¸™à¸°à¸™à¸³à¹ƒà¸«à¹‰à¸„à¸¸à¸“à¸à¹ˆà¸²à¸™à¹€à¸§à¹‡à¸šà¹„à¸‹à¸—à¹Œà¸‚à¸à¸‡ TorBirdy à¹€à¸žà¸·à¹ˆà¸à¸—à¸µà¹ˆà¸ˆà¸°à¹€à¸‚à¹‰à¸²à¹ƒà¸ˆà¸§à¸±à¸•à¸–à¸¸à¸›à¸£à¸°à¸ªà¸‡à¸„à¹Œà¸‚à¸à¸‡à¸à¸²à¸£à¹ƒà¸Šà¹‰ TorBirdy
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/tr/torbirdy.dtd b/tr/torbirdy.dtd
index c64c248..9a0e35a 100644
--- a/tr/torbirdy.dtd
+++ b/tr/torbirdy.dtd
@@ -14,9 +14,9 @@
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Ä°ptal
             ">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "AyarlarÄ± test et">
+<!ENTITY torbirdy.prefs.extra1.button "VarsayÄ±lanÄ± ayarla">
+<!ENTITY torbirdy.prefs.extra1.key "d">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "n">
 <!ENTITY torbirdy.prefs.proxy.label "Proxy AyarlarÄ±">
 <!ENTITY torbirdy.prefs.privacy.label "Mahremiyet AyarlarÄ±">
@@ -61,4 +61,3 @@
 <!ENTITY torbirdy.panel.preferences.label "TorBirdy SeÃ§eneklerini AÃ§">
 
 <!ENTITY torbirdy.firstrun.title "TorBirdy ilk Ã§alÄ±ÅŸtÄ±rma">
-<!ENTITY torbirdy.troubleshoot.title "Problem algÄ±lanÄ±yor.">
diff --git a/tr/torbirdy.properties b/tr/torbirdy.properties
index 2982289..c48e4aa 100644
--- a/tr/torbirdy.properties
+++ b/tr/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=TorBirdy geliÅŸmiÅŸ ayarlarÄ±nÄ± deÄŸiÅŸtirmeniz Ã¶neril
 torbirdy.email.advanced.nextwarning=Bu uyarÄ±yÄ± sonraki sefer yine gÃ¶ster.
 torbirdy.email.advanced.title=TorBirdy GeliÅŸmiÅŸ Ayarlar
 
-torbirdy.restart=Zaman dilimi tercihlerinin geÃ§erli olabilmesi iÃ§in lÃ¼tfen Thunderbird'Ã¼ yeniden baÅŸlatÄ±n.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=TorBirdy Ã§alÄ±ÅŸtÄ±rÄ±ldÄ±.\n\nTorBirdy, anonimliÄŸinizi korumak iÃ§in Thunderbird ayarlarÄ±nÄ±n, sizin tarafanÄ±zdan veya bir eklenti tarafÄ±ndan deÄŸiÅŸtirilmesini engelleyecek. Yine de deÄŸiÅŸtirilebilecek bazÄ± ayarlar var. Bu ayarlarÄ±n, TorBirdy'nin seÃ§enekler diyaloÄŸuna eriÅŸimi var. TorBirdy devre dÄ±ÅŸÄ± bÄ±rakÄ±ldÄ±ÄŸÄ±nda ya da kaldÄ±rÄ±ldÄ±ÄŸÄ±nda tÃ¼m ayarlar eski haline geri dÃ¶necek.\n\nYeni bir kullanÄ±cÄ±ysanÄ±z,TorBirdy ile kullanÄ±cÄ±lar iÃ§in neyi baÅŸarmaya Ã§alÄ±ÅŸtÄ±ÄŸÄ±mÄ±zÄ± anlamanÄ±z adÄ±na TorBirdy websitesine gÃ¶z atmanÄ±zÄ± Ã¶neririz.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/uk/torbirdy.dtd b/uk/torbirdy.dtd
index fe318e2..6405a24 100644
--- a/uk/torbirdy.dtd
+++ b/uk/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!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.extra1.button "Ð—Ð° Ð—Ð°Ð¼Ð¾Ð²Ñ‡ÑƒÐ²Ð°Ð½Ð½ÑÐ¼">
+<!ENTITY torbirdy.prefs.extra1.key "d">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "p">
 <!ENTITY torbirdy.prefs.proxy.label "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¸ Ð¿Ñ€Ð¾ÐºÑÑ–">
 <!ENTITY torbirdy.prefs.privacy.label "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÐŸÑ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚Ñ–">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "Ð’Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ TorBirdy">
 
 <!ENTITY torbirdy.firstrun.title "ÐŸÐµÑ€ÑˆÐ¸Ð¹ Ð·Ð°Ð¿ÑƒÑÐº TorBirdy">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/uk/torbirdy.properties b/uk/torbirdy.properties
index cbdb5b2..b999de2 100644
--- a/uk/torbirdy.properties
+++ b/uk/torbirdy.properties
@@ -13,7 +13,7 @@
 # torbirdy.email.advanced.nextwarning=Show this warning next time
 # torbirdy.email.advanced.title=TorBirdy Advanced Settings
 
-# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 # torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
 # torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/ur_PK/torbirdy.dtd b/ur_PK/torbirdy.dtd
index dd2e161..f4efb40 100644
--- a/ur_PK/torbirdy.dtd
+++ b/ur_PK/torbirdy.dtd
@@ -12,7 +12,7 @@
 <!ENTITY torbirdy.prefs.save.button "Ù…ØÙÙˆØ¸ Ú©ÛŒØ¬ÛŒÛ’">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "ØªÙ†Ø³ÛŒØ® Ú©ÛŒØ¬ÛŒÛ’">
-<!ENTITY torbirdy.prefs.extra1.button "">
+<!ENTITY torbirdy.prefs.extra1.button "ÚˆÛŒÙØ§Ù„Ù¹Ø³ Ù¾Ø± ÙˆØ§Ù¾Ø³ Ø¬Ø§Ø¦ÛŒÛ’">
 <!ENTITY torbirdy.prefs.extra1.key "">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/ur_PK/torbirdy.properties b/ur_PK/torbirdy.properties
new file mode 100644
index 0000000..b999de2
--- /dev/null
+++ b/ur_PK/torbirdy.properties
@@ -0,0 +1,19 @@
+# torbirdy.name=TorBirdy
+
+# torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+# torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+# torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+# torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+# torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+# torbirdy.disabled=TorBirdy:    Disabled!
+
+# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+# torbirdy.email.advanced.nextwarning=Show this warning next time
+# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
+# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/uz/torbirdy.dtd b/uz/torbirdy.dtd
index ed13453..7ce5163 100644
--- a/uz/torbirdy.dtd
+++ b/uz/torbirdy.dtd
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/uz/torbirdy.properties b/uz/torbirdy.properties
index cbdb5b2..b999de2 100644
--- a/uz/torbirdy.properties
+++ b/uz/torbirdy.properties
@@ -13,7 +13,7 @@
 # torbirdy.email.advanced.nextwarning=Show this warning next time
 # torbirdy.email.advanced.title=TorBirdy Advanced Settings
 
-# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 # torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
 # torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/vi/torbirdy.dtd b/vi/torbirdy.dtd
index ddd1c72..ed92fe8 100644
--- a/vi/torbirdy.dtd
+++ b/vi/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!ENTITY torbirdy.prefs.save.button "LÆ°u">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "Há»§y">
-<!ENTITY torbirdy.prefs.extra1.button "">
+<!ENTITY torbirdy.prefs.extra1.button "KhÃ´i phá»¥c Máº·c Ä‘á»‹nh">
 <!ENTITY torbirdy.prefs.extra1.key "">
-<!ENTITY torbirdy.prefs.extra2.button "Thiáº¿t láºp Thá» nghiá»‡m">
+<!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "y">
 <!ENTITY torbirdy.prefs.proxy.label "Nhá»¯ng CÃ i Ä‘áº·t mÃ¡y chá»§ proxy">
 <!ENTITY torbirdy.prefs.privacy.label "">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/vi/torbirdy.properties b/vi/torbirdy.properties
index cbdb5b2..b999de2 100644
--- a/vi/torbirdy.properties
+++ b/vi/torbirdy.properties
@@ -13,7 +13,7 @@
 # torbirdy.email.advanced.nextwarning=Show this warning next time
 # torbirdy.email.advanced.title=TorBirdy Advanced Settings
 
-# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 # torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
 # torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/zh_CN/torbirdy.dtd b/zh_CN/torbirdy.dtd
index a5b654e..ed53b30 100644
--- a/zh_CN/torbirdy.dtd
+++ b/zh_CN/torbirdy.dtd
@@ -12,9 +12,9 @@
 <!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.extra1.button "æ¢å¤é»˜è®¤å€¼">
+<!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 "éšç§è®¾ç½®">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "æ‰“å¼€ TorBirdy é¦–é€‰é¡¹">
 
 <!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
-<!ENTITY torbirdy.troubleshoot.title "ç–‘éš¾è§£ç”">
diff --git a/zh_CN/torbirdy.properties b/zh_CN/torbirdy.properties
index d9c5419..468a3f2 100644
--- a/zh_CN/torbirdy.properties
+++ b/zh_CN/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=è¯·æ³¨æ„ï¼šå»ºè®®ä¸è¦ä¿®æ”¹é«˜çº§è®¾ç½®ï¼\n\né™¤éž
 torbirdy.email.advanced.nextwarning=ä¸‹æ¬¡æ˜¾ç¤ºæ¤è¦å‘Š
 torbirdy.email.advanced.title=TorBirdy é«˜çº§è®¾ç½®
 
-torbirdy.restart=ä¸ºäº†è®©æ—¶åŒºé€‰é¡¹çš„è®¾å®šç”Ÿæ•ˆï¼Œè¯·å…³é— Thunderbird å¹¶å†æ¬¡å¯åŠ¨ã€‚
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 torbirdy.firstrun=å½“å‰æ£åœ¨è¿è¡Œ TorBirdyã€‚\n\nä¸ºäº†ä¿æŠ¤ç”¨æˆ·çš„åŒ¿åæ€§ï¼ŒTorBirdy å¼ºåˆ¶è®¾å®šäº† Thunderbird è®¾ç½®ï¼Œä»¥ä¾¿é˜²æ¢ç”¨æˆ·æˆ–å…¶ä»–ä»»ä½•é™„åŠ ç»„ä»¶å¯¹å…¶è¿›è¡Œä¿®æ”¹ã€‚æŸäº›è®¾ç½®å¯é€šè¿‡ TorBirdy é€‰é¡¹å¯¹è¯æ¡†è®¿é—®å¹¶ä¿®æ”¹ã€‚å¸è½½æˆ–ç¦ç”¨ TorBirdy ä¹‹åŽï¼Œè¯¥ç»„ä»¶å¯¹è®¾ç½®æ‰€ä½œçš„å…¨éƒ¨ä¿®æ”¹å°†é‡ç½®æœªé»˜è®¤æŒ‡ï¼ˆå³åœ¨å®‰è£… TorBirdy ä¹‹å‰çš„å€¼ï¼‰ã€‚\n\nå¦‚æžœä½ æ˜¯æ–°ç”¨æˆ·ï¼Œå»ºè®®æŸ¥é˜… TorBirdy ç½‘ç«™ï¼Œä»¥ç†è§£ç”¨æˆ·å¯é€šè¿‡ TorBirdy åˆ°è¾¾ä½•ç§ç›®çš„ã€‚
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/zh_TW/torbirdy.dtd b/zh_TW/torbirdy.dtd
index 7d0e09e..c6018f5 100644
--- a/zh_TW/torbirdy.dtd
+++ b/zh_TW/torbirdy.dtd
@@ -12,8 +12,8 @@
 <!ENTITY torbirdy.prefs.save.button "å„²å˜">
 <!ENTITY torbirdy.prefs.save.key "">
 <!ENTITY torbirdy.prefs.cancel.button "å–æ¶ˆ">
-<!ENTITY torbirdy.prefs.extra1.button "">
-<!ENTITY torbirdy.prefs.extra1.key "">
+<!ENTITY torbirdy.prefs.extra1.button "å›žå¾©é è¨å€¼">
+<!ENTITY torbirdy.prefs.extra1.key "d">
 <!ENTITY torbirdy.prefs.extra2.button "">
 <!ENTITY torbirdy.prefs.extra2.key "P">
 <!ENTITY torbirdy.prefs.proxy.label "ä»£ç†è¨å®š">
@@ -59,4 +59,3 @@
 <!ENTITY torbirdy.panel.preferences.label "">
 
 <!ENTITY torbirdy.firstrun.title "">
-<!ENTITY torbirdy.troubleshoot.title "">
diff --git a/zh_TW/torbirdy.properties b/zh_TW/torbirdy.properties
index cbdb5b2..b999de2 100644
--- a/zh_TW/torbirdy.properties
+++ b/zh_TW/torbirdy.properties
@@ -13,7 +13,7 @@
 # torbirdy.email.advanced.nextwarning=Show this warning next time
 # torbirdy.email.advanced.title=TorBirdy Advanced Settings
 
-# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again.
+# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
 
 # torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
 # torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

