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

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

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

commit f5c82de9513e10e94ddbfceb08827dd1a05ea811
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
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">

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

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