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

12 Nov 2013

commit f5c82de9513e10e94ddbfceb08827dd1a05ea811
Author: Translation commit bot translation@torproject.org
Date:   Tue Nov 12 09:56:52 2013 +0000
Update translations for torbirdy
---
 ak/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 am/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 arn/torbirdy.dtd      |   92 +++++++++++++++++++--------------------
 ast/torbirdy.dtd      |   92 +++++++++++++++++++--------------------
 az/torbirdy.dtd       |   80 +++++++++++++++++-----------------
 be/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 bg/torbirdy.dtd       |   88 ++++++++++++++++++-------------------
 bn/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 bn_IN/torbirdy.dtd    |   92 +++++++++++++++++++--------------------
 bo/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 br/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 bs/torbirdy.dtd       |   10 ++---
 ca/torbirdy.dtd       |   76 ++++++++++++++++----------------
 ca_ES/torbirdy.dtd    |  112 +++++++++++++++++++++++------------------------
 csb/torbirdy.dtd      |   92 +++++++++++++++++++--------------------
 cy/torbirdy.dtd       |   76 ++++++++++++++++----------------
 dz/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 eo/torbirdy.dtd       |   76 ++++++++++++++++----------------
 es_AR/torbirdy.dtd    |  116 ++++++++++++++++++++++++-------------------------
 et/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 fa/torbirdy.dtd       |   22 +++++-----
 fil/torbirdy.dtd      |   92 +++++++++++++++++++--------------------
 fo/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 fur/torbirdy.dtd      |   92 +++++++++++++++++++--------------------
 fy/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 ga/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 gl/torbirdy.dtd       |   78 ++++++++++++++++-----------------
 gu/torbirdy.dtd       |   76 ++++++++++++++++----------------
 gu_IN/torbirdy.dtd    |   24 +++++-----
 gun/torbirdy.dtd      |   92 +++++++++++++++++++--------------------
 ha/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 hi/torbirdy.dtd       |   40 ++++++++---------
 hr/torbirdy.dtd       |   36 +++++++--------
 hr_HR/torbirdy.dtd    |   10 ++---
 ht/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 hu/torbirdy.dtd       |    8 ++--
 hy/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 ia/torbirdy.dtd       |  112 +++++++++++++++++++++++------------------------
 id/torbirdy.dtd       |   76 ++++++++++++++++----------------
 is/torbirdy.dtd       |   88 ++++++++++++++++++-------------------
 jv/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 ka/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 km/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 kn/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 ko/torbirdy.dtd       |   22 +++++-----
 ko_KR/torbirdy.dtd    |  110 +++++++++++++++++++++++-----------------------
 ku/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 kw/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 ky/torbirdy.dtd       |   88 ++++++++++++++++++-------------------
 lb/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 lg/torbirdy.dtd       |   94 +++++++++++++++++++--------------------
 ln/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 lo/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 lt/torbirdy.dtd       |   74 +++++++++++++++----------------
 mg/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 mi/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 mk/torbirdy.dtd       |   80 +++++++++++++++++-----------------
 ml/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 mn/torbirdy.dtd       |   90 +++++++++++++++++++-------------------
 mr/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 mt/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 my/torbirdy.dtd       |   76 ++++++++++++++++----------------
 nah/torbirdy.dtd      |   92 +++++++++++++++++++--------------------
 nap/torbirdy.dtd      |   92 +++++++++++++++++++--------------------
 nb/torbirdy.dtd       |   20 ++++-----
 ne/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 nn/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 nso/torbirdy.dtd      |   92 +++++++++++++++++++--------------------
 oc/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 or/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 pap/torbirdy.dtd      |   92 +++++++++++++++++++--------------------
 pl_PL/torbirdy.dtd    |  112 +++++++++++++++++++++++------------------------
 pms/torbirdy.dtd      |   92 +++++++++++++++++++--------------------
 ps/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 ru/torbirdy.dtd       |   22 +++++-----
 sco/torbirdy.dtd      |   92 +++++++++++++++++++--------------------
 si_LK/torbirdy.dtd    |   20 ++++-----
 sk/torbirdy.dtd       |   62 +++++++++++++-------------
 sk_SK/torbirdy.dtd    |   30 ++++++-------
 sl/torbirdy.dtd       |   76 ++++++++++++++++----------------
 so/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 son/torbirdy.dtd      |   92 +++++++++++++++++++--------------------
 sq/torbirdy.dtd       |   88 ++++++++++++++++++-------------------
 sr/torbirdy.dtd       |   20 ++++-----
 sr@latin/torbirdy.dtd |  116 ++++++++++++++++++++++++-------------------------
 st/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 su/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 sw/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 ta/torbirdy.dtd       |   88 ++++++++++++++++++-------------------
 te/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 tg/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 th/torbirdy.dtd       |   34 +++++++--------
 ti/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 tk/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 uk/torbirdy.dtd       |   30 ++++++-------
 ur/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 ur_PK/torbirdy.dtd    |  110 +++++++++++++++++++++++-----------------------
 uz/torbirdy.dtd       |  114 ++++++++++++++++++++++++------------------------
 ve/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 vi/torbirdy.dtd       |   76 ++++++++++++++++----------------
 wa/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 wo/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 zh_HK/torbirdy.dtd    |   92 +++++++++++++++++++--------------------
 zu/torbirdy.dtd       |   92 +++++++++++++++++++--------------------
 104 files changed, 4234 insertions(+), 4234 deletions(-)

diff --git a/ak/torbirdy.dtd b/ak/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/ak/torbirdy.dtd
+++ b/ak/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/am/torbirdy.dtd b/am/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/am/torbirdy.dtd
+++ b/am/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/arn/torbirdy.dtd b/arn/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/arn/torbirdy.dtd
+++ b/arn/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/ast/torbirdy.dtd b/ast/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/ast/torbirdy.dtd
+++ b/ast/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/az/torbirdy.dtd b/az/torbirdy.dtd
index 1e67d65..122e336 100644
--- a/az/torbirdy.dtd
+++ b/az/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "P">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Ləğv et">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Ləğv et">
 <!ENTITY torbirdy.prefs.extra2.button "Varsayılanları yenidən yüklə">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
 <!ENTITY torbirdy.prefs.testproxy.key "P">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "P">
-<!ENTITY torbirdy.prefs.anonservice.text "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
 <!ENTITY torbirdy.prefs.anonservice.key "P">
 <!ENTITY torbirdy.prefs.customsettings.text "Proksinin fərdi qurğusundan istifadə et">
 <!ENTITY torbirdy.prefs.customsettings.key "P">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "P">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "P">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "P">
-<!ENTITY torbirdy.prefs.timezone.label "">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "P">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "P">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
 <!ENTITY torbirdy.prefs.emailwizard.key "P">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "P">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/be/torbirdy.dtd b/be/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/be/torbirdy.dtd
+++ b/be/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/bg/torbirdy.dtd b/bg/torbirdy.dtd
index d2d21de..5db448a 100644
--- a/bg/torbirdy.dtd
+++ b/bg/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Отказ">
 <!ENTITY torbirdy.accountprefs.save.button "Запиши">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
 <!ENTITY torbirdy.prefs.save.button "Запиши">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Отказ">
 <!ENTITY torbirdy.prefs.extra2.button "Възстанови стандартните">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/bn/torbirdy.dtd b/bn/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/bn/torbirdy.dtd
+++ b/bn/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/bn_IN/torbirdy.dtd b/bn_IN/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/bn_IN/torbirdy.dtd
+++ b/bn_IN/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/bo/torbirdy.dtd b/bo/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/bo/torbirdy.dtd
+++ b/bo/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/br/torbirdy.dtd b/br/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/br/torbirdy.dtd
+++ b/br/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/bs/torbirdy.dtd b/bs/torbirdy.dtd
index 325fbc7..cd5dbfc 100644
--- a/bs/torbirdy.dtd
+++ b/bs/torbirdy.dtd
@@ -16,10 +16,10 @@
 <!ENTITY torbirdy.prefs.extra2.key "d">
 <!ENTITY torbirdy.prefs.testproxy.button "Isprobaj Proxy postavke">
 <!ENTITY torbirdy.prefs.testproxy.key "P">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
 <!ENTITY torbirdy.prefs.recommended.text "Koristite preporučene proxy postavke za TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "Odaberite jedan od anonimizacija usluga">
@@ -35,7 +35,7 @@
 <!ENTITY torbirdy.prefs.global "Globalno">
 <!ENTITY torbirdy.prefs.imap.label "Omogući push e-mail podrške za IMAP račune [default: isključen]">
 <!ENTITY torbirdy.prefs.imap.key "P">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "P">
 <!ENTITY torbirdy.prefs.timezone.label "Nemojte postavljati Thunderbird u vremensku zonu UTC [default: postavljen na UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "z">
diff --git a/ca/torbirdy.dtd b/ca/torbirdy.dtd
index 56ceff1..e3d282b 100644
--- a/ca/torbirdy.dtd
+++ b/ca/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "r">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel·la">
 <!ENTITY torbirdy.accountprefs.save.button "Desa">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
 <!ENTITY torbirdy.prefs.save.button "Desa">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel·la">
 <!ENTITY torbirdy.prefs.extra2.button "Reestableix predeterminats">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
 <!ENTITY torbirdy.prefs.testproxy.key "p">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
 <!ENTITY torbirdy.prefs.anonservice.key "p">
 <!ENTITY torbirdy.prefs.customsettings.text "Utilitza una configuració del proxy personalitzada">
 <!ENTITY torbirdy.prefs.customsettings.key "p">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "p">
-<!ENTITY torbirdy.prefs.timezone.label "">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "p">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
 <!ENTITY torbirdy.prefs.emailwizard.key "p">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/ca_ES/torbirdy.dtd b/ca_ES/torbirdy.dtd
index b194029..c686fb5 100644
--- a/ca_ES/torbirdy.dtd
+++ b/ca_ES/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
-<!ENTITY torbirdy.accountprefs.minutes.key "">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
+<!ENTITY torbirdy.accountprefs.minutes.key "y">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel·la">
 <!ENTITY torbirdy.accountprefs.save.button "Desa">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
 <!ENTITY torbirdy.prefs.save.button "Desa">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel·la">
-<!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
-<!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra2.key "d">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
+<!ENTITY torbirdy.prefs.recommended.key "r">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.imap.key "p">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
+<!ENTITY torbirdy.prefs.select_account.key "C">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/csb/torbirdy.dtd b/csb/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/csb/torbirdy.dtd
+++ b/csb/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/cy/torbirdy.dtd b/cy/torbirdy.dtd
index d3920f5..0c98ceb 100644
--- a/cy/torbirdy.dtd
+++ b/cy/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "p">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Canslo">
 <!ENTITY torbirdy.accountprefs.save.button "Cadw">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
 <!ENTITY torbirdy.prefs.save.button "Cadw">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Canslo">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
 <!ENTITY torbirdy.prefs.testproxy.key "p">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "p">
-<!ENTITY torbirdy.prefs.anonservice.text "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
 <!ENTITY torbirdy.prefs.anonservice.key "p">
 <!ENTITY torbirdy.prefs.customsettings.text "Defnyddiwch gosodiadau procsi addasiedig">
 <!ENTITY torbirdy.prefs.customsettings.key "p">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "p">
-<!ENTITY torbirdy.prefs.timezone.label "">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "p">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "p">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
 <!ENTITY torbirdy.prefs.emailwizard.key "p">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "p">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/dz/torbirdy.dtd b/dz/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/dz/torbirdy.dtd
+++ b/dz/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/eo/torbirdy.dtd b/eo/torbirdy.dtd
index 6c65c45..284696d 100644
--- a/eo/torbirdy.dtd
+++ b/eo/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "A">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Rezigni">
 <!ENTITY torbirdy.accountprefs.save.button "Konservi">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
 <!ENTITY torbirdy.prefs.save.button "Konservi">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Rezigni">
 <!ENTITY torbirdy.prefs.extra2.button "Restaŭri defaŭltojn">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
 <!ENTITY torbirdy.prefs.testproxy.key "A">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "A">
-<!ENTITY torbirdy.prefs.anonservice.text "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
 <!ENTITY torbirdy.prefs.anonservice.key "A">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "A">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "A">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "A">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "A">
-<!ENTITY torbirdy.prefs.timezone.label "">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "A">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "A">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
 <!ENTITY torbirdy.prefs.emailwizard.key "A">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "A">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/es_AR/torbirdy.dtd b/es_AR/torbirdy.dtd
index 7e33526..1cc1767 100644
--- a/es_AR/torbirdy.dtd
+++ b/es_AR/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
-<!ENTITY torbirdy.accountprefs.minutes.key "">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
+<!ENTITY torbirdy.accountprefs.minutes.key "y">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancelar">
-<!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
+<!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancelar">
-<!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
-<!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra2.key "d">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
+<!ENTITY torbirdy.prefs.recommended.key "r">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.imap.key "p">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
+<!ENTITY torbirdy.prefs.select_account.key "C">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/et/torbirdy.dtd b/et/torbirdy.dtd
index 4fcf68a..a63bd16 100644
--- a/et/torbirdy.dtd
+++ b/et/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Katkesta">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Katkesta">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/fa/torbirdy.dtd b/fa/torbirdy.dtd
index 1597ef6..1ac2042 100644
--- a/fa/torbirdy.dtd
+++ b/fa/torbirdy.dtd
@@ -14,12 +14,12 @@
 <!ENTITY torbirdy.prefs.cancel.button "لغو">
 <!ENTITY torbirdy.prefs.extra2.button "بازگرداندن تنظیمات به حالت پیش‌فرض">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
 <!ENTITY torbirdy.prefs.recommended.text "از تنظیمات پراکسی توصیه شده برای توربِردی استفاده کن (تور)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "یک سرویس ناشناسی انتخاب کنید">
@@ -35,18 +35,18 @@
 <!ENTITY torbirdy.prefs.global "جهانی">
 <!ENTITY torbirdy.prefs.imap.label "قابلیت شناسایی کلید در پیغام به رمز شده [پیش فرض: خاموش ]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "l">
 <!ENTITY torbirdy.prefs.timezone.label "ساعت تاندربِرد را به UTC تغییر نده [پیش فرض: تغییر به UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "z">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "تایید قبل از ارسال کردن ایمیل، در صورتی که Enigmail فعال باشد. [ پیشفرض: خاموش] ">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
 <!ENTITY torbirdy.prefs.emailwizard.label "فعال کردن سیستم اتومیتک تنظیم ایمیل در Thunderbird. [ پیش فرض: خاموش ]">
 <!ENTITY torbirdy.prefs.emailwizard.key "w">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
 <!ENTITY torbirdy.prefs.renegotiation.label "اجازه برقراری ارتباط با سرورهایی که از SSL/TLS با مذاکره دوباره امن پشتیبانی نمیکنند [پیش فرض: غیرفعال]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "مخصوص حساب کاربری">
diff --git a/fil/torbirdy.dtd b/fil/torbirdy.dtd
index 41f3acd..0fe482d 100644
--- a/fil/torbirdy.dtd
+++ b/fil/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Kanselahin">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Kanselahin">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/fo/torbirdy.dtd b/fo/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/fo/torbirdy.dtd
+++ b/fo/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/fur/torbirdy.dtd b/fur/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/fur/torbirdy.dtd
+++ b/fur/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/fy/torbirdy.dtd b/fy/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/fy/torbirdy.dtd
+++ b/fy/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/ga/torbirdy.dtd b/ga/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/ga/torbirdy.dtd
+++ b/ga/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/gl/torbirdy.dtd b/gl/torbirdy.dtd
index c993831..596e7b8 100644
--- a/gl/torbirdy.dtd
+++ b/gl/torbirdy.dtd
@@ -1,63 +1,63 @@
 <!ENTITY torbirdy.accountprefs.title "Configuración da conta">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "minutos">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancelar">
 <!ENTITY torbirdy.accountprefs.save.button "Gardar">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
 <!ENTITY torbirdy.prefs.save.button "Gardar">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancelar">
 <!ENTITY torbirdy.prefs.extra2.button "Restabelecer valores predeterminados">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
 <!ENTITY torbirdy.prefs.socks_port.label "Porto:">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
 <!ENTITY torbirdy.prefs.global "Global">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "Elixe unha conta:">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/gu/torbirdy.dtd b/gu/torbirdy.dtd
index 0a504ea..5bd6c3f 100644
--- a/gu/torbirdy.dtd
+++ b/gu/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "P">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "રદ્ કરો">
 <!ENTITY torbirdy.accountprefs.save.button "સંગ્રહો">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
 <!ENTITY torbirdy.prefs.save.button "સંગ્રહો">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "રદ્ કરો">
 <!ENTITY torbirdy.prefs.extra2.button "મૂળભૂત પાછું લાવો">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
 <!ENTITY torbirdy.prefs.testproxy.key "P">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "P">
-<!ENTITY torbirdy.prefs.anonservice.text "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
 <!ENTITY torbirdy.prefs.anonservice.key "P">
 <!ENTITY torbirdy.prefs.customsettings.text "પોતાની પ્રોક્સી ગોઠવણીઓ વાપરો">
 <!ENTITY torbirdy.prefs.customsettings.key "P">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "P">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "P">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "P">
-<!ENTITY torbirdy.prefs.timezone.label "">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "P">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "P">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
 <!ENTITY torbirdy.prefs.emailwizard.key "P">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "P">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/gu_IN/torbirdy.dtd b/gu_IN/torbirdy.dtd
index a80ac14..4ea4f19 100644
--- a/gu_IN/torbirdy.dtd
+++ b/gu_IN/torbirdy.dtd
@@ -12,14 +12,14 @@
 <!ENTITY torbirdy.prefs.save.button "સંગ્રહો">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "રદ કરો">
-<!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "">
-<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra2.key "d">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
 <!ENTITY torbirdy.prefs.testproxy.key "n">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
 <!ENTITY torbirdy.prefs.recommended.text "ટોરબર્ડિ (ટોર) માટે આગ્રહ કરેલ પ્રોક્સી ગોઠવણીઓ વાપરો">
 <!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "અજ્ઞાત થવાની સેવા પસંદ કરો">
@@ -35,18 +35,18 @@
 <!ENTITY torbirdy.prefs.global "વૈશ્વિક">
 <!ENTITY torbirdy.prefs.imap.label "IMAP ખાતાંઓ માટે પુશ ઇમેલ આધાર સક્રિય કરો [મૂળભૂત: નિષ્ક્રિય]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "l">
 <!ENTITY torbirdy.prefs.timezone.label "થન્ડરબર્ડનો સમય વિસ્તાર UTC પર ન ગોઠવો [મૂળભૂત: UTC પર ગોઠવેલ]">
 <!ENTITY torbirdy.prefs.timezone.key "z">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "p">
 <!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
 <!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
 <!ENTITY torbirdy.prefs.emailwizard.key "w">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
 <!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "ખાતા-સંબંધિત">
diff --git a/gun/torbirdy.dtd b/gun/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/gun/torbirdy.dtd
+++ b/gun/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/ha/torbirdy.dtd b/ha/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/ha/torbirdy.dtd
+++ b/ha/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/hi/torbirdy.dtd b/hi/torbirdy.dtd
index dc4bab7..8bd3c46 100644
--- a/hi/torbirdy.dtd
+++ b/hi/torbirdy.dtd
@@ -14,11 +14,11 @@
 <!ENTITY torbirdy.prefs.cancel.button "रद्द करें ">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
 <!ENTITY torbirdy.prefs.testproxy.key "P/प">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
 <!ENTITY torbirdy.prefs.security.label "सुरक्षा ">
 <!ENTITY torbirdy.prefs.recommended.text "टॉरबर्डी (टॉर) के लिए अनुशंसित प्रोक्सी पतिस्थितियों का प्रयोग करें">
 <!ENTITY torbirdy.prefs.recommended.key "r">
@@ -27,37 +27,37 @@
 <!ENTITY torbirdy.prefs.customsettings.text "व्यवाहारिक प्रोक्सी सेटिंग का उपयोग करे">
 <!ENTITY torbirdy.prefs.customsettings.key "c">
 <!ENTITY torbirdy.prefs.socks_host.label "SOCKS आतिथेय :">
-<!ENTITY torbirdy.prefs.socks_host.key "">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
 <!ENTITY torbirdy.prefs.socks_port.label "पोर्ट/द्वार :">
 <!ENTITY torbirdy.prefs.socks_port.key "P/प">
-<!ENTITY torbirdy.prefs.torification.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
 <!ENTITY torbirdy.prefs.torification.key "टी ">
 <!ENTITY torbirdy.prefs.global "विश्वीय">
 <!ENTITY torbirdy.prefs.imap.label "IMAP खाते के लिये push email समर्थन को सक्षम करें [डिफ़ॉल्ट: अक्षम]">
 <!ENTITY torbirdy.prefs.imap.key "P/प">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "P/प">
 <!ENTITY torbirdy.prefs.timezone.label "Thunderbird के समय क्षेत्र को UTC के लिए स्थापित मत करना [डिफ़ॉल्ट: UTC के लिए स्थापित करना]">
 <!ENTITY torbirdy.prefs.timezone.key "P/प">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
 <!ENTITY torbirdy.prefs.emailwizard.key "P/प">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "खाता विशिष्ट">
 <!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "खाता चुनें">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
<!ENTITY torbirdy.panel.usetor.label "Tor Onion Router का प्रयोग कीजिये.">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/hr/torbirdy.dtd b/hr/torbirdy.dtd
index 8c06fc4..feb3f9a 100644
--- a/hr/torbirdy.dtd
+++ b/hr/torbirdy.dtd
@@ -14,12 +14,12 @@
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
 <!ENTITY torbirdy.prefs.testproxy.key "k">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
 <!ENTITY torbirdy.prefs.recommended.text "Koristite preporučene proxy postavke za TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "k">
 <!ENTITY torbirdy.prefs.anonservice.text "Odaberite jedan od anonimizacija usluga">
@@ -35,29 +35,29 @@
 <!ENTITY torbirdy.prefs.global "Globalno">
 <!ENTITY torbirdy.prefs.imap.label "Omogući push e-mail podrške za IMAP račune [default: isključen]">
 <!ENTITY torbirdy.prefs.imap.key "k">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "k">
 <!ENTITY torbirdy.prefs.timezone.label "Nemojte postavljati Thunderbird u vremensku zonu UTC [default: postavljen na UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "k">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "k">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
 <!ENTITY torbirdy.prefs.emailwizard.key "k">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "k">
 <!ENTITY torbirdy.prefs.account_specific "Određeno za račun">
 <!ENTITY torbirdy.prefs.select_account.key "Z">
 <!ENTITY torbirdy.prefs.select_account.label "Odaberi račun">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
<!ENTITY torbirdy.panel.usetor.label "Koristite Tor Onion Ruter">
 <!ENTITY torbirdy.panel.usejondo.label "Koristite JonDo (Premium) ">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/hr_HR/torbirdy.dtd b/hr_HR/torbirdy.dtd
index 2f11435..cf0c188 100644
--- a/hr_HR/torbirdy.dtd
+++ b/hr_HR/torbirdy.dtd
@@ -16,10 +16,10 @@
 <!ENTITY torbirdy.prefs.extra2.key "d">
 <!ENTITY torbirdy.prefs.testproxy.button "Isprobaj Proxy postavke">
 <!ENTITY torbirdy.prefs.testproxy.key "n">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
 <!ENTITY torbirdy.prefs.recommended.text "Koristite preporučene proxy postavke za TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "Odaberite jedan od anonimizacija usluga">
@@ -35,7 +35,7 @@
 <!ENTITY torbirdy.prefs.global "Globalno">
 <!ENTITY torbirdy.prefs.imap.label "Omogući push e-mail podrške za IMAP račune [default: isključen]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "I">
 <!ENTITY torbirdy.prefs.timezone.label "Nemojte postavljati Thunderbird u vremensku zonu UTC [default: postavljen na UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "z">
diff --git a/ht/torbirdy.dtd b/ht/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/ht/torbirdy.dtd
+++ b/ht/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/hu/torbirdy.dtd b/hu/torbirdy.dtd
index 4b79a58..0b9a571 100644
--- a/hu/torbirdy.dtd
+++ b/hu/torbirdy.dtd
@@ -35,18 +35,18 @@
 <!ENTITY torbirdy.prefs.global "Globális">
 <!ENTITY torbirdy.prefs.imap.label "A push támogatás bekapcsolása az IMAP fiókokhoz [alapértelmezett: kikapcsolva]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "l">
 <!ENTITY torbirdy.prefs.timezone.label "Ne állítsa be a Thunderbird időzónáját UTC-re [alapértelmezett: beállítás UTC-re]">
 <!ENTITY torbirdy.prefs.timezone.key "m">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "a">
 <!ENTITY torbirdy.prefs.confirmemail.label "Email küldése előtt rákérdezés, ha Enigmail engedélyezett [alapértelmezés: ne egyen rákérdezés]">
 <!ENTITY torbirdy.prefs.confirmemail.key "p">
 <!ENTITY torbirdy.prefs.emailwizard.label "A Thunderbird automatikus email beállítási varázslójának engedélyezése [alapértelmezés: tiltott]">
 <!ENTITY torbirdy.prefs.emailwizard.key "n">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
 <!ENTITY torbirdy.prefs.renegotiation.label "Csatlakozás engedélyezése olyan szerverekhez amelyek nem támogatják az SSL/TLS protokoll secure renegotiation funkcióját [alapértelmezett: ne engedélyezze]">
 <!ENTITY torbirdy.prefs.renegotiation.key "a">
 <!ENTITY torbirdy.prefs.account_specific "Fiók-specifikus">
diff --git a/hy/torbirdy.dtd b/hy/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/hy/torbirdy.dtd
+++ b/hy/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/ia/torbirdy.dtd b/ia/torbirdy.dtd
index 7619528..dbbda30 100644
--- a/ia/torbirdy.dtd
+++ b/ia/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
-<!ENTITY torbirdy.accountprefs.minutes.key "">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
+<!ENTITY torbirdy.accountprefs.minutes.key "y">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancellar">
 <!ENTITY torbirdy.accountprefs.save.button "Salveguardar">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
 <!ENTITY torbirdy.prefs.save.button "Salveguardar">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancellar">
-<!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
-<!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra2.key "d">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
+<!ENTITY torbirdy.prefs.recommended.key "r">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.imap.key "p">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
+<!ENTITY torbirdy.prefs.select_account.key "C">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/id/torbirdy.dtd b/id/torbirdy.dtd
index e827a79..8643dd6 100644
--- a/id/torbirdy.dtd
+++ b/id/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "P">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Batal">
 <!ENTITY torbirdy.accountprefs.save.button "Simpan">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
 <!ENTITY torbirdy.prefs.save.button "Simpan">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Batal">
 <!ENTITY torbirdy.prefs.extra2.button "Kembalikan ke asal">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
 <!ENTITY torbirdy.prefs.testproxy.key "P">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "P">
-<!ENTITY torbirdy.prefs.anonservice.text "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
 <!ENTITY torbirdy.prefs.anonservice.key "P">
 <!ENTITY torbirdy.prefs.customsettings.text "Gunakan pengaturan proxy yang disesuaikan">
 <!ENTITY torbirdy.prefs.customsettings.key "P">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "P">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "P">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "P">
-<!ENTITY torbirdy.prefs.timezone.label "">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "P">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "P">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
 <!ENTITY torbirdy.prefs.emailwizard.key "P">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "P">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/is/torbirdy.dtd b/is/torbirdy.dtd
index 4be50f3..9fb53b2 100644
--- a/is/torbirdy.dtd
+++ b/is/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Hætta við">
 <!ENTITY torbirdy.accountprefs.save.button "Vista">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
 <!ENTITY torbirdy.prefs.save.button "Vista">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Hætta við">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/jv/torbirdy.dtd b/jv/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/jv/torbirdy.dtd
+++ b/jv/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/ka/torbirdy.dtd b/ka/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/ka/torbirdy.dtd
+++ b/ka/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/km/torbirdy.dtd b/km/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/km/torbirdy.dtd
+++ b/km/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/kn/torbirdy.dtd b/kn/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/kn/torbirdy.dtd
+++ b/kn/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/ko/torbirdy.dtd b/ko/torbirdy.dtd
index e57c1f6..2a96f9a 100644
--- a/ko/torbirdy.dtd
+++ b/ko/torbirdy.dtd
@@ -14,12 +14,12 @@
 <!ENTITY torbirdy.prefs.cancel.button "취소">
 <!ENTITY torbirdy.prefs.extra2.button "설정 초기화">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
 <!ENTITY torbirdy.prefs.recommended.text "Torbirdy를 위한 추천되는 프록시 설정을 사용합니다.">
 <!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "익명화 서비스 선택">
@@ -35,18 +35,18 @@
 <!ENTITY torbirdy.prefs.global "글로벌">
 <!ENTITY torbirdy.prefs.imap.label "IMAP 계정에 대한 푸시 이메일 지원 활성화 [기본값:비활성화]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "l">
 <!ENTITY torbirdy.prefs.timezone.label "썬더버드의 타임존을 UTC로 설정하지 마십시오 [기본값 : UTC로 설정]">
 <!ENTITY torbirdy.prefs.timezone.key "z">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "Enigmail이 활성화되었을 경우 메일을 보내기 전에 확인하기 [기본값 : 확인하지 않음]">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
 <!ENTITY torbirdy.prefs.emailwizard.label "썬더버드의 자동 이메일 환경설정 마법사 활성화 [기본값 : 비활성화]">
 <!ENTITY torbirdy.prefs.emailwizard.key "w">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
 <!ENTITY torbirdy.prefs.renegotiation.label "SSL/TLS가 호환되지 않는 사이트에의 비보호 접근을 허용 [기본 설정: 비허용]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "계정-특징적">
diff --git a/ko_KR/torbirdy.dtd b/ko_KR/torbirdy.dtd
index 7e20ee7..921d9e7 100644
--- a/ko_KR/torbirdy.dtd
+++ b/ko_KR/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
-<!ENTITY torbirdy.accountprefs.minutes.key "">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
+<!ENTITY torbirdy.accountprefs.minutes.key "y">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "취소">
 <!ENTITY torbirdy.accountprefs.save.button "저장">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
 <!ENTITY torbirdy.prefs.save.button "저장">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "취소">
 <!ENTITY torbirdy.prefs.extra2.button "기본값으로 돌림">
-<!ENTITY torbirdy.prefs.extra2.key "">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
-<!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.extra2.key "d">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
+<!ENTITY torbirdy.prefs.recommended.key "r">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.imap.key "p">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
+<!ENTITY torbirdy.prefs.select_account.key "C">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/ku/torbirdy.dtd b/ku/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/ku/torbirdy.dtd
+++ b/ku/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/kw/torbirdy.dtd b/kw/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/kw/torbirdy.dtd
+++ b/kw/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/ky/torbirdy.dtd b/ky/torbirdy.dtd
index 0864b57..7c213e5 100644
--- a/ky/torbirdy.dtd
+++ b/ky/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Айнуу">
 <!ENTITY torbirdy.accountprefs.save.button "Сактоо">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
 <!ENTITY torbirdy.prefs.save.button "Сактоо">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Айнуу">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/lb/torbirdy.dtd b/lb/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/lb/torbirdy.dtd
+++ b/lb/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/lg/torbirdy.dtd b/lg/torbirdy.dtd
index 3145d61..6f81a67 100644
--- a/lg/torbirdy.dtd
+++ b/lg/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
+<!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/ln/torbirdy.dtd b/ln/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/ln/torbirdy.dtd
+++ b/ln/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/lo/torbirdy.dtd b/lo/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/lo/torbirdy.dtd
+++ b/lo/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/lt/torbirdy.dtd b/lt/torbirdy.dtd
index fb2bee4..6d865f8 100644
--- a/lt/torbirdy.dtd
+++ b/lt/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "p">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Atsisakyti">
 <!ENTITY torbirdy.accountprefs.save.button "Įrašyti">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
 <!ENTITY torbirdy.prefs.save.button "Įrašyti">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Atsisakyti">
 <!ENTITY torbirdy.prefs.extra2.button "Atstatyti numatytuosius">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
 <!ENTITY torbirdy.prefs.testproxy.key "p">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
 <!ENTITY torbirdy.prefs.anonservice.key "p">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
 <!ENTITY torbirdy.prefs.customsettings.key "p">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "p">
-<!ENTITY torbirdy.prefs.timezone.label "">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "p">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
 <!ENTITY torbirdy.prefs.confirmemail.key "p">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
 <!ENTITY torbirdy.prefs.emailwizard.key "p">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/mg/torbirdy.dtd b/mg/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/mg/torbirdy.dtd
+++ b/mg/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/mi/torbirdy.dtd b/mi/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/mi/torbirdy.dtd
+++ b/mi/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/mk/torbirdy.dtd b/mk/torbirdy.dtd
index e481cc7..a4180a4 100644
--- a/mk/torbirdy.dtd
+++ b/mk/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "P">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Откажи се">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Откажи се">
 <!ENTITY torbirdy.prefs.extra2.button "Стандардни подесувања">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
 <!ENTITY torbirdy.prefs.testproxy.key "P">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "P">
-<!ENTITY torbirdy.prefs.anonservice.text "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
 <!ENTITY torbirdy.prefs.anonservice.key "P">
 <!ENTITY torbirdy.prefs.customsettings.text "Користи сопствени прокси-подесувања">
 <!ENTITY torbirdy.prefs.customsettings.key "P">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "P">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "P">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "P">
-<!ENTITY torbirdy.prefs.timezone.label "">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "P">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "P">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
 <!ENTITY torbirdy.prefs.emailwizard.key "P">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "P">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/ml/torbirdy.dtd b/ml/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/ml/torbirdy.dtd
+++ b/ml/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/mn/torbirdy.dtd b/mn/torbirdy.dtd
index 89a141c..fb95414 100644
--- a/mn/torbirdy.dtd
+++ b/mn/torbirdy.dtd
@@ -1,63 +1,63 @@
 <!ENTITY torbirdy.accountprefs.title "Дансны Тохируулга">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/mr/torbirdy.dtd b/mr/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/mr/torbirdy.dtd
+++ b/mr/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/mt/torbirdy.dtd b/mt/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/mt/torbirdy.dtd
+++ b/mt/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/my/torbirdy.dtd b/my/torbirdy.dtd
index 5af1886..0f68c67 100644
--- a/my/torbirdy.dtd
+++ b/my/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "r">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "ဖျက်သိမ်းရန်">
 <!ENTITY torbirdy.accountprefs.save.button "သိမ်းဆည်းရန်">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
 <!ENTITY torbirdy.prefs.save.button "သိမ်းဆည်းရန်">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "ဖျက်သိမ်းရန်">
 <!ENTITY torbirdy.prefs.extra2.button " မူလအတိုင်း ပြန်ထားရန်">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
 <!ENTITY torbirdy.prefs.testproxy.key "P">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
 <!ENTITY torbirdy.prefs.anonservice.key "P">
 <!ENTITY torbirdy.prefs.customsettings.text "စိတ်ကြိုက် ပရောက်ဇီ ချိန်ညှိချက်များကို သုံးရန်">
 <!ENTITY torbirdy.prefs.customsettings.key "P">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "P">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "P">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "P">
-<!ENTITY torbirdy.prefs.timezone.label "">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "P">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
 <!ENTITY torbirdy.prefs.emailwizard.key "P">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/nah/torbirdy.dtd b/nah/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/nah/torbirdy.dtd
+++ b/nah/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/nap/torbirdy.dtd b/nap/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/nap/torbirdy.dtd
+++ b/nap/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/nb/torbirdy.dtd b/nb/torbirdy.dtd
index 0c82ad4..b477cb6 100644
--- a/nb/torbirdy.dtd
+++ b/nb/torbirdy.dtd
@@ -14,12 +14,12 @@
 <!ENTITY torbirdy.prefs.cancel.button "Avbryt">
 <!ENTITY torbirdy.prefs.extra2.button "Gjenopprett standard">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
 <!ENTITY torbirdy.prefs.testproxy.key "n">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
 <!ENTITY torbirdy.prefs.recommended.text "Bruk de anbefalte proxyinnstillingene for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "Velg en anonymiseringstjeneste">
@@ -35,18 +35,18 @@
 <!ENTITY torbirdy.prefs.global "Global">
 <!ENTITY torbirdy.prefs.imap.label "Aktiver støtte for push e-post til IMAP-kontoer [standard: deaktivert]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "l">
 <!ENTITY torbirdy.prefs.timezone.label "Ikke sett Thunderbirds tidssone til UTC [standard: sett til UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "z">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "Bekreft før sending av e-post hvis Enigmail er aktivert [standard: ikke bekreft]">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
 <!ENTITY torbirdy.prefs.emailwizard.label "Aktiver Thunderbirds automatiske konfigureringshjelp [standard: deaktivert]">
 <!ENTITY torbirdy.prefs.emailwizard.key "w">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
 <!ENTITY torbirdy.prefs.renegotiation.label "Tillat tilkoblinger til servere som ikke støtter SSL/TLS med sikker renegotiation [standard: ikke tillat]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "Kontospesifikt">
diff --git a/ne/torbirdy.dtd b/ne/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/ne/torbirdy.dtd
+++ b/ne/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/nn/torbirdy.dtd b/nn/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/nn/torbirdy.dtd
+++ b/nn/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/nso/torbirdy.dtd b/nso/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/nso/torbirdy.dtd
+++ b/nso/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/oc/torbirdy.dtd b/oc/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/oc/torbirdy.dtd
+++ b/oc/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/or/torbirdy.dtd b/or/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/or/torbirdy.dtd
+++ b/or/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/pap/torbirdy.dtd b/pap/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/pap/torbirdy.dtd
+++ b/pap/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/pl_PL/torbirdy.dtd b/pl_PL/torbirdy.dtd
index a630170..019980f 100644
--- a/pl_PL/torbirdy.dtd
+++ b/pl_PL/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
-<!ENTITY torbirdy.accountprefs.minutes.key "">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
+<!ENTITY torbirdy.accountprefs.minutes.key "y">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Anuluj">
-<!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
+<!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Anuluj">
-<!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra2.key "d">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
+<!ENTITY torbirdy.prefs.recommended.key "r">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.imap.key "p">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/pms/torbirdy.dtd b/pms/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/pms/torbirdy.dtd
+++ b/pms/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/ps/torbirdy.dtd b/ps/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/ps/torbirdy.dtd
+++ b/ps/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/ru/torbirdy.dtd b/ru/torbirdy.dtd
index e21b41e..89a2979 100644
--- a/ru/torbirdy.dtd
+++ b/ru/torbirdy.dtd
@@ -14,12 +14,12 @@
 <!ENTITY torbirdy.prefs.cancel.button "Отмена">
 <!ENTITY torbirdy.prefs.extra2.button "Восстановить значения по умолчанию">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
 <!ENTITY torbirdy.prefs.recommended.text "Использовать рекомендуемые параметры прокси-сервера для TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "Выберите сервис анонимизации">
@@ -35,18 +35,18 @@
 <!ENTITY torbirdy.prefs.global "Глобальные">
 <!ENTITY torbirdy.prefs.imap.label "Активировать принудительную поддержку по электронной почте IMAP аккаунтов [по умолчанию: отключено]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "l">
 <!ENTITY torbirdy.prefs.timezone.label "Не устанавливать часовой пояс Thunderbird по UTC [по умолчанию: по Гринвичу]">
 <!ENTITY torbirdy.prefs.timezone.key "z">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "Оповещать об активации Enigmail перед отправкой письма [по умолчанию: не оповещать]">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
 <!ENTITY torbirdy.prefs.emailwizard.label "Активировать автоматический мастер настройки почты Thunderbird [по умолчанию: не активирован]">
 <!ENTITY torbirdy.prefs.emailwizard.key "w">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
 <!ENTITY torbirdy.prefs.renegotiation.label "Разрешить соединения серверами неподдерживающими SSL/TLS с безопасным согласованием [по умолчанию: запретить]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "Связанные с учетной записью">
diff --git a/sco/torbirdy.dtd b/sco/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/sco/torbirdy.dtd
+++ b/sco/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/si_LK/torbirdy.dtd b/si_LK/torbirdy.dtd
index aae3005..aac5626 100644
--- a/si_LK/torbirdy.dtd
+++ b/si_LK/torbirdy.dtd
@@ -14,12 +14,12 @@
 <!ENTITY torbirdy.prefs.cancel.button "අවලංගු කරන්න">
 <!ENTITY torbirdy.prefs.extra2.button "පෙරනිමි දේ ප්‍රතිස්ථාපනය කරන්න ">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
 <!ENTITY torbirdy.prefs.testproxy.key "n">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
 <!ENTITY torbirdy.prefs.recommended.text "TorBirdy (Tor) සදහා නිර්දේශිත නියුතු සේවාදායක සිටවුම් භාවිතා කරන්න ">
 <!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "නිර්ණාමික සේවාවක් තෝරන්න ">
@@ -35,18 +35,18 @@
 <!ENTITY torbirdy.prefs.global "ගෝලීය ">
 <!ENTITY torbirdy.prefs.imap.label "IMAP ගිණුම් සදහා විද්‍යුත් තැපෑල තල්ලු ආධාරය සබල කරන්න[default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "l">
 <!ENTITY torbirdy.prefs.timezone.label "UTC සදහා Thunderbird වේලා කලාපය යෙදීමෙන් වැළකී සිටින්න [default: set to UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "z">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "Enigmail සබල කර ඇත්නම් විද්‍යුත් තැපෑල එවීමට පෙර තහවුරු කරන්න  [default: do not confirm]">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
 <!ENTITY torbirdy.prefs.emailwizard.label "Thunderbird ගේ ස්වයංක්‍රීය විද්‍යුත් තැපෑල වින්‍යාස විශාරද සබල කරන්න [default: disabled]">
 <!ENTITY torbirdy.prefs.emailwizard.key "w">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
 <!ENTITY torbirdy.prefs.renegotiation.label "ආරක්‍ෂිත නැවත හුවමාරුවක් සහිත SSL/TLS අනුබල නොදෙන සේවාදායකයන්ට සම්බන්ධ වීමට ඉඩහරින්න  [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "විශේෂිත-ගිණුම ">
diff --git a/sk/torbirdy.dtd b/sk/torbirdy.dtd
index e0c989d..b715b71 100644
--- a/sk/torbirdy.dtd
+++ b/sk/torbirdy.dtd
@@ -8,56 +8,56 @@
 <!ENTITY torbirdy.accountprefs.save.button "Uložiť">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
 <!ENTITY torbirdy.prefs.save.button "Uložiť">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Zrušiť">
 <!ENTITY torbirdy.prefs.extra2.button "Obnoviť predvolené">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
 <!ENTITY torbirdy.prefs.recommended.text "Použiť odporúčané nastavenie proxy pre TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "Použiť anonymizačnú službu">
 <!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Použiť vlastné nastavenie proxy">
 <!ENTITY torbirdy.prefs.customsettings.key "c">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
 <!ENTITY torbirdy.prefs.socks_port.label "Port:">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
 <!ENTITY torbirdy.prefs.timezone.label "Nenastavovať časovú zónu aplikácie Thunderbird na koordinovaný svetový čas UTC [štandardne: nastavené na UTC]">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
 <!ENTITY torbirdy.prefs.confirmemail.key "c">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "Vyberte účet:">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/sk_SK/torbirdy.dtd b/sk_SK/torbirdy.dtd
index b09faf7..d3988da 100644
--- a/sk_SK/torbirdy.dtd
+++ b/sk_SK/torbirdy.dtd
@@ -12,47 +12,47 @@
 <!ENTITY torbirdy.prefs.save.button "Uložiť">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Zrušiť">
-<!ENTITY torbirdy.prefs.extra2.button "">
+<!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
 <!ENTITY torbirdy.prefs.testproxy.key "p">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
 <!ENTITY torbirdy.prefs.recommended.text "Použiť odporúčané nastavenia proxy pre TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "Zvoľ anonymizačnú službu">
 <!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Vlastné nastavenia proxy">
 <!ENTITY torbirdy.prefs.customsettings.key "p">
-<!ENTITY torbirdy.prefs.socks_host.label "">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
 <!ENTITY torbirdy.prefs.socks_host.key "h">
 <!ENTITY torbirdy.prefs.socks_port.label "Port:">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
 <!ENTITY torbirdy.prefs.torification.key "t">
 <!ENTITY torbirdy.prefs.global "Globálne">
 <!ENTITY torbirdy.prefs.imap.label "Povoľ podporu push email pre IMAP účty [predvolené: vypnuté]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "p">
 <!ENTITY torbirdy.prefs.timezone.label "Nenastav časovú zónu Thunderbird na UTC [predvolené: nastav na UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "z">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "Potvrď či Enigmail je povolený predtým, než odošle email [predvolené: nepotvrď]">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
 <!ENTITY torbirdy.prefs.emailwizard.label "Povoľ automatickú konfiguráciu emailového klienta Thunderbird [predvolené: vypnuté]">
 <!ENTITY torbirdy.prefs.emailwizard.key "w">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
 <!ENTITY torbirdy.prefs.renegotiation.label "Povoľ pripojenia na servery ktoré nepodporujú protokoly SSL/TLS so zabezpečením [predvolené: nepovoľ]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "Zvoľ účet:">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
<!ENTITY torbirdy.panel.usetor.label "Použi Tor Onion Router">
diff --git a/sl/torbirdy.dtd b/sl/torbirdy.dtd
index 90c81e2..0445858 100644
--- a/sl/torbirdy.dtd
+++ b/sl/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "r">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Prekini">
 <!ENTITY torbirdy.accountprefs.save.button "Shrani">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
 <!ENTITY torbirdy.prefs.save.button "Shrani">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Prekini">
 <!ENTITY torbirdy.prefs.extra2.button "Privzete nastavitve">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
 <!ENTITY torbirdy.prefs.testproxy.key "P">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
 <!ENTITY torbirdy.prefs.anonservice.key "P">
 <!ENTITY torbirdy.prefs.customsettings.text "Uporabi nastavitve proxy strežnika po meri">
 <!ENTITY torbirdy.prefs.customsettings.key "P">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "P">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "P">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "P">
-<!ENTITY torbirdy.prefs.timezone.label "">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "P">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
 <!ENTITY torbirdy.prefs.emailwizard.key "P">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/so/torbirdy.dtd b/so/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/so/torbirdy.dtd
+++ b/so/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/son/torbirdy.dtd b/son/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/son/torbirdy.dtd
+++ b/son/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/sq/torbirdy.dtd b/sq/torbirdy.dtd
index 7d67c64..79f39db 100644
--- a/sq/torbirdy.dtd
+++ b/sq/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Anullo">
 <!ENTITY torbirdy.accountprefs.save.button "Ruaj">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
 <!ENTITY torbirdy.prefs.save.button "Ruaj">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Anullo">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/sr/torbirdy.dtd b/sr/torbirdy.dtd
index 73a04a4..bb9f228 100644
--- a/sr/torbirdy.dtd
+++ b/sr/torbirdy.dtd
@@ -14,12 +14,12 @@
 <!ENTITY torbirdy.prefs.cancel.button "Откажи">
 <!ENTITY torbirdy.prefs.extra2.button "Поврати подразумевано">
 <!ENTITY torbirdy.prefs.extra2.key "д">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
 <!ENTITY torbirdy.prefs.recommended.text "Користите препоручена прокси подешавања за TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "Изаберите сервис заштите (анонимности)">
@@ -35,7 +35,7 @@
 <!ENTITY torbirdy.prefs.global "Globalno">
 <!ENTITY torbirdy.prefs.imap.label "Укључите просљеђивање порука према вашем IMAP налогу [стандардно: искључено]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "l">
 <!ENTITY torbirdy.prefs.timezone.label "Ne postavljaj UTC kao vremensku zonu za Thunderbird">
 <!ENTITY torbirdy.prefs.timezone.key "s">
@@ -44,17 +44,17 @@
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
 <!ENTITY torbirdy.prefs.confirmemail.label "Potvrdi pre slanja ukoliko je Enigmail omogućen ">
 <!ENTITY torbirdy.prefs.confirmemail.key "c">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
 <!ENTITY torbirdy.prefs.emailwizard.key "a">
 <!ENTITY torbirdy.prefs.automatic.label "Проверите за нове поруке се аутоматски за све рачуне [дефаулт: искључен]
 ">
 <!ENTITY torbirdy.prefs.automatic.key "ф">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "Специјално-за налог">
 <!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "Изабери налог: ">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "s">
<!ENTITY torbirdy.panel.usetor.label "Koristi Tor Onion Router">
diff --git a/sr@latin/torbirdy.dtd b/sr@latin/torbirdy.dtd
index 2e3c6ec..aea35cb 100644
--- a/sr@latin/torbirdy.dtd
+++ b/sr@latin/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
-<!ENTITY torbirdy.accountprefs.minutes.key "">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
+<!ENTITY torbirdy.accountprefs.minutes.key "y">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Otkaži">
-<!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
+<!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Otkaži">
-<!ENTITY torbirdy.prefs.extra2.button "">
-<!ENTITY torbirdy.prefs.extra2.key "">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
-<!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra2.key "d">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
+<!ENTITY torbirdy.prefs.recommended.key "r">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.imap.key "p">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
+<!ENTITY torbirdy.prefs.select_account.key "C">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/st/torbirdy.dtd b/st/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/st/torbirdy.dtd
+++ b/st/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/su/torbirdy.dtd b/su/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/su/torbirdy.dtd
+++ b/su/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/sw/torbirdy.dtd b/sw/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/sw/torbirdy.dtd
+++ b/sw/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/ta/torbirdy.dtd b/ta/torbirdy.dtd
index cc482f3..3b94150 100644
--- a/ta/torbirdy.dtd
+++ b/ta/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "ரத்துசெய்">
 <!ENTITY torbirdy.accountprefs.save.button "சேமி">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
 <!ENTITY torbirdy.prefs.save.button "சேமி">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "ரத்துசெய்">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/te/torbirdy.dtd b/te/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/te/torbirdy.dtd
+++ b/te/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/tg/torbirdy.dtd b/tg/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/tg/torbirdy.dtd
+++ b/tg/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/th/torbirdy.dtd b/th/torbirdy.dtd
index d7914f8..0ca0b6d 100644
--- a/th/torbirdy.dtd
+++ b/th/torbirdy.dtd
@@ -14,12 +14,12 @@
 <!ENTITY torbirdy.prefs.cancel.button "ยกเลิก">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
 <!ENTITY torbirdy.prefs.testproxy.key "พ">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
 <!ENTITY torbirdy.prefs.recommended.text "ใช้การตั้งค่าพร็อกซีที่แนะนำสำหรับ TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "น">
 <!ENTITY torbirdy.prefs.anonservice.text "เลือกบริการปกปิดชื่อ">
@@ -30,34 +30,34 @@
 <!ENTITY torbirdy.prefs.socks_host.key "ฮ">
 <!ENTITY torbirdy.prefs.socks_port.label "พอร์ต:">
 <!ENTITY torbirdy.prefs.socks_port.key "พ">
-<!ENTITY torbirdy.prefs.torification.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
 <!ENTITY torbirdy.prefs.torification.key "ต">
 <!ENTITY torbirdy.prefs.global "ส่วนรวม">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "พ">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "พ">
 <!ENTITY torbirdy.prefs.timezone.label "อย่าตั้งเขตเวลาของ Thunderbird เป็น UTC [ค่าปริยาย: ตั้งเป็น UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "พ">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "น">
 <!ENTITY torbirdy.prefs.confirmemail.label "ยืนยันก่อนส่งอีเมลหากเปิดใช้ Enigmail [ค่าปริยาย: ไม่ต้องยืนยัน]">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
 <!ENTITY torbirdy.prefs.emailwizard.key "พ">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "น">
 <!ENTITY torbirdy.prefs.account_specific "เฉพาะบัญชี">
 <!ENTITY torbirdy.prefs.select_account.key "ต">
 <!ENTITY torbirdy.prefs.select_account.label "เลือกบัญชีผู้ใช้">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
<!ENTITY torbirdy.panel.usetor.label "ใช้ Tor Onion Router">
 <!ENTITY torbirdy.panel.usejondo.label "ใช้ JonDo (Premium)">
 <!ENTITY torbirdy.panel.usewhonix.label "ใช้ Whonix">
 <!ENTITY torbirdy.panel.preferences.label "เปิดการปรับแต่ง TorBirdy">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/ti/torbirdy.dtd b/ti/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/ti/torbirdy.dtd
+++ b/ti/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/tk/torbirdy.dtd b/tk/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/tk/torbirdy.dtd
+++ b/tk/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/uk/torbirdy.dtd b/uk/torbirdy.dtd
index 7d27905..9ae9baf 100644
--- a/uk/torbirdy.dtd
+++ b/uk/torbirdy.dtd
@@ -18,7 +18,7 @@
 <!ENTITY torbirdy.prefs.testproxy.key "p">
 <!ENTITY torbirdy.prefs.proxy.label "Проксі">
 <!ENTITY torbirdy.prefs.privacy.label "Приватність">
-<!ENTITY torbirdy.prefs.enigmail.label "">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
 <!ENTITY torbirdy.prefs.security.label "Захист">
 <!ENTITY torbirdy.prefs.recommended.text "Використовувати рекомендовані параметри проксі-сервера для TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
@@ -30,33 +30,33 @@
 <!ENTITY torbirdy.prefs.socks_host.key "h">
 <!ENTITY torbirdy.prefs.socks_port.label "Порт:">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
 <!ENTITY torbirdy.prefs.torification.key "t">
 <!ENTITY torbirdy.prefs.global "Глобальні">
 <!ENTITY torbirdy.prefs.imap.label "Активувати примусову підтримку по електронній пошті IMAP акаунтів [за замовчуванням: відключено]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "p">
-<!ENTITY torbirdy.prefs.timezone.label "">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "z">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
 <!ENTITY torbirdy.prefs.emailwizard.key "w">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "Виберіть акаунт:">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
 <!ENTITY torbirdy.panel.usewhonix.label "Використовувати Whonix">
 <!ENTITY torbirdy.panel.preferences.label "Відкрити налаштування TorBirdy">
diff --git a/ur/torbirdy.dtd b/ur/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/ur/torbirdy.dtd
+++ b/ur/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/ur_PK/torbirdy.dtd b/ur_PK/torbirdy.dtd
index 9278134..298bb01 100644
--- a/ur_PK/torbirdy.dtd
+++ b/ur_PK/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
-<!ENTITY torbirdy.accountprefs.minutes.key "">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
+<!ENTITY torbirdy.accountprefs.minutes.key "y">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "تنسیخ کیجیے">
 <!ENTITY torbirdy.accountprefs.save.button "محفوظ کیجیے">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
 <!ENTITY torbirdy.prefs.save.button "محفوظ کیجیے">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "تنسیخ کیجیے">
 <!ENTITY torbirdy.prefs.extra2.button "ڈیفالٹس پر واپس جائیے">
-<!ENTITY torbirdy.prefs.extra2.key "">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
-<!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.extra2.key "d">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
+<!ENTITY torbirdy.prefs.recommended.key "r">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.imap.key "p">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
+<!ENTITY torbirdy.prefs.select_account.key "C">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/uz/torbirdy.dtd b/uz/torbirdy.dtd
index cb02c8e..e58aea6 100644
--- a/uz/torbirdy.dtd
+++ b/uz/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
-<!ENTITY torbirdy.accountprefs.startup.key "">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
-<!ENTITY torbirdy.accountprefs.minutes.key "">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
+<!ENTITY torbirdy.accountprefs.minutes.key "y">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Bekor qilish">
-<!ENTITY torbirdy.accountprefs.save.button "">
-<!ENTITY torbirdy.accountprefs.save.key "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
+<!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Bekor qilish">
 <!ENTITY torbirdy.prefs.extra2.button "Andozalarni tiklash">
-<!ENTITY torbirdy.prefs.extra2.key "">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
-<!ENTITY torbirdy.prefs.recommended.key "">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
-<!ENTITY torbirdy.prefs.customsettings.text "">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
-<!ENTITY torbirdy.prefs.socks_port.key "">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
-<!ENTITY torbirdy.prefs.imap.key "">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
-<!ENTITY torbirdy.prefs.renegotiation.key "">
-<!ENTITY torbirdy.prefs.account_specific "">
-<!ENTITY torbirdy.prefs.select_account.key "">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.extra2.key "d">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
+<!ENTITY torbirdy.prefs.recommended.key "r">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
+<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.imap.key "p">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
+<!ENTITY torbirdy.prefs.select_account.key "C">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/ve/torbirdy.dtd b/ve/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/ve/torbirdy.dtd
+++ b/ve/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/vi/torbirdy.dtd b/vi/torbirdy.dtd
index 4158ae3..577fd45 100644
--- a/vi/torbirdy.dtd
+++ b/vi/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "y">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Hủy">
 <!ENTITY torbirdy.accountprefs.save.button "Lưu">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
 <!ENTITY torbirdy.prefs.save.button "Lưu">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Hủy">
 <!ENTITY torbirdy.prefs.extra2.button "Khôi phục Mặc định">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
 <!ENTITY torbirdy.prefs.testproxy.key "y">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "y">
-<!ENTITY torbirdy.prefs.anonservice.text "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
 <!ENTITY torbirdy.prefs.anonservice.key "y">
 <!ENTITY torbirdy.prefs.customsettings.text "Dùng thiết lập proxy tùy biến">
 <!ENTITY torbirdy.prefs.customsettings.key "y">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "y">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "y">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
 <!ENTITY torbirdy.prefs.startup_folder.key "y">
-<!ENTITY torbirdy.prefs.timezone.label "">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "y">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "y">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
 <!ENTITY torbirdy.prefs.emailwizard.key "y">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "y">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/wa/torbirdy.dtd b/wa/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/wa/torbirdy.dtd
+++ b/wa/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/wo/torbirdy.dtd b/wo/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/wo/torbirdy.dtd
+++ b/wo/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/zh_HK/torbirdy.dtd b/zh_HK/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/zh_HK/torbirdy.dtd
+++ b/zh_HK/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/zu/torbirdy.dtd b/zu/torbirdy.dtd
index 2992a88..6f81a67 100644
--- a/zu/torbirdy.dtd
+++ b/zu/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "">
-<!ENTITY torbirdy.accountprefs.startup.label "">
+<!ENTITY torbirdy.accountprefs.title "Account Configuration">
+<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "">
+<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every">
 <!ENTITY torbirdy.accountprefs.minutes.key "d">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancel">
-<!ENTITY torbirdy.accountprefs.save.button "">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
 <!ENTITY torbirdy.accountprefs.save.key "S">
-<!ENTITY torbirdy.prefs.title "">
-<!ENTITY torbirdy.prefs.save.button "">
-<!ENTITY torbirdy.prefs.save.key "">
+<!ENTITY torbirdy.prefs.title "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Save">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancel">
 <!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "">
-<!ENTITY torbirdy.prefs.testproxy.key "">
-<!ENTITY torbirdy.prefs.proxy.label "">
-<!ENTITY torbirdy.prefs.privacy.label "">
-<!ENTITY torbirdy.prefs.enigmail.label "">
-<!ENTITY torbirdy.prefs.security.label "">
-<!ENTITY torbirdy.prefs.recommended.text "">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privacy">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Security">
+<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "">
-<!ENTITY torbirdy.prefs.anonservice.key "">
+<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
 <!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings">
-<!ENTITY torbirdy.prefs.customsettings.key "">
-<!ENTITY torbirdy.prefs.socks_host.label "">
-<!ENTITY torbirdy.prefs.socks_host.key "">
-<!ENTITY torbirdy.prefs.socks_port.label "">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: ">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "">
-<!ENTITY torbirdy.prefs.torification.key "">
-<!ENTITY torbirdy.prefs.global "">
-<!ENTITY torbirdy.prefs.imap.label "">
+<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "">
-<!ENTITY torbirdy.prefs.startup_folder.key "">
-<!ENTITY torbirdy.prefs.timezone.label "">
-<!ENTITY torbirdy.prefs.timezone.key "">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "">
+<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "">
-<!ENTITY torbirdy.prefs.confirmemail.key "">
-<!ENTITY torbirdy.prefs.emailwizard.label "">
-<!ENTITY torbirdy.prefs.emailwizard.key "">
-<!ENTITY torbirdy.prefs.automatic.label "">
-<!ENTITY torbirdy.prefs.automatic.key "">
-<!ENTITY torbirdy.prefs.renegotiation.label "">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "">
+<!ENTITY torbirdy.prefs.account_specific "Account-Specific">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "">
+<!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
-<!ENTITY torbirdy.panel.usetor.label "">
-<!ENTITY torbirdy.panel.usejondo.label "">
-<!ENTITY torbirdy.panel.usewhonix.label "">
-<!ENTITY torbirdy.panel.preferences.label "">
+<!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Use Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">
-<!ENTITY torbirdy.firstrun.title "">
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">

    

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

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