[Pkg-mozext-commits] [torbirdy] 01/08: Imported Upstream version 0.1.3

Jacob Appelbaum error at moszumanska.debian.org
Fri Oct 24 17:18:12 UTC 2014


This is an automated email from the git hooks/post-receive script.

error pushed a commit to branch master
in repository torbirdy.

commit 37d9f2efa6063c92c04b5b85f473c564e5385b86
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Fri Oct 24 16:48:31 2014 +0000

    Imported Upstream version 0.1.3
---
 ChangeLog                               | 165 ++++++++++++++++++++++++++++++++
 Makefile                                |  28 ++++++
 README.RELEASE                          |  20 ++++
 chrome.manifest                         |  15 ++-
 chrome/content/emailwizard.js           |  18 ++++
 chrome/content/preferences.js           |  31 +++---
 chrome/locale/ca/torbirdy.dtd           |  63 ++++++++++++
 chrome/locale/ca/torbirdy.properties    |  19 ++++
 chrome/locale/de/torbirdy.dtd           |  88 ++++++++---------
 chrome/locale/de/torbirdy.properties    |  10 +-
 chrome/locale/el/torbirdy.dtd           |  63 ++++++++++++
 chrome/locale/el/torbirdy.properties    |  19 ++++
 chrome/locale/en-GB/torbirdy.dtd        |  63 ++++++++++++
 chrome/locale/en-GB/torbirdy.properties |  19 ++++
 chrome/locale/he/torbirdy.dtd           |  36 +++----
 chrome/locale/hu/torbirdy.dtd           |  63 ++++++++++++
 chrome/locale/hu/torbirdy.properties    |  19 ++++
 chrome/locale/id/torbirdy.dtd           |  63 ++++++++++++
 chrome/locale/id/torbirdy.properties    |  19 ++++
 chrome/locale/ko/torbirdy.dtd           |  63 ++++++++++++
 chrome/locale/ko/torbirdy.properties    |  19 ++++
 chrome/locale/nb/torbirdy.dtd           |  63 ++++++++++++
 chrome/locale/nb/torbirdy.properties    |  19 ++++
 chrome/locale/pa/torbirdy.dtd           |  36 +++----
 chrome/locale/pa/torbirdy.properties    |   6 +-
 chrome/locale/pl/torbirdy.properties    |   2 +-
 chrome/locale/pt-BR/torbirdy.dtd        |  54 +++++------
 chrome/locale/pt-BR/torbirdy.properties |  18 ++--
 chrome/locale/pt/torbirdy.dtd           |  63 ++++++++++++
 chrome/locale/pt/torbirdy.properties    |  19 ++++
 chrome/locale/ro/torbirdy.dtd           |  63 ++++++++++++
 chrome/locale/ro/torbirdy.properties    |  19 ++++
 chrome/locale/ru/torbirdy.dtd           |  63 ++++++++++++
 chrome/locale/ru/torbirdy.properties    |  19 ++++
 chrome/locale/sk/torbirdy.dtd           |  63 ++++++++++++
 chrome/locale/sk/torbirdy.properties    |  19 ++++
 chrome/locale/sl/torbirdy.dtd           |  63 ++++++++++++
 chrome/locale/sl/torbirdy.properties    |  19 ++++
 chrome/locale/sr/torbirdy.dtd           |  68 +++++++++++++
 chrome/locale/sr/torbirdy.properties    |  19 ++++
 chrome/locale/sv/torbirdy.properties    |   6 +-
 chrome/locale/tr/torbirdy.dtd           |  18 ++--
 chrome/locale/tr/torbirdy.properties    |   2 +-
 chrome/locale/uk/torbirdy.dtd           |  63 ++++++++++++
 chrome/locale/uk/torbirdy.properties    |  19 ++++
 chrome/locale/zh-CN/torbirdy.dtd        |  63 ------------
 chrome/locale/zh-CN/torbirdy.properties |  19 ----
 components/torbirdy.js                  |  79 +++++++++++----
 gpg.conf                                |  91 ++++++++++++++++++
 import-translations.sh                  |  26 +++++
 install.rdf                             |   4 +-
 patches/date.patch                      |  70 ++++++++++++++
 patches/mailnewspref.patch              |  26 +++++
 patches/messageid.patch                 |  49 ++++++++++
 patches/unified.patch                   | 130 +++++++++++++++++++++++++
 55 files changed, 2004 insertions(+), 259 deletions(-)

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..020908e
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,165 @@
+0.1.3, 23 Oct 2014
+
+  * The default keyserver (hidden service) has been updated:
+    - hkp://qdigse2yzvuglcix.onion
+  * Show the Sender header in message pane (closes #10226)
+  * Draft messages on IMAP accounts are now saved locally (closes #10309)
+  * Restore preferences to the user's own defaults instead of Thunderbird's
+    (closes #10588)
+  * network.proxy.no_proxies_on is no longer set to "localhost, 127.0.0.1"
+    (thanks to Carsten N.)
+  * Disable automatic downloading of new messages for POP3 accounts
+    (closes #11188)
+  * Update the reply_header author behaviour (closes #13480)
+  * TorBirdy is now available in 31 languages:
+    * Arabic
+    * Catalan
+    * Czech
+    * Danish
+    * German
+    * Greek
+    * English (US)
+    * English (Great Britain)
+    * Spanish
+    * Basque
+    * French
+    * Hebrew
+    * Hungarian
+    * Indonesian
+    * Italian
+    * Korean
+    * Latvian
+    * Norwegian Bokmål 
+    * Norwegian Nynorsk	
+    * Punjabi
+    * Polish
+    * Portuguese	 
+    * Portuguese (Brazil)
+    * Romanian
+    * Russian
+    * Slovak
+    * Slovenian
+    * Serbian
+    * Swedish
+    * Turkish
+    * Ukrainian
+
+0.1.2, 04 Nov 2013
+
+  * New options:
+    - restore default TorBirdy settings
+    - toggle checking of new messages automatically for all accounts
+  * The minimum version of Thunderbird we now support is 10.0 (closes #9569)
+  * `--throw-keyids' is now disabled by default (closes #9648)
+  * We are no longer forcing Thunderbird updates (closes #8341)
+  * Add support for Thunderbird 24 (Gecko 17+) (closes #9673)
+  * Enhanced support for Thunderbird chat
+  * We have a new TorBirdy logo. Thanks to Nima Fatemi!
+  * Improved documentation:
+    - https://trac.torproject.org/projects/tor/wiki/torbirdy
+  * Add new translations and updated existing ones
+    - Please see the Transifex page for more information and credits
+
+0.1.1, 20 Mar 2013
+
+  * Add a dialog for new users that is shown during the first-run (closes #8238)
+  * Do not confirm before sending an email if Enigmail is enabled; default
+    behavior changed from 0.1.0 (user opt-in allowed through the preferences)
+  * Restore all account settings that were changed on uninstall
+  * Allow the user to use Thunderbird's automatic configuration wizard in case
+    they don't want to use our manual account configuration wizard
+  * Set the SOCKS port to 9150 to reflect the change in the latest TBB
+  * Add opt-out from TLS-specific settings (closes #8420)
+  * Allow additional keyservers to be used/changed (closes #8332)
+  * Add Korean translation (thanks to cwt96)
+  * Add Norwegian Bokmål translation (thanks to lateralus)
+  * Add Galician translation (thanks to tombouzada)
+
+0.1.0, 11 Feb 2013
+
+  * Our first release in the Beta release series! Hooray!
+  * Translation updates:
+    - Add Gujarati translation (Kartik Mistry)
+    - Add Dutch translation (thanks to Rejo Zenger)
+    - Add Serbian translation (thanks to Nikola Nenadic)
+    - Add Hungarian translation (thanks to vargaviktor)
+    - Add Italian translation (thanks to spawned76, Michele Orrù and jan)
+    - Add Basque translation (thanks to Antxon Baldarra)
+    - Add Latvian translation (thanks to Ojārs Balcers)
+    - Add Portuguese (BR) translation (thanks to Bruno Geronimo, Rafael Costa)
+    - Add Polish translation (thanks to bogdrozd)
+    - Add Greek translation (thanks to mitzie, konpas1986)
+    - Add Chinese (Simplied) translation (thanks to ln191810)
+    - Add Russian translation (thanks to Александр)
+    - Add Arabic translation (thanks to alshara3, Fadi Mansour)
+    - Update French translation (thanks for arpalord)
+    - Update Spanish translation (thanks to Juan Garofalo, strel)
+  * Added Transparent Torification mode for TorBirdy
+  * Disable all plugins
+  * Added opt-out from setting time zone to UTC
+  * Add Tor-JonDo-Preferences quick switch (patch by Karsten N)
+  * Support for Whonix (http://whonix.sourceforge.net/)
+  * Improved security: better SSL enforcement
+  * Add Tails support
+
+0.0.13, 28 Sept 2012
+  * Translation updates:
+    - Add Hebrew translation (thanks to Sharon Dvir)
+    - Add French translation (thanks to N3b)
+    - Update German translation (thanks to Karsten N)
+    -Add Spanish translation (thanks to Juan Garofalo)
+  * Code cleanup: prefixed generically-named IDs with TorBirdy namespace
+
+0.0.12, 27 Sept 2012
+  * TorBirdy now has localization support
+  * - Current languages: English, German (translated by Karsten N.), Punjabi
+  * TorBirdy code cleanup: fix global namespace pollution
+  * Do not select the last selected account to prevent automatic login
+  * - (TorBirdy selects 'Local Folders' on startup to prevent this)
+  * Restore proxy settings at TorBirdy uninstall
+  * - (settings prior to installation of TorBirdy)
+  * TorBirdy now allows HTTP/SSL connections
+  * Users may opt-out from `--throw-keyids'
+  * Enhanced TorBirdy JonDo support (thanks to Karsten N.)
+  * Fix a bug in 0.0.11 that prevented account preferences from being set
+  * Add Screenshots directory
+  * TorBirdy no longer requires a configured HTTP proxy for full use with Tor
+  * TorBirdy now enforces the safest HTTP proxy usage possible with GnuPG
+    TorBirdy attempts to disable all name resolution in GnuPG due to a serious
+    SOCKS5 problem with GnuPG proxy options to how we invoke GnuPG; GnuPG only
+    supports SOCKS5 when it is linked against libcurl (>7.21.7) and hostnames are
+    not used. This is outlined the following bug:
+    https://trac.torproject.org/projects/tor/ticket/2846
+
+0.0.11, 04 Aug 2012
+
+  * Implemented an algorithm to generate time-independent message-ID (apply
+    the patches in patches/ to a custom Thunderbird build)
+  * Remove the 'Reference' and 'In-Reply-To' headers when forwarding a message
+  * Implemented a preference setting for TorBirdy with support for adjusting:
+    - proxy settings
+    - account-specific settings
+  * Support for testing proxy settings: https://check.torproject.org
+  * Disable push email for IMAP
+  * Various other stability fixes
+
+0.0.10 Thu, 12 Jul 2012
+
+  * Don't check for messages on start up
+  * Now includes patch in source for upstream date header modifications
+    - Apply patches/date.patch to a custom Thunderbird compile
+  * Use SSL/TLS by default for both outgoing and incoming servers
+  * Disable 'Get new account' from loading at startup
+  * Set default server ports
+  * For already configured email accounts, disable automatic email fetching
+  * For accounts created through the manual account configuration, disable
+    automatic email fetching
+  * Added support for resetting user preferences on extension uninstall
+  * Various privacy fixes as suggested by Karsten N
+
+0.0.9 Fri, 06 Jul 2012
+
+  * Added ChangeLog to document feature progress
+  * Implemented basic preferences window
+    - Patch by Karsten N from JonDos
+    - Supports configuring Thunderbird for Tor or JonDos on the usual ports
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..5b1fe94
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,28 @@
+SHELL := /bin/bash
+VERSION := $(shell cat install.rdf|grep '<em:version>'|cut -d\> -f2|cut -d\< -f1)
+
+make-xpi:
+	zip -r ../torbirdy-$(VERSION).xpi * -x "debian/*" -x "patches/*" -x "ChangeLog" -x "Makefile" -x "gpg.conf" -x "import-translations.sh" -x "README.RELEASE"
+
+clean:
+	rm -f ../torbirdy-$(VERSION).xpi
+
+git-tag:
+	git tag -u 0xD255D3F5C868227F -s $(VERSION)
+
+git-push:
+	git push --tags
+	git push
+
+sign-release:
+	gpg -u 0xD255D3F5C868227F -abs ../torbirdy-${VERSION}.xpi$
+	sha1sum ../torbirdy-${VERSION}.xpi$
+
+push-release:
+	chmod 664 ../torbirdy-${VERSION}.xpi*$
+	scp ../torbirdy-${VERSION}.xpi* vescum.torproject.org:/srv/www-master.torproject.org/htdocs/dist/torbirdy/$
+	scp ../torbirdy-${VERSION}.xpi vescum.torproject.org:/srv/www-master.torproject.org/htdocs/dist/torbirdy/torbirdy-current.xpi$
+	scp ../torbirdy-${VERSION}.xpi.asc vescum.torproject.org:/srv/www-master.torproject.org/htdocs/dist/torbirdy/torbirdy-current.xpi.asc$
+	ssh vescum.torproject.org ~mirroradm/bin/trigger-mirrors
+	
+release: sign-release push-release
diff --git a/README.RELEASE b/README.RELEASE
new file mode 100644
index 0000000..f398409
--- /dev/null
+++ b/README.RELEASE
@@ -0,0 +1,20 @@
+To perform a release for TorBirdy:
+
+  Perform substantial development effort or patch security issues
+  Review all changes with at least one other person
+  Update ChangeLog to refelect all changes and add a release date
+  Run `make` and test the resulting xpi
+  Confirm that there are no issues with normal use on The Big Three platforms
+  Confirm that the error console does not have any errors related to TorBirdy
+  Tag, sign and push the signatures to git:
+    Run `make git-tag` and sign a tag for this release
+    Run `make git-push` and push the tag upstream
+  Make detached signature for non-git users:
+    Run `make sign-release` and sign the .xpi file
+  Upload packages to the Tor Project webserver:
+    Run `push-release` and the packages are uploaded
+  Upload the package to Mozilla's AddOn site manually
+  Write a blog post anouncing the release on the Tor Project blog
+  Write an email anouncing the release to tor-talk
+  Announce the release widely in whatever format is reasonable or desired
+ 
diff --git a/chrome.manifest b/chrome.manifest
index d0aaef6..79134aa 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -9,22 +9,35 @@ contract @torproject.org/torbirdy;1 {ebd85413-18c8-4265-a708-a8890ec8d1ed}
 category profile-after-change TorBirdy @torproject.org/torbirdy;1
 
 locale castironthunderbirdclub ar chrome/locale/ar/
+locale castironthunderbirdclub ca chrome/locale/ca/
 locale castironthunderbirdclub cs chrome/locale/cs/
 locale castironthunderbirdclub da chrome/locale/da/
 locale castironthunderbirdclub de chrome/locale/de/
+locale castironthunderbirdclub el chrome/locale/el/
 locale castironthunderbirdclub en chrome/locale/en/
+locale castironthunderbirdclub en-GB chrome/locale/en-GB/
 locale castironthunderbirdclub es chrome/locale/es/
 locale castironthunderbirdclub eu chrome/locale/eu/
 locale castironthunderbirdclub fr chrome/locale/fr/
 locale castironthunderbirdclub he chrome/locale/he/
+locale castironthunderbirdclub hu chrome/locale/hu/
+locale castironthunderbirdclub id chrome/locale/id/
 locale castironthunderbirdclub it chrome/locale/it/
+locale castironthunderbirdclub ko chrome/locale/ko/
 locale castironthunderbirdclub lv chrome/locale/lv/
+locale castironthunderbirdclub nb chrome/locale/nb/
 locale castironthunderbirdclub nl chrome/locale/nl/
 locale castironthunderbirdclub pa chrome/locale/pa/
 locale castironthunderbirdclub pl chrome/locale/pl/
+locale castironthunderbirdclub pt chrome/locale/pt/
 locale castironthunderbirdclub pt-BR chrome/locale/pt-BR/
+locale castironthunderbirdclub ro chrome/locale/ro/
+locale castironthunderbirdclub ru chrome/locale/ru/
+locale castironthunderbirdclub sk chrome/locale/sk/
+locale castironthunderbirdclub sl chrome/locale/sl/
+locale castironthunderbirdclub sr chrome/locale/sr/
 locale castironthunderbirdclub sv chrome/locale/sv/
 locale castironthunderbirdclub tr chrome/locale/tr/
-locale castironthunderbirdclub zh-CN chrome/locale/zh-CN/
+locale castironthunderbirdclub uk chrome/locale/uk/
 
 skin castironthunderbirdclub classic/1.0 chrome/skin/
diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js
index d4b2c3a..2f2a6a7 100644
--- a/chrome/content/emailwizard.js
+++ b/chrome/content/emailwizard.js
@@ -83,6 +83,24 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() {
       var checkNewMailPref = checkNewMail.replace("%serverkey%", serverkey);
       prefs.setBoolPref(checkNewMailPref, false);
 
+      // Make sure that drafts are saved to Local Folders if it is an IMAP account.
+      if (protocol === "imap") {
+        var identity = newAccount.defaultIdentity;
+        identity.draftFolder = "mailbox://nobody@Local%20Folders/Drafts";
+      }
+
+      // Do not check for new messages at startup.
+      var loginAtStartup = 'mail.server.%serverkey%.login_at_startup';
+      var loginAtStartupPref = loginAtStartup.replace("%serverkey%", serverkey);
+      prefs.setBoolPref(loginAtStartupPref, false);
+
+      // Do not automatically download new messages.
+      if (protocol === "pop3") {
+        var downloadOnBiff = 'mail.server.%serverkey%.download_on_biff';
+        var downloadOnBiffPref = downloadOnBiff.replace("%serverkey%", serverkey);
+        prefs.setBoolPref(downloadOnBiffPref, false);
+      }
+
       // From comm-release/mailnews/base/prefs/content/accountcreation/emailWizard.js : onAdvancedSetup().
       var windowManager = Cc["@mozilla.org/appshell/window-mediator;1"]
           .getService(Ci.nsIWindowMediator);
diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js
index 80a192b..1930f98 100644
--- a/chrome/content/preferences.js
+++ b/chrome/content/preferences.js
@@ -7,7 +7,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() {
   pub.prefBranch = "extensions.torbirdy.";
   pub.customBranch = "extensions.torbirdy.custom.";
 
-  pub.torKeyserver = "hkp://2eghzlv2wwcq7u7y.onion";
+  pub.torKeyserver = "hkp://qdigse2yzvuglcix.onion";
   pub.jondoKeyserver = "hkp://pool.sks-keyservers.net";
 
   pub.prefs = Components.classes["@mozilla.org/preferences-service;1"]
@@ -144,22 +144,19 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() {
     var mailAccounts = [];
     var accounts = pub.acctMgr.accounts;
 
-    // Maintain Gecko 17+ and Gecko < 17 compatibility.
-    if (accounts.queryElementAt) {
-      for (var i = 0; i < accounts.length; i++) {
-        var account = accounts.queryElementAt(i, Components.interfaces.nsIMsgAccount).incomingServer;
-        var name = account.prettyName;
-        if (!(name === "Local Folders")) {
-          mailAccounts.push(account);
-        }
-      }
-    } else {
-      for (var i = 0; i < accounts.Count(); i++) {
-        var account = accounts.QueryElementAt(i, Components.interfaces.nsIMsgAccount).incomingServer;
-        var name = account.prettyName;
-        if (!(name === "Local Folders")) {
-          mailAccounts.push(account);
-        }
+    // To maintain compatibility between Gecko 17+ and Gecko < 17.
+    var newGecko = (accounts.queryElementAt) ? true : false;
+
+    var accountLength = newGecko ? accounts.length : accounts.Count();
+
+    for (var i = 0; i < accountLength; i++) {
+      var account = (newGecko) ?
+                    accounts.queryElementAt(i, Components.interfaces.nsIMsgAccount).incomingServer :
+                    accounts.QueryElementAt(i, Components.interfaces.nsIMsgAccount).incomingServer;
+
+      var name = account.prettyName;
+      if (!(name === "Local Folders")) {
+        mailAccounts.push(account);
       }
     }
     return mailAccounts;
diff --git a/chrome/locale/ca/torbirdy.dtd b/chrome/locale/ca/torbirdy.dtd
new file mode 100644
index 0000000..cf1812f
--- /dev/null
+++ b/chrome/locale/ca/torbirdy.dtd
@@ -0,0 +1,63 @@
+<!ENTITY torbirdy.accountprefs.title "Configuració del compte">
+<!ENTITY torbirdy.accountprefs.startup.label "En iniciar, comprova si hi ha missatges nous">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
+<!ENTITY torbirdy.accountprefs.minutes.label "Comprova si hi ha missatges nous cada">
+<!ENTITY torbirdy.accountprefs.minutes.key "r">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minuts">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancel·la">
+<!ENTITY torbirdy.accountprefs.save.button "Desa">
+<!ENTITY torbirdy.accountprefs.save.key "S">
+
+<!ENTITY torbirdy.prefs.title "Preferències TorBirdy">
+<!ENTITY torbirdy.prefs.save.button "Desa">
+<!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 "Configuració del servidor intermediari de prova">
+<!ENTITY torbirdy.prefs.testproxy.key "p">
+<!ENTITY torbirdy.prefs.proxy.label "Servidor intermedi">
+<!ENTITY torbirdy.prefs.privacy.label "Privadesa">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Seguretat">
+<!ENTITY torbirdy.prefs.recommended.text "Utilitzar la configuració del servidor intermediari recomanat per TorBirdy (Tor)">
+<!ENTITY torbirdy.prefs.recommended.key "r">
+<!ENTITY torbirdy.prefs.anonservice.text "Tria un servei de forma anònima">
+<!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 "SOCKS Amfitrió: ">
+<!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 "Torificació Transparent (alerta: requereix un router Tor o un proxy transparent ambdós personalitzats)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Activa el suport de correu push per a comptes IMAP [per defecte: desactivat]">
+<!ENTITY torbirdy.prefs.imap.key "p">
+<!ENTITY torbirdy.prefs.startup_folder.label "Selecciona la carpeta de l'últim correu obert a l'inici [per defecte: desactivat]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "No configuris Thunderbird amb el time zone de UTC [per defecte: si]">
+<!ENTITY torbirdy.prefs.timezone.key "p">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "No posis les claus ID dels destinataris en els missatges xifrats [per defecte: si]">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
+<!ENTITY torbirdy.prefs.confirmemail.label "Abans d'enviar el mail, confirmar si Enigmail es troba activat [Predeterminat: No confirmar]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Activa l'ajuda de configuració automàtica per Thunderbird [per defecte: desactivat]">
+<!ENTITY torbirdy.prefs.emailwizard.key "p">
+<!ENTITY torbirdy.prefs.automatic.label "Revisa els nous missatges automàticament per a tots els comptes [per defecte: desactivat]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Permetre connexions a servidors que no suporten SSL/TLS amb renegociació segura [per defecte: no permès]">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
+<!ENTITY torbirdy.prefs.account_specific "Per compte">
+<!ENTITY torbirdy.prefs.select_account.key "C">
+<!ENTITY torbirdy.prefs.select_account.label "Trieu un compte:">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) a utilitzar:">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
+
+<!ENTITY torbirdy.panel.usetor.label "Utilitzar Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Utilitza JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Utilitzar Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Obre Opcions de TorBirdy">
+
+<!ENTITY torbirdy.firstrun.title "Primer inici de TorBirdy">
diff --git a/chrome/locale/ca/torbirdy.properties b/chrome/locale/ca/torbirdy.properties
new file mode 100644
index 0000000..f17af26
--- /dev/null
+++ b/chrome/locale/ca/torbirdy.properties
@@ -0,0 +1,19 @@
+torbirdy.name=TorBirdy
+
+torbirdy.enabled.tor=TorBirdy activat: Tor
+torbirdy.enabled.jondo=TorBirdy activat: JonDo
+torbirdy.enabled.custom=TorBirdy activat: Passarel·la personalitzada
+torbirdy.enabled.torification=TorBird Activat: Tor transparent
+torbirdy.enabled.whonix=TorBirdy Activat: Whonix
+torbirdy.disabled=TorBirdy: Desactivat
+
+torbirdy.email.prompt=TorBirdy ha desactivat la configuraciño automàtica de l'asssistent Thunderbird per a protegir-vos.\n\nLa configuració de seguretat recomanada de %S s'ha establert.\n\nAra podeu configurar altres comptes manualment.
+
+torbirdy.email.advanced=No es recomana que canvieu la configuració avançada de TordBirdy.\n\nContinueu només si sabeu què esteu fent.
+torbirdy.email.advanced.nextwarning=Avisa'm la propera vegada
+torbirdy.email.advanced.title=Configuració Avançada TorBirdy
+
+torbirdy.restart=Les preferències de zona horària tindran efecte quan reinicieu Thuderbird.
+
+torbirdy.firstrun=Estas usant TorBirdy.\n\nPer ajudar a protegir el teu anonimat, TorBirdy enfortira la configuració de Thinderbird, evitant aixi de ser canviat per tu o per algun complement. Hi han algunes opcions que poden ser cambiades via eldialeg de preferencies de TorBirdy. Quan TorBirdy es desinstala o es deshabilita, totes les configuracions que hansigut canviades es restauren al seu estat orginal (les opcions ficades despres de la instalació de TorBirdy)\n\nSi es un nou usuari,  [...]
+torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/chrome/locale/de/torbirdy.dtd b/chrome/locale/de/torbirdy.dtd
index 65a7049..ff2ce4a 100644
--- a/chrome/locale/de/torbirdy.dtd
+++ b/chrome/locale/de/torbirdy.dtd
@@ -1,63 +1,63 @@
-<!ENTITY torbirdy.accountprefs.title "Konten Konfiguration">
+<!ENTITY torbirdy.accountprefs.title "Kontokonfiguration">
 <!ENTITY torbirdy.accountprefs.startup.label "Beim Start auf neue Nachrichten prüfen">
-<!ENTITY torbirdy.accountprefs.startup.key "n">
+<!ENTITY torbirdy.accountprefs.startup.key "B">
 <!ENTITY torbirdy.accountprefs.minutes.label "Auf neue Nachrichten alle">
-<!ENTITY torbirdy.accountprefs.minutes.key "m">
+<!ENTITY torbirdy.accountprefs.minutes.key "A">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "Minuten prüfen">
 <!ENTITY torbirdy.accountprefs.cancel.button "Abbrechen">
 <!ENTITY torbirdy.accountprefs.save.button "Speichern">
 <!ENTITY torbirdy.accountprefs.save.key "S">
 
-<!ENTITY torbirdy.prefs.title "TorBirdy Einstellungen">
+<!ENTITY torbirdy.prefs.title "TorBirdy-Einstellungen">
 <!ENTITY torbirdy.prefs.save.button "Speichern">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Abbrechen">
-<!ENTITY torbirdy.prefs.extra2.button "Stelle Einstellungen zurück auf Standard">
-<!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "Proxyeinstellungen Testen">
-<!ENTITY torbirdy.prefs.testproxy.key "n">
-<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.extra2.button "Auf Vorgaben zurücksetzen">
+<!ENTITY torbirdy.prefs.extra2.key "z">
+<!ENTITY torbirdy.prefs.testproxy.button "Vermittlungsservereinstellungen testen">
+<!ENTITY torbirdy.prefs.testproxy.key "t">
+<!ENTITY torbirdy.prefs.proxy.label "Vermittlungsserver">
 <!ENTITY torbirdy.prefs.privacy.label "Privatsphäre">
 <!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
 <!ENTITY torbirdy.prefs.security.label "Sicherheit">
-<!ENTITY torbirdy.prefs.recommended.text "Empfohlene Proxy Einstellungen für TorBirdy (Tor)">
-<!ENTITY torbirdy.prefs.recommended.key "r">
+<!ENTITY torbirdy.prefs.recommended.text "Die empfohlenen Vermittlungsservereinstellungen für TorBirdy (Tor) benutzen">
+<!ENTITY torbirdy.prefs.recommended.key "D">
 <!ENTITY torbirdy.prefs.anonservice.text "Anonymisierungsdienst auswählen">
-<!ENTITY torbirdy.prefs.anonservice.key "a">
-<!ENTITY torbirdy.prefs.customsettings.text "Benutzerdefinierte Proxy Einstellungen">
-<!ENTITY torbirdy.prefs.customsettings.key "b">
-<!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 (Achtung: Benötigt Benutzerspezifischer transproxy oder TOR)">
-<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.anonservice.key "A">
+<!ENTITY torbirdy.prefs.customsettings.text "Benutzerdefinierte Vermittlungsservereinstellungen benutzen">
+<!ENTITY torbirdy.prefs.customsettings.key "B">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS-Rechner:">
+<!ENTITY torbirdy.prefs.socks_host.key "S">
+<!ENTITY torbirdy.prefs.socks_port.label "Anschluss:">
+<!ENTITY torbirdy.prefs.socks_port.key "A">
+<!ENTITY torbirdy.prefs.torification.label "Transparente Torification (Achtung: erfordert benutzerdefinierten transproxy oder TOR-Router)">
+<!ENTITY torbirdy.prefs.torification.key "T">
 <!ENTITY torbirdy.prefs.global "Global">
-<!ENTITY torbirdy.prefs.imap.label "Push E-Mail Support für IMAP-Konten aktivieren [default: deaktiviert]">
-<!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "Beim Start zum zuletzt aktiven Mail-Ordner wechseln [default: deaktiviert]">
-<!ENTITY torbirdy.prefs.startup_folder.key "l">
-<!ENTITY torbirdy.prefs.timezone.label "Setzen Sie Thunderbirds Zeitzone nicht auch UTC [standard: auf UTC setzen]">
-<!ENTITY torbirdy.prefs.timezone.key "z">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Die Empfänger-Schlüssel-ID nicht in Verschlüsselte Nachrichten einbinden [default: mit einbinden]">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "Vor dem absenden einer Email überprüfen, ob Enigmail aktiviert ist [standard: nicht überprüfen]">
-<!ENTITY torbirdy.prefs.confirmemail.key "b">
-<!ENTITY torbirdy.prefs.emailwizard.label "Thunderbird's automatischen Email-Konfigurator aktivieren [standard: deaktiviert]">
-<!ENTITY torbirdy.prefs.emailwizard.key "w">
-<!ENTITY torbirdy.prefs.automatic.label "Prüfe automatisch nach neuen Nachrichten für alle Accounts [Standard: deaktiviert]">
-<!ENTITY torbirdy.prefs.automatic.key "f">
-<!ENTITY torbirdy.prefs.renegotiation.label "Verbindungen zu Servern erlauben, die kein SSL/TLS mit sicherer Renegotiation unterstützen [standard: nicht erlauben]">
-<!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "Konten-spezifisch">
-<!ENTITY torbirdy.prefs.select_account.key "C">
+<!ENTITY torbirdy.prefs.imap.label "Push-E-Mail-Unterstützung für IMAP-Konten aktivieren [Vorgabe: deaktiviert]">
+<!ENTITY torbirdy.prefs.imap.key "P">
+<!ENTITY torbirdy.prefs.startup_folder.label "Beim Start zum letzten aktiven Nachrichtenordner wechseln [Vorgabe: deaktiviert]">
+<!ENTITY torbirdy.prefs.startup_folder.key "B">
+<!ENTITY torbirdy.prefs.timezone.label "Thunderbirds Zeitzone nicht auf UTC einstellen [Vorgabe: auf UTC eingestellt]">
+<!ENTITY torbirdy.prefs.timezone.key "T">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Die Empfängerschlüsselkennung nicht in verschlüsselte Nachrichten einbinden [Vorgabe: mit einbinden]">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "D">
+<!ENTITY torbirdy.prefs.confirmemail.label "Vor dem Versenden einer E-Mail überprüfen, ob Enigmail aktiviert ist [Vorgabe: nicht überprüfen]">
+<!ENTITY torbirdy.prefs.confirmemail.key "V">
+<!ENTITY torbirdy.prefs.emailwizard.label "Thunderbirds automatischen E-Mail-Konfigurationsassistenten aktivieren [Vorgabe: deaktiviert]">
+<!ENTITY torbirdy.prefs.emailwizard.key "T">
+<!ENTITY torbirdy.prefs.automatic.label "Automatisch auf neue Nachrichten für alle Konten prüfen [Vorgabe: deaktiviert]">
+<!ENTITY torbirdy.prefs.automatic.key "A">
+<!ENTITY torbirdy.prefs.renegotiation.label "Verbindungen zu Servern erlauben, die kein SSL/TLS mit sicherer Neuverhandlung unterstützen [Vorgabe: nicht erlauben]">
+<!ENTITY torbirdy.prefs.renegotiation.key "V">
+<!ENTITY torbirdy.prefs.account_specific "Bestimmtes Konto">
+<!ENTITY torbirdy.prefs.select_account.key "K">
 <!ENTITY torbirdy.prefs.select_account.label "Konto auswählen: ">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Folgende Keyserver benutzen:">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Folgende(n) Schlüssel-Server benutzen:">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "F">
 
 <!ENTITY torbirdy.panel.usetor.label "Tor Onion Router benutzen">
-<!ENTITY torbirdy.panel.usejondo.label "JonDo (Premium) nutzen">
-<!ENTITY torbirdy.panel.usewhonix.label "Whonix nutzen">
-<!ENTITY torbirdy.panel.preferences.label "TorBirdy Einstellungen öffnen">
+<!ENTITY torbirdy.panel.usejondo.label "JonDo (Premium) benutzen">
+<!ENTITY torbirdy.panel.usewhonix.label "Whonix benutzen">
+<!ENTITY torbirdy.panel.preferences.label "TorBirdy-Einstellungen öffnen">
 
-<!ENTITY torbirdy.firstrun.title "TorBirdy's Erster Start">
+<!ENTITY torbirdy.firstrun.title "TorBirdys erster Start">
diff --git a/chrome/locale/de/torbirdy.properties b/chrome/locale/de/torbirdy.properties
index 374f47a..ce42831 100644
--- a/chrome/locale/de/torbirdy.properties
+++ b/chrome/locale/de/torbirdy.properties
@@ -7,13 +7,13 @@ torbirdy.enabled.torification=TorBirdy Aktiv:    Transparent Torification
 torbirdy.enabled.whonix=TorBirdy Aktiv:    Whonix
 torbirdy.disabled=TorBirdy:    Deaktiviert!
 
-torbirdy.email.prompt=TorBirdy hat den Assistenten für die Kontenerstellung deaktiviert um Ihre Anonymität zu schützen.\n\nDie empfohlenen Sicherheitseinstellungen wurden für %S aktiviert.\n\nSie können das Konto manuell konfigurieren.
+torbirdy.email.prompt=TorBirdy hat den Assistenten für die Kontenerstellung deaktiviert um Ihre Anonymität zu schützen.\n\nDie empfohlenen Sicherheitseinstellungen wurden für %S aktiviert.\n\nSie können die anderen Kontoeinstellungen manuell konfigurieren.
 
 torbirdy.email.advanced=Es wird NICHT empfohlen, die erweiterten Einstellungen von TorBirdy zu ändern.\n\nSie sollten nur fortfahren, wenn Sie genau wissen, was Sie tun.
-torbirdy.email.advanced.nextwarning=Zeige diese Warnung weiterhin an
-torbirdy.email.advanced.title=TorBirdy Erweiterte Einstellungen
+torbirdy.email.advanced.nextwarning=Diese Warnung weiterhin anzeigen
+torbirdy.email.advanced.title=TorBirdy erweiterte Einstellungen
 
-torbirdy.restart=Sie müssen Thunderbird neu starten, um die Zeitzonen-Einstellungen zu übernehmen.
+torbirdy.restart=Damit die Änderungen an der Zeitzoneneinstellung wirksam werden, starten Sie bitte Thunderbird neu.
 
-torbirdy.firstrun=Sie benutzen jetzt TorBirdy.\n\nUm Ihre Anonymität zu schützen, wird TorBirdy die angepassten Einstellungen von Thunderbird vor Änderungen schützen. Einige Einstellungen können über die entsprechenden TorBirdy-Dialoge verändert werden. Sollte TorBirdy deinstalliert oder deaktiviert werden, werden alle Thunderbird Einstellungen zurück auf ihre Standardwerte gesetzt (also die Werte, die vor der Installation eingestellt waren).\n\nNeuen Benutzern empfehlen wir die TorBirdy [...]
+torbirdy.firstrun=Sie benutzen jetzt TorBirdy.\n\nUm Ihre Anonymität zu schützen, wird TorBirdy die angepassten Einstellungen von Thunderbird vor Änderungen schützen. Einige Einstellungen können über die entsprechenden TorBirdy-Dialoge verändert werden. Sollte TorBirdy deinstalliert oder deaktiviert werden, werden alle Thunderbird-Einstellungen zurück auf ihre Standardwerte gesetzt (also die Werte, die vor der Installation eingestellt waren).\n\nNeuen Benutzern empfehlen wir die TorBirdy [...]
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/chrome/locale/el/torbirdy.dtd b/chrome/locale/el/torbirdy.dtd
new file mode 100644
index 0000000..50766cc
--- /dev/null
+++ b/chrome/locale/el/torbirdy.dtd
@@ -0,0 +1,63 @@
+<!ENTITY torbirdy.accountprefs.title "Ρύθμιση λογαριασμού">
+<!ENTITY torbirdy.accountprefs.startup.label "Έλεγχος για νέα μηνύματα κατά την εκκίνηση">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
+<!ENTITY torbirdy.accountprefs.minutes.label "Έλεγχος για νέα μηνύματα κάθε">
+<!ENTITY torbirdy.accountprefs.minutes.key "y">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "λεπτά">
+<!ENTITY torbirdy.accountprefs.cancel.button "Ακύρωση">
+<!ENTITY torbirdy.accountprefs.save.button "Αποθήκευση">
+<!ENTITY torbirdy.accountprefs.save.key "S">
+
+<!ENTITY torbirdy.prefs.title "Ρυθμίσεις TorBirdy ">
+<!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 "d">
+<!ENTITY torbirdy.prefs.testproxy.button "Έλεγχος Ρυθμίσεων Proxy">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Ιδιωτικότητα">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Ασφάλεια">
+<!ENTITY torbirdy.prefs.recommended.text "Χρήση των προτεινόμενων ρυθμίσεων Proxy για το TorBirdy (Tor)">
+<!ENTITY torbirdy.prefs.recommended.key "r">
+<!ENTITY torbirdy.prefs.anonservice.text "Επιλογή μιας υπηρεσίας ανωνυμίας">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
+<!ENTITY torbirdy.prefs.customsettings.text "Χρήση προσαρμοσμένων ρυθμίσεων proxy">
+<!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 "Θύρα">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
+<!ENTITY torbirdy.prefs.torification.label "Ξεχωριστό Torification">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Παγκόσμια">
+<!ENTITY torbirdy.prefs.imap.label "Ενεργοποίηση push email για υποστήριξη IMAP λογαριασμών [προεπιλογή: απενεργοποιημένο]">
+<!ENTITY torbirdy.prefs.imap.key "p">
+<!ENTITY torbirdy.prefs.startup_folder.label "Επιλογή του τελευταίου ανοιγμένου φακέλου αλληλλογραφίας κατά την εκκίνηση [προεπιλογή : απενεργοποιημένο]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Μην ορίσετε τη ζώνη ώρας του Thunderbird σε UTC [προεπιλογή: ορίστηκε σε UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "ζ">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Να μην τοποθετητούν τα key ID του παραλήπτη στα κρυπτογραφημένα μηνήματα [προεπιλογή : τοποθέτηση]">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "ρ">
+<!ENTITY torbirdy.prefs.confirmemail.label "Επιβεβαιωση πριν την αποστολη του email αν το Enigmail ειναι ενεργοποιημενο [προκαθορισμος: καμμια επιβεβαιωση]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Ενεργοποίηση αυτόματης ρύθμισης παραμέτρων ηλεκτρονικού ταχυδρομείου Thunderbird του οδηγού [προεπιλογή: απενεργοποιημένο]">
+<!ENTITY torbirdy.prefs.emailwizard.key "β">
+<!ENTITY torbirdy.prefs.automatic.label "Αυτόματος έλεγχος νέων μηνυμάτων για όλους τους λογαριασμούς [προεπιλογή: απενεργοποιημένο]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Να επιτρέπονται συνδέσεις σε διακομιστές που δεν υποστηρίζουν SSL / TLS με ασφαλή επαναδιαπραγμάτευση [προεπιλογή: να μην επιτρέπονται] ">
+<!ENTITY torbirdy.prefs.renegotiation.key "ρ">
+<!ENTITY torbirdy.prefs.account_specific "Ειδικός λογαριασμός">
+<!ENTITY torbirdy.prefs.select_account.key "C">
+<!ENTITY torbirdy.prefs.select_account.label "Επιλογή ενός λογαριασμού">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) για χρησιμοποιηση: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "κ">
+
+<!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 "TorBirdy πρωτη εκκινηση">
diff --git a/chrome/locale/el/torbirdy.properties b/chrome/locale/el/torbirdy.properties
new file mode 100644
index 0000000..a07d9a4
--- /dev/null
+++ b/chrome/locale/el/torbirdy.properties
@@ -0,0 +1,19 @@
+torbirdy.name=TorBirdy
+
+torbirdy.enabled.tor=Το TorBirdy ενεργοποιήθηκε: Tor
+torbirdy.enabled.jondo=Το TorBirdy ενεργοποιήθηκε: JonDo
+torbirdy.enabled.custom=Το TorBirdy ενεργοποιήθηκε: προσαρμοσμένος Proxy
+torbirdy.enabled.torification=Το TorBirdy ενεργοποιήθηκε: Μεμονωμένο Torification
+torbirdy.enabled.whonix=Το TorBirdy ενεργοποιήθηκε: Whonix
+torbirdy.disabled=TorBirdy: Απενεργοποιημένο!
+
+torbirdy.email.prompt=Το TorBirdy έχει απενεργοποιήσει τον οδηγό αυτόματων ρυθμίσεων για να προστατεύσει την ανωνυμία σας.\n\nΟι προτεινόμενες ρυθμίσεις ασφαλείας για το%S έχουν εφαρμοστεί.\n\nΤώρα μπορείτε να ρυθμίσετε τις ρυθμίσεις των άλλων λογαριασμών χειροκίνητα 
+
+torbirdy.email.advanced=Παρακαλώ σημειώστε ότι αλλάζοντας τις ρυθμίσεις για προχωρημένους στο TorBirdy ΔΕΝ συνιστάται.\n\nΝα συνεχίσετε μόνο αν γνωρίζετε πολύ καλά τι κάνετε.
+torbirdy.email.advanced.nextwarning=Δείξε μου αυτή την ειδοποίηση την επόμενη φορά 
+torbirdy.email.advanced.title=TorBirdy: Ρυθμίσεις για προχωρημένους 
+
+torbirdy.restart=Πρέπει να κάνετε επανεκκίνηση του Thunderbird για να τεθεί σε ισχύ η προτίμηση ζώνης ώρας.
+
+torbirdy.firstrun=You are now running TorBirdy.⏎ ⏎ To help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).⏎ ⏎ If you are a new user, it is recom [...]
+torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/chrome/locale/en-GB/torbirdy.dtd b/chrome/locale/en-GB/torbirdy.dtd
new file mode 100644
index 0000000..3e22539
--- /dev/null
+++ b/chrome/locale/en-GB/torbirdy.dtd
@@ -0,0 +1,63 @@
+<!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">
+<!ENTITY torbirdy.accountprefs.save.button "Save">
+<!ENTITY torbirdy.accountprefs.save.key "S">
+
+<!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 "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 "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 "TorBirdy First-Run">
diff --git a/chrome/locale/en-GB/torbirdy.properties b/chrome/locale/en-GB/torbirdy.properties
new file mode 100644
index 0000000..fcc69a3
--- /dev/null
+++ b/chrome/locale/en-GB/torbirdy.properties
@@ -0,0 +1,19 @@
+torbirdy.name=TorBirdy
+
+torbirdy.enabled.tor=TorBirdy Enabled:    Tor
+torbirdy.enabled.jondo=TorBirdy Enabled:    JonDo
+torbirdy.enabled.custom=TorBirdy Enabled:    Custom Proxy
+torbirdy.enabled.torification=TorBirdy Enabled:    Transparent Torification
+torbirdy.enabled.whonix=TorBirdy Enabled:    Whonix
+torbirdy.disabled=TorBirdy:    Disabled!
+
+torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
+
+torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
+torbirdy.email.advanced.nextwarning=Show this warning next time
+torbirdy.email.advanced.title=TorBirdy Advanced Settings
+
+torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+
+torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recom [...]
+torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/chrome/locale/he/torbirdy.dtd b/chrome/locale/he/torbirdy.dtd
index bb5d15f..3047397 100644
--- a/chrome/locale/he/torbirdy.dtd
+++ b/chrome/locale/he/torbirdy.dtd
@@ -1,5 +1,5 @@
-<!ENTITY torbirdy.accountprefs.title "הגדרות החשבון">
-<!ENTITY torbirdy.accountprefs.startup.label "בדוק אם התקבלו הודעות חדשות בעת ההפעלה">
+<!ENTITY torbirdy.accountprefs.title "תצורת החשבון">
+<!ENTITY torbirdy.accountprefs.startup.label "בדוק אם התקבלו הודעות חדשות בעת הפעלה">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "בדוק אם התקבלו הודעות חדשות בכל">
 <!ENTITY torbirdy.accountprefs.minutes.key "y">
@@ -8,11 +8,11 @@
 <!ENTITY torbirdy.accountprefs.save.button "שמור">
 <!ENTITY torbirdy.accountprefs.save.key "S">
 
-<!ENTITY torbirdy.prefs.title "הגדדרות עבור TorBirdy">
+<!ENTITY torbirdy.prefs.title "העדפות TorBirdy">
 <!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.button "שחזר ברירות מחדל">
 <!ENTITY torbirdy.prefs.extra2.key "d">
 <!ENTITY torbirdy.prefs.testproxy.button "בחן הגדרות Proxy">
 <!ENTITY torbirdy.prefs.testproxy.key "n">
@@ -20,34 +20,34 @@
 <!ENTITY torbirdy.prefs.privacy.label "פרטיות">
 <!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
 <!ENTITY torbirdy.prefs.security.label "אבטחה">
-<!ENTITY torbirdy.prefs.recommended.text "השתמש בהגדרות המומלצות עבור TorBirdy ‏(Tor)">
+<!ENTITY torbirdy.prefs.recommended.text "השתמש בהגדרות פרוקסי מומלצות עבור TorBirdy ‏(Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "בחר שרות עבור אלמוניות">
+<!ENTITY torbirdy.prefs.anonservice.text "בחר שרות אלמוניות">
 <!ENTITY torbirdy.prefs.anonservice.key "a">
-<!ENTITY torbirdy.prefs.customsettings.text "השתמש בהגדרות מותאמות אישית עבור שרת הפרוקסי">
+<!ENTITY torbirdy.prefs.customsettings.text "השתמש בהגדרות פרוקסי מותאמות אישית">
 <!ENTITY torbirdy.prefs.customsettings.key "c">
-<!ENTITY torbirdy.prefs.socks_host.label "כתובת שרת פרוקסי מסוג SOCKS: ">
+<!ENTITY torbirdy.prefs.socks_host.label "מארח SOCKS: ">
 <!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 "שקוף Torification (אזהרה: נדרש transproxy מותאם או נתב Tor)">
+<!ENTITY torbirdy.prefs.torification.label "‏Torification שקוף (אזהרה: נדרש transproxy מותאם או נתב Tor)">
 <!ENTITY torbirdy.prefs.torification.key "t">
 <!ENTITY torbirdy.prefs.global "גלובאלי">
-<!ENTITY torbirdy.prefs.imap.label "אפשר תמיכה בדחיפת דואר על ידי השרת לחשבונות מסוג IMAP [ברירת מחדל: מנוטרל]">
+<!ENTITY torbirdy.prefs.imap.label "אפשר תמיכת דחיפת דוא״ל עבור חשבונות IMAP [ברירת מחדל: מנוטרל]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "בעת הפעלה, בחר בתיקיית הדואר שנפתחה אחרונה [ברירת מחדל: מנוטרל]">
+<!ENTITY torbirdy.prefs.startup_folder.label "בחר את תיקיית הדואר האחרונה אשר נבחרה בעת הפעלה [ברירת מחדל: מנוטרל]">
 <!ENTITY torbirdy.prefs.startup_folder.key "l">
-<!ENTITY torbirdy.prefs.timezone.label "אל תקבע את איזור הזמן של Thunderbird לUTC [ברירת מחדל: קבע לUTC]">
+<!ENTITY torbirdy.prefs.timezone.label "אל תקבע את אזור הזמן של Thunderbird אל UTC [ברירת מחדל: קבע אל UTC]">
 <!ENTITY torbirdy.prefs.timezone.key "z">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "אל תשים את מזהי מפתח המקבל בתוך הודעות מוצפנות [ברירת מחדל: השם]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "וודא לפני שליחה כאשר אניגמייל מופעל [ברירת מחדל: אל תוודא]">
+<!ENTITY torbirdy.prefs.confirmemail.label "וודא טרם שליחת דוא״ל כי Enigmail מאופשר [ברירת מחדל: אל תוודא]">
 <!ENTITY torbirdy.prefs.confirmemail.key "c">
-<!ENTITY torbirdy.prefs.emailwizard.label "הפעל את אשף הגדרות הדואר של ת'אנדרבירד [ברירת מחדל: כבוי]">
+<!ENTITY torbirdy.prefs.emailwizard.label "הפעל את אשף הגדרות הדוא״ל האוטומטי של Thunderbird [ברירת מחדל: מנוטרל]">
 <!ENTITY torbirdy.prefs.emailwizard.key "w">
-<!ENTITY torbirdy.prefs.automatic.label "בדוק עבור הודעות חדשות אוטומטית עבור כל החשבונות [ברירת מחדל: מנוטרלת]">
+<!ENTITY torbirdy.prefs.automatic.label "בדוק אם התקבלו הודעות חדשות אוטומטית עבור כל החשבונות [ברירת מחדל: מנוטרל]">
 <!ENTITY torbirdy.prefs.automatic.key "f">
-<!ENTITY torbirdy.prefs.renegotiation.label "הרשה חיבורית לשרתים שאינם תומכים בSSL/TLS עם חידוש משא ומתן מאובטח [ברירת מחדל: לא להרשות]">
+<!ENTITY torbirdy.prefs.renegotiation.label "התר חיבורית לשרתים שאינם תומכים בהצפנות SSL/TLS עם חידוש משא ומתן מאובטח [ברירת מחדל: אל תתיר]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
 <!ENTITY torbirdy.prefs.account_specific "חשבון ספציפי">
 <!ENTITY torbirdy.prefs.select_account.key "C">
@@ -55,9 +55,9 @@
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "שרת(י) הפצת מפתחות:">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
 
-<!ENTITY torbirdy.panel.usetor.label "תשתמש ב Tor Onion Router">
+<!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.panel.preferences.label "פתח העדפות TorBirdy">
 
 <!ENTITY torbirdy.firstrun.title "הפעלה ראשונה של TorBirdy">
diff --git a/chrome/locale/hu/torbirdy.dtd b/chrome/locale/hu/torbirdy.dtd
new file mode 100644
index 0000000..974acb6
--- /dev/null
+++ b/chrome/locale/hu/torbirdy.dtd
@@ -0,0 +1,63 @@
+<!ENTITY torbirdy.accountprefs.title "Fiók beállítások">
+<!ENTITY torbirdy.accountprefs.startup.label "Új üzenetek keresése indításkor">
+<!ENTITY torbirdy.accountprefs.startup.key "S">
+<!ENTITY torbirdy.accountprefs.minutes.label "Új üzenetek keresése">
+<!ENTITY torbirdy.accountprefs.minutes.key "y">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "percenként">
+<!ENTITY torbirdy.accountprefs.cancel.button "Mégsem">
+<!ENTITY torbirdy.accountprefs.save.button "Ment">
+<!ENTITY torbirdy.accountprefs.save.key "M">
+
+<!ENTITY torbirdy.prefs.title "TorBirdy Beállítások">
+<!ENTITY torbirdy.prefs.save.button "Mentés">
+<!ENTITY torbirdy.prefs.save.key "m">
+<!ENTITY torbirdy.prefs.cancel.button "Mégsem">
+<!ENTITY torbirdy.prefs.extra2.button "Alapértékek visszaállítása">
+<!ENTITY torbirdy.prefs.extra2.key "a">
+<!ENTITY torbirdy.prefs.testproxy.button "Proxy beállítások tesztelése">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Adatvédelem">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Biztonság">
+<!ENTITY torbirdy.prefs.recommended.text "Az ajánlott proxy beállítások használata a TorBirdy (Tor) használatához">
+<!ENTITY torbirdy.prefs.recommended.key "a">
+<!ENTITY torbirdy.prefs.anonservice.text "Névtelenné tevő szerver választása">
+<!ENTITY torbirdy.prefs.anonservice.key "n">
+<!ENTITY torbirdy.prefs.customsettings.text "Egyéni proxy beállítások használata">
+<!ENTITY torbirdy.prefs.customsettings.key "p">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS gép:">
+<!ENTITY torbirdy.prefs.socks_host.key "g">
+<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
+<!ENTITY torbirdy.prefs.torification.label "Átlátszó Torosítás">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!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 "A legutóbbi megnyitott email mappa megnyitása indításkor [Alapértelmezett: kikapcsolva] ">
+<!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 "Ne tedd a fogadó kulcs ID-et a titkosított üzenetbe [alapértelemezett: tedd]">
+<!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 "Új üzenetek ellenőrzése minden felhasználónál [Alapértelmezés: kikapcsolva]">
+<!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">
+<!ENTITY torbirdy.prefs.select_account.key "V">
+<!ENTITY torbirdy.prefs.select_account.label "Válasszon egy fiókot:">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Használandó kulcsszerver(ek):">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "m">
+
+<!ENTITY torbirdy.panel.usetor.label "Tor Onion Router használata">
+<!ENTITY torbirdy.panel.usejondo.label "JonDo használata (Prémium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Whonix használata">
+<!ENTITY torbirdy.panel.preferences.label "TorBirdy Beállítások megnyitása">
+
+<!ENTITY torbirdy.firstrun.title "TorBirdy Első futtatás">
diff --git a/chrome/locale/hu/torbirdy.properties b/chrome/locale/hu/torbirdy.properties
new file mode 100644
index 0000000..8dbf7c5
--- /dev/null
+++ b/chrome/locale/hu/torbirdy.properties
@@ -0,0 +1,19 @@
+torbirdy.name=TorBirdy
+
+torbirdy.enabled.tor=TorBirdy Bekapcsolva:    Tor
+torbirdy.enabled.jondo=TorBirdy Bekapcsolva:    JonDo
+torbirdy.enabled.custom=TorBirdy Bekapcsolva:    Egyedi Proxy
+torbirdy.enabled.torification=TorBirdy Bekapcsolva:    Átlátszó Torosítás
+torbirdy.enabled.whonix=TorBirdy Bekapcsolva: Whonix
+torbirdy.disabled=TorBirdy:    Kikapcsolva!
+
+torbirdy.email.prompt=A TorBirdy kikapcoslta a Thunderbird automatikus konfigurációs varázslóját a névtelensége megőrzése érdekében\n\nAz ajánlott biztonsági beállítások a %S részére beállításra kerültek.\n\nMost már beállíthatja a további fiók beállításokat kézzel.
+
+torbirdy.email.advanced=Kérjük jegyezze meg, hogy a TorBirdy Speciális beállításainak átállítása NEM ajánlott.\n\nCsak akkor szabad folytatnia, ha tudja mit csinál.
+torbirdy.email.advanced.nextwarning=A figyelmeztetés mutatása legközelebb is.
+torbirdy.email.advanced.title=TorBirdy Speciális beállítások
+
+torbirdy.restart=Újra kell indítani a Thunderbirdöt az időzóna beállítás életre jutásához.
+
+torbirdy.firstrun=Most futtatja a TorBirdy-t.\n\nAz anonimitásának biztosításához a TorBirdy erőlteti a Thunderbird beállításokat, amit beállított, hogy megóvj azokat attól, hogy Ön vagy egy add-on megváltoztathassa azt. Néhány beállítás változtatható, és azok elérhetők a TorBirdy beállítások ablakában. Ha a TorBirdy eltávolításra vagy kikapcsolásra kerül, minden beállítás, amit átállít, visszaáll a  korábbi értékekre (az értékekre, amelyek a TorBirdy telepítése előtt voltak).\n\nHa új f [...]
+torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/chrome/locale/id/torbirdy.dtd b/chrome/locale/id/torbirdy.dtd
new file mode 100644
index 0000000..c55ccfc
--- /dev/null
+++ b/chrome/locale/id/torbirdy.dtd
@@ -0,0 +1,63 @@
+<!ENTITY torbirdy.accountprefs.title "Konfigurasi Akun">
+<!ENTITY torbirdy.accountprefs.startup.label "Cek pesan baru saat startup">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
+<!ENTITY torbirdy.accountprefs.minutes.label "Cek pesan baru setiap">
+<!ENTITY torbirdy.accountprefs.minutes.key "P">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "menit">
+<!ENTITY torbirdy.accountprefs.cancel.button "Batal">
+<!ENTITY torbirdy.accountprefs.save.button "Simpan">
+<!ENTITY torbirdy.accountprefs.save.key "S">
+
+<!ENTITY torbirdy.prefs.title "Pengaturan TorBirdy">
+<!ENTITY torbirdy.prefs.save.button "Simpan">
+<!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 "Pengaturan Tes Proxy">
+<!ENTITY torbirdy.prefs.testproxy.key "P">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privasi">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Keamanan">
+<!ENTITY torbirdy.prefs.recommended.text "Gunakan pengaturan proxy yang disarankan untuk TorBirdy (Tor)">
+<!ENTITY torbirdy.prefs.recommended.key "P">
+<!ENTITY torbirdy.prefs.anonservice.text "Pilih layanan anomisasi">
+<!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 "Host SOCKS:">
+<!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 "Torifikasi Transparan (peringatan: membutuhkan transproksi khusus atau router Tor)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Aktifkan dukungan push email untuk akun IMAP [bawaan: non-aktif]">
+<!ENTITY torbirdy.prefs.imap.key "P">
+<!ENTITY torbirdy.prefs.startup_folder.label "Pilih folder pesan yang diakses terakhir kali pada waktu mulai [bawaan: non-aktif]">
+<!ENTITY torbirdy.prefs.startup_folder.key "P">
+<!ENTITY torbirdy.prefs.timezone.label "Jangan atur zona waktu Thunderbird ke UTC [bawaan: atur ke UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "P">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Jangan masukkan kunci ID penerima ke pesan terenkrip [bawaan: masukkan]">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "P">
+<!ENTITY torbirdy.prefs.confirmemail.label "Konfirmasi sebelum mengirim email jika Enigmail diaktifkan [bawaan: tidak dikonfirmasi]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Aktifkan wisara konfigurasi email otomatis Thunderbird [bawaan: non-aktif]">
+<!ENTITY torbirdy.prefs.emailwizard.key "P">
+<!ENTITY torbirdy.prefs.automatic.label "Periksa pesan baru secara otomatis untuk semua akun [bawaan: non-aktif]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Fungsikan koneksi ke server yang tidak mendukung SSL/TLS dengan renegosiasi aman [bawaan: tidak bisa]">
+<!ENTITY torbirdy.prefs.renegotiation.key "P">
+<!ENTITY torbirdy.prefs.account_specific "Spesifik ke Akun Tertentu">
+<!ENTITY torbirdy.prefs.select_account.key "C">
+<!ENTITY torbirdy.prefs.select_account.label "Pilih akun:">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) yang digunakan:">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
+
+<!ENTITY torbirdy.panel.usetor.label "Gunakan Router Tor Onion">
+<!ENTITY torbirdy.panel.usejondo.label "Gunakan JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Gunakan Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Buka pengaturan TorBirdy">
+
+<!ENTITY torbirdy.firstrun.title "Penggunakan Pertama TorBirdy">
diff --git a/chrome/locale/id/torbirdy.properties b/chrome/locale/id/torbirdy.properties
new file mode 100644
index 0000000..c25f5ba
--- /dev/null
+++ b/chrome/locale/id/torbirdy.properties
@@ -0,0 +1,19 @@
+torbirdy.name=TorBirdy
+
+torbirdy.enabled.tor=TorBirdy yang Diijinkan: Tor
+torbirdy.enabled.jondo=TorBirdy yang Diijinkan: JonDo
+torbirdy.enabled.custom=TorBirdy yang Diijinkan: Custom Proxy
+torbirdy.enabled.torification=TorBirdy yang Diijinkan: Transparent Torification
+torbirdy.enabled.whonix=TorBirdy yang Diijinkan: Whonix
+torbirdy.disabled=TorBirdy: Tidak Diijinkan!
+
+torbirdy.email.prompt=TorBirdy tidak mengijinkan petunjuk pengaturan otomatis Thunderbird demi melindungi kerahasiaan Anda.\n\nPengaturan keamanan yang disarankan untuk %S telah ditentukan.\n\nAnda saat ini dapat mengubah pengaturan akun lainnya secara manual.
+
+torbirdy.email.advanced=Perlu Anda ketahui bahwa mengubah aturan lanjut TorBirdy TIDAKLAH disarankan.\n\nAnda boleh melanjutkan jika Anda yakin akan apa yang sedang Anda lakukan.
+torbirdy.email.advanced.nextwarning=Tampilkan lagi peringatan ini.
+torbirdy.email.advanced.title=Pengaturan Lanjut TorBirdy
+
+torbirdy.restart=Anda harus me-'restart' Thunderbird agar 'time zone' dapat diubah.
+
+torbirdy.firstrun=Anda sedang menjalankan TorBirdy.\n\nUntuk membantu melindungi kerahasiaan Anda, TorBirdy tidak mengijinkan Anda atau add-on apapun mengubah pengaturan Thunderbird. Meski demikian, masih ada beberapa setting yang dapat diubah yang ditampilkan melalui bagian dialog preferensi TorBirdy. Ketika TorBirdy di-'uninstall' atau di-'disable', seluruh pengaturan yang diubah akan dikembalikan ke nilai semula (sebelum instalasi TorBirdy).\n\nJika Anda adalah seorang pemula, Anda di [...]
+torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/chrome/locale/ko/torbirdy.dtd b/chrome/locale/ko/torbirdy.dtd
new file mode 100644
index 0000000..fc683f4
--- /dev/null
+++ b/chrome/locale/ko/torbirdy.dtd
@@ -0,0 +1,63 @@
+<!ENTITY torbirdy.accountprefs.title "계정 설정">
+<!ENTITY torbirdy.accountprefs.startup.label "시작시에 새로운 메시지 확인">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
+<!ENTITY torbirdy.accountprefs.minutes.label "매번 새로운 메시지 확인">
+<!ENTITY torbirdy.accountprefs.minutes.key "y">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "분">
+<!ENTITY torbirdy.accountprefs.cancel.button "취소">
+<!ENTITY torbirdy.accountprefs.save.button "저장">
+<!ENTITY torbirdy.accountprefs.save.key "S">
+
+<!ENTITY torbirdy.prefs.title "Tor 버디- 이메일용 tor 입니다. - 개인 설정">
+<!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 "d">
+<!ENTITY torbirdy.prefs.testproxy.button "테스트 프록시 설정">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "프록시 설정">
+<!ENTITY torbirdy.prefs.privacy.label "개인 정보 설정">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail 설정">
+<!ENTITY torbirdy.prefs.security.label " 보안 설정">
+<!ENTITY torbirdy.prefs.recommended.text "Tor버디(Tor)에게 권장하는 프록시 설정을 사용합니다.">
+<!ENTITY torbirdy.prefs.recommended.key "r">
+<!ENTITY torbirdy.prefs.anonservice.text "익명 서비스 선택">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
+<!ENTITY torbirdy.prefs.customsettings.text "사용자 프록시 설정 사용">
+<!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 "포트">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
+<!ENTITY torbirdy.prefs.torification.label "투명한 Tor화(주의 : 트랜스 프록시나 Tor Onion 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.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "썬더버드의 타임존을 UTC로 설정하지 마십시오 [기본값 : UTC로 설정]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "수취인의 키 ID를 암호화된 메시지에 넣기 [기본값 : 비활성화]">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
+<!ENTITY torbirdy.prefs.confirmemail.label "Enigmail이 활성화되었을 경우 메일을 보내기 전에 확인하기 [기본값 : 확인하지 않음]">
+<!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 "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "SSL/TLS가 호환되지 않는 사이트에의 비보호 접근을 허용 [기본 설정: 비허용]">
+<!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 "k">
+
+<!ENTITY torbirdy.panel.usetor.label "Tor Onion Router 사용">
+<!ENTITY torbirdy.panel.usejondo.label "JonDo 사용 (프리미엄)">
+<!ENTITY torbirdy.panel.usewhonix.label "Whonix 사용">
+<!ENTITY torbirdy.panel.preferences.label "Torbirdy 개인 설정 열기">
+
+<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">
diff --git a/chrome/locale/ko/torbirdy.properties b/chrome/locale/ko/torbirdy.properties
new file mode 100644
index 0000000..42118af
--- /dev/null
+++ b/chrome/locale/ko/torbirdy.properties
@@ -0,0 +1,19 @@
+torbirdy.name=TorBirdy
+
+torbirdy.enabled.tor=Torbirdy 활성화 :  Tor
+torbirdy.enabled.jondo=Torbirdy 활성화 :  JonDo
+torbirdy.enabled.custom=Torbirdy 활성화됨 : 개인 프록시
+torbirdy.enabled.torification=TorBirdy 활성화됨 : 투명 Tor화
+torbirdy.enabled.whonix=TorBridy 활성화됨 : Whonix
+torbirdy.disabled=TorBirdy: 비활성화!
+
+torbirdy.email.prompt=TorBirdy는 귀하의 익명을 지키기 위해 썬더버드의 자동 설정 마법사를 비활성시켰습니다. \n\n%를 위한 추천되는 보안 설정은 이미 설정되었습니다. \n\n귀하는 다른 계정 설정을 수동으로 설정할 수 있습니다.
+
+torbirdy.email.advanced=TorBirdy의 고급 설정을 바꾸는 것은 추천되지 않음을 알아두십시오.\n\n 귀하는 귀하가 무엇을 하고 있는지 확신할 수 있는 경우에만 계속해야 합니다.
+torbirdy.email.advanced.nextwarning=다음번에 경고 보여주기
+torbirdy.email.advanced.title=TorBirdy 고급 설정
+
+torbirdy.restart=시간대 설정이 효과를 발휘하려면 썬더버드를 재시작하십시오.
+
+torbirdy.firstrun=귀하는 지금 TorBirdy를 사용중입니다. \n\n귀하의 익명성을 돕기 위해서 TorBirdy는, 귀하나 다른 플러그인에 의해 설정이 바뀌는 것을 막기 위해 썬더버드의 설정을 이미 설정된 것으로 고정할 것입니다.  TorBirdy를 통해 접근할 수 있고 바뀔 수 있는 몇몇 설정이 있습니다.  TorBirdy가 삭제되거나 비활성화될때, 바뀐 모든 설정은 기본값으로 재설정될 것입니다 (TorBirdy의 기본값을 우선함).\n\n만약 새로운 사용자이시라면,  우리가 우리의 사용자를 위해 이루어내기 위해 시도하고 있는 것을 이해하기 위해서, TorBirdy 웹사이트를 읽는 것을 추천합니다.
+torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/chrome/locale/nb/torbirdy.dtd b/chrome/locale/nb/torbirdy.dtd
new file mode 100644
index 0000000..b836f91
--- /dev/null
+++ b/chrome/locale/nb/torbirdy.dtd
@@ -0,0 +1,63 @@
+<!ENTITY torbirdy.accountprefs.title "Kontoinnstillinger">
+<!ENTITY torbirdy.accountprefs.startup.label "Se etter nye meldinger ved oppstart">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
+<!ENTITY torbirdy.accountprefs.minutes.label "Se etter nye meldinger hver">
+<!ENTITY torbirdy.accountprefs.minutes.key "y">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutter">
+<!ENTITY torbirdy.accountprefs.cancel.button "Avbryt">
+<!ENTITY torbirdy.accountprefs.save.button "Lagre">
+<!ENTITY torbirdy.accountprefs.save.key "S">
+
+<!ENTITY torbirdy.prefs.title "TorBirdy Innstillinger">
+<!ENTITY torbirdy.prefs.save.button "Lagre">
+<!ENTITY torbirdy.prefs.save.key "s">
+<!ENTITY torbirdy.prefs.cancel.button "Avbryt">
+<!ENTITY torbirdy.prefs.extra2.button "Gjenopprett standard">
+<!ENTITY torbirdy.prefs.extra2.key "d">
+<!ENTITY torbirdy.prefs.testproxy.button "Test Proxyinnstillinger">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Personvern">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Sikkerhet">
+<!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">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
+<!ENTITY torbirdy.prefs.customsettings.text "Bruk egendefinerte proxyinnstillinger">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS-vert:">
+<!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 (advarsel: krever tilpasset transproxy, eller Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Aktiver støtte for push epost til IMAP-kontoer [standard: deaktivert]">
+<!ENTITY torbirdy.prefs.imap.key "p">
+<!ENTITY torbirdy.prefs.startup_folder.label "Velg siste brukte epostmappe ved oppstart [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 "Sett ikke inn mottakers nøkkel ID i krypterte meldinger [default: put]">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
+<!ENTITY torbirdy.prefs.confirmemail.label "Bekreft før sending av epost hvis Enigmail er aktivert [standard: ikke bekreft]">
+<!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 "Se etter nye meldinger automatisk på alle kontoer [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">
+<!ENTITY torbirdy.prefs.select_account.key "C">
+<!ENTITY torbirdy.prefs.select_account.label "Velg en konto:">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Bruk følgende keyserver(e):">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
+
+<!ENTITY torbirdy.panel.usetor.label "Bruk Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Bruk JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Bruk Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Åpne TorBirdy Innstillinger">
+
+<!ENTITY torbirdy.firstrun.title "Førstegangskjøring av TorBirdy">
diff --git a/chrome/locale/nb/torbirdy.properties b/chrome/locale/nb/torbirdy.properties
new file mode 100644
index 0000000..97fba49
--- /dev/null
+++ b/chrome/locale/nb/torbirdy.properties
@@ -0,0 +1,19 @@
+torbirdy.name=TorBirdy
+
+torbirdy.enabled.tor=TorBirdy Aktivert: Tor
+torbirdy.enabled.jondo=TorBirdy Aktivert: JonDo
+torbirdy.enabled.custom=TorBirdy Aktivert: Egendefinert Proxy
+torbirdy.enabled.torification=TorBirdy Aktivert: Transparent Torification
+torbirdy.enabled.whonix=TorBirdy Aktivert: Whonix
+torbirdy.disabled=TorBirdy: Deaktivert!
+
+torbirdy.email.prompt=TorBirdy har deaktivert Thunderbirds konfigueringshjelp for å beskytte anonymiteten din.\n\nDe anbefalte sikkerhetsinnstillingene for %S er utført.\n\nDu kan nå konfigurere de andre kontoinnstillingene manuelt.
+
+torbirdy.email.advanced=Vær oppmerksom på at å endre TorBirdys avanserte innstillinger IKKE er anbefalt.\n\nDu burde bare fortsette hvis du er sikker på hva du gjør.
+torbirdy.email.advanced.nextwarning=Vis denne advarselen neste gang
+torbirdy.email.advanced.title=TorBirdy Avanserte Innstillinger
+
+torbirdy.restart=Du må starte Thunderbird på nytt for at tidssoneinnstillingene skal tre i kraft.
+
+torbirdy.firstrun=Du kjører TorBirdy nå.\n\nFor å beskytte anonymiteten din vil TorBirdy håndheve innstillingene det har satt i Thunderbird, dette for å forhinde at de blir endret av deg eller andre tillegg. Det er noen innstillinger du kan endre og disse er tilgjengelige via en egen dialogboks i TorBirdy. Når TorBirdy er avinstallert eller deaktivert, vil alle innstillingene som er gjort tilbakestilles til standardverdiene (fra før du installerte TorBirdy).\n\nHvis du er en ny bruker, e [...]
+torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/chrome/locale/pa/torbirdy.dtd b/chrome/locale/pa/torbirdy.dtd
index 725c42f..c2d1d28 100644
--- a/chrome/locale/pa/torbirdy.dtd
+++ b/chrome/locale/pa/torbirdy.dtd
@@ -1,18 +1,18 @@
-<!ENTITY torbirdy.accountprefs.title "ਅਕਾਊਂਟਸ ਸੇਟਿਂਗ">
-<!ENTITY torbirdy.accountprefs.startup.label "ਸ਼ੁਰੂ ਕਰਨ ਸਮੇਂ ਨਵੇਂ ਸੁਨੇਹੇ ਲਈ ਚੈੱਕ ਕਰੋ">
+<!ENTITY torbirdy.accountprefs.title "ਖਾਤਾ ਸੰਰਚਨਾ">
+<!ENTITY torbirdy.accountprefs.startup.label "ਸ਼ੁਰੂ ਕਰਨ ਸਮੇਂ ਨਵੇਂ ਸੁਨੇਹੇ ਲਈ ਜਾਂਚ ਕਰੋ">
 <!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "ਨਵੇਂ ਸੁਨੇਹੇ ਦੀ ਹਰ">
-<!ENTITY torbirdy.accountprefs.minutes.key "k">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "ਮਿੰਟ ਬਾਅਦ ਜਾਂਚ ਕਰੋ">
+<!ENTITY torbirdy.accountprefs.minutes.label "ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਲਈ ਜਾਂਚ ਕਰੋ ਹਰੇਕ">
+<!ENTITY torbirdy.accountprefs.minutes.key "y">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "ਮਿੰਟ">
 <!ENTITY torbirdy.accountprefs.cancel.button "ਰੱਦ ਕਰੋ">
 <!ENTITY torbirdy.accountprefs.save.button "ਠੀਕ ਹੈ">
 <!ENTITY torbirdy.accountprefs.save.key "S">
 
-<!ENTITY torbirdy.prefs.title "ਮੇਰੀ ਪਸੰਦ">
-<!ENTITY torbirdy.prefs.save.button "ਠੀਕ ਹੈ">
-<!ENTITY torbirdy.prefs.save.key "S">
+<!ENTITY torbirdy.prefs.title "ਟੋਰਬਰਡੀ ਮੇਰੀ ਪਸੰਦ">
+<!ENTITY torbirdy.prefs.save.button "ਸੰਭਾਲੋ">
+<!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "ਰੱਦ ਕਰੋ">
-<!ENTITY torbirdy.prefs.extra2.button "Restore Defaults">
+<!ENTITY torbirdy.prefs.extra2.button "ਮੂਲ ਮੁੜ-ਸਟੋਰ ਕਰੋ">
 <!ENTITY torbirdy.prefs.extra2.key "d">
 <!ENTITY torbirdy.prefs.testproxy.button "ਪਰਾਕਸੀ ਟੈਸਟ ਕਰੋ">
 <!ENTITY torbirdy.prefs.testproxy.key "n">
@@ -20,15 +20,15 @@
 <!ENTITY torbirdy.prefs.privacy.label "ਪਰਾਈਵੇਸੀ">
 <!ENTITY torbirdy.prefs.enigmail.label "ਏਨਿਗਮੇਲ">
 <!ENTITY torbirdy.prefs.security.label "ਸੁਰੱਖਿਆ">
-<!ENTITY torbirdy.prefs.recommended.text "ਟੌਰਬਰਡੀ ਲਈ ਆਖੀ ਹੋਈ ਪਰਾਕਸੀ ਸੈਟਿੰਗ ਵਰਤੋ ਕਰੋ (ਟੌਰ)">
+<!ENTITY torbirdy.prefs.recommended.text "ਟੋਰਬਰਡੀ ਲਈ ਆਖੀ ਹੋਈ ਪਰਾਕਸੀ ਸੈਟਿੰਗ ਵਰਤੋਂ ਕਰੋ (ਟੋਰ)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
-<!ENTITY torbirdy.prefs.anonservice.text "ਗੁਪਤ ਸਰਵਿਸ ਚੁਣ ਕਰੋ">
+<!ENTITY torbirdy.prefs.anonservice.text "ਅਗਿਆਤ ਸੇਵਾ ਚੁਣੋ">
 <!ENTITY torbirdy.prefs.anonservice.key "a">
-<!ENTITY torbirdy.prefs.customsettings.text "ਖੁਦ ਪਰਾਕਸੀ ਸੇਟਿਂਗ ਦਿਓ">
+<!ENTITY torbirdy.prefs.customsettings.text "ਆਪਣੀ ਪਰਾਕਸੀ ਸੈਟਿੰਗ ਵਰਤੋਂ">
 <!ENTITY torbirdy.prefs.customsettings.key "c">
 <!ENTITY torbirdy.prefs.socks_host.label "SOCKS ਹੋਸਟ: ">
 <!ENTITY torbirdy.prefs.socks_host.key "h">
-<!ENTITY torbirdy.prefs.socks_port.label "ਪੋਰਟ">
+<!ENTITY torbirdy.prefs.socks_port.label "ਪੋਰਟ:">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
 <!ENTITY torbirdy.prefs.torification.label "Transparent Torification">
 <!ENTITY torbirdy.prefs.torification.key "t">
@@ -50,15 +50,15 @@
 <!ENTITY torbirdy.prefs.automatic.key "f">
 <!ENTITY torbirdy.prefs.renegotiation.label "ਜੇ ਸਰਵਰ ਤੇ  SSL /TLS Secure  Regontiation ਦੀ ਸਹਾਇਤਾ ਨਹੀਂ ਹੈ ਤਾਂ ਵੀ ਕਨੇਕਟ ਕਰੋ">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "ਅਕਾਊਂਟ-ਵਿਸ਼ਿਸ਼ਟ">
+<!ENTITY torbirdy.prefs.account_specific "ਖਾਤਾ-ਖਾਸ">
 <!ENTITY torbirdy.prefs.select_account.key "C">
-<!ENTITY torbirdy.prefs.select_account.label "ਅਕਾਊਂਟ ਚੁਣੋ">
+<!ENTITY torbirdy.prefs.select_account.label "ਖਾਤਾ ਚੁਣੋ:">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.label "ਕਿਹੜਾ ਕੀਸਰਵਰ ਵਰਤੋ:">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
 
-<!ENTITY torbirdy.panel.usetor.label "ਟੌਰ ਦੀ ਵਰਤੋ ਕਰੋ">
-<!ENTITY torbirdy.panel.usejondo.label "ਜੋਨ ਦੋ ਦੀ ਵਰਤੋ ਕਰੋ (ਪ੍ਰੀਮੀਅਮ)">
+<!ENTITY torbirdy.panel.usetor.label "ਟੋਰ ਓਨੀਅਨ ਰਾਊਟਰ ਵਰਤੋਂ">
+<!ENTITY torbirdy.panel.usejondo.label "ਜੋਨ-ਡੂ ਵਰਤੋ (ਪ੍ਰੀਮੀਅਮ)">
 <!ENTITY torbirdy.panel.usewhonix.label "ਹੁਨਿਕਸ ਦੀ ਵਰਤੋ ਕਰੋ">
-<!ENTITY torbirdy.panel.preferences.label "ਟੌਰਬਰਡੀ ਸੈਟਿੰਗ">
+<!ENTITY torbirdy.panel.preferences.label "ਟੋਰਬਰਡੀ ਪਸੰਦ ਖੋਲ੍ਹੋ">
 
 <!ENTITY torbirdy.firstrun.title "ਟੌਰਬਰਡੀ ਪਹਿਲੀ ਵਾਰ">
diff --git a/chrome/locale/pa/torbirdy.properties b/chrome/locale/pa/torbirdy.properties
index bf3a7e4..05fb9a8 100644
--- a/chrome/locale/pa/torbirdy.properties
+++ b/chrome/locale/pa/torbirdy.properties
@@ -1,11 +1,11 @@
 torbirdy.name=ਟੌਰਬਰਡੀ
 
-torbirdy.enabled.tor=ਟੌਰਬਰਡੀ ਚਾਲੂ ਹੇ:    ਟੌਰ
+torbirdy.enabled.tor=ਟੌਰਬਰਡੀ ਚਾਲੂ ਹੈ:    ਟੌਰ
 torbirdy.enabled.jondo=ਟੌਰਬਰਡੀ ਚਾਲੂ ਹੇ:    ਜੋਨਦੋ
-torbirdy.enabled.custom=ਟੌਰਬਰਡੀ ਚਾਲੂ ਹੇ:    ਕਸਟਮ ਪਰਾਕਸੀ ਸੈਟਿੰਗ
+torbirdy.enabled.custom=ਟੌਰਬਰਡੀ ਚਾਲੂ ਹੈ: ਕਸਟਮ ਪਰਾਕਸੀ
 torbirdy.enabled.torification=ਟੌਰਬਰਡੀ ਚਾਲੂ ਹੇ:    ਪਾਰਦਰਸ਼ਕ ਟੌਰ
 torbirdy.enabled.whonix=ਟੌਰਬਰਡੀ ਚਾਲੂ ਹੇ:     ਹੁਨਿਕਸ
-torbirdy.disabled=ਟੌਰਬਰਡੀ:    ਬੰਦ ਹੈ!
+torbirdy.disabled=ਟੌਰਬਰਡੀ: ਬੰਦ ਹੈ!
 
 torbirdy.email.prompt=ਤੁਹਾਨੂੰ ਗੁਪਤ ਰਖਣ ਵਾਸਤੇ ਟੌਰਬਰਡੀ ਨੇ ਥੰਡਰਬਰਡ ਦੇ ਆਟੋ-ਸੰਰਚਨਾ ਸੈਟਅੱਪ ਨੂੰ ਰੱਦ ਕਰ ਦਿੱਤਾ ਹੇ | \n\n ਜ਼ਰੂਰੀ ਸੁਰੱਖਿਆ ਸੈਟਿੰਗ %S ਵਾਸਤੇ ਲਾਗੂ ਕਰ ਦਿਤੀਆਂ ਗਈਆਂ ਨੇ | \n\n ਤੁਸੀਂ ਬਾਕੀ ਸੈਟਿੰਗ ਆਪਣੇ ਆਪ ਸੰਰਚਨਾ ਕਰ ਸਕਦੇ ਹੋ |
 
diff --git a/chrome/locale/pl/torbirdy.properties b/chrome/locale/pl/torbirdy.properties
index 6075d96..761296f 100644
--- a/chrome/locale/pl/torbirdy.properties
+++ b/chrome/locale/pl/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=Zmiana ustawień zaawansowanych TorBirdy NIE jest zaleca
 torbirdy.email.advanced.nextwarning=Pokaż to ostrzeżenie następnym razem
 torbirdy.email.advanced.title=Zaawansowane Ustawienia TorBirdy
 
-torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
+torbirdy.restart=Musisz zrestartować Thunderbird'a aby zmiany czasowe uległy zmianie.
 
 torbirdy.firstrun=TorBirdy jest teraz uruchomiony\n\nAby chronić Twoją anonimowość, TorBirdy będzie pilnował ustawionych przez siebie ustawień Thunderbirda, zapobiegając ich zmianie przez Ciebie lub inne dodatki. Można zmienić niektóre ustawienia, do których jest dostęp z okna ustawień TorBirdy. Gdy TorBirdy jest odinstalowany lub wyłączony, wszystkie zmienione przez niego ustawienia są resetowane do wartości domyślnych (sprzed instalacji TorBirdy).\n\nJeśli jesteś nowym użytkownikiem, z [...]
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/chrome/locale/pt-BR/torbirdy.dtd b/chrome/locale/pt-BR/torbirdy.dtd
index 743dde1..52196cf 100644
--- a/chrome/locale/pt-BR/torbirdy.dtd
+++ b/chrome/locale/pt-BR/torbirdy.dtd
@@ -1,8 +1,8 @@
 <!ENTITY torbirdy.accountprefs.title "Configurações da Conta">
 <!ENTITY torbirdy.accountprefs.startup.label "Verificar se há novas mensagens ao iniciar">
-<!ENTITY torbirdy.accountprefs.startup.key "I">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
 <!ENTITY torbirdy.accountprefs.minutes.label "Verificar se há novas mensagens a cada">
-<!ENTITY torbirdy.accountprefs.minutes.key "a">
+<!ENTITY torbirdy.accountprefs.minutes.key "y">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "minutos">
 <!ENTITY torbirdy.accountprefs.cancel.button "Cancelar">
 <!ENTITY torbirdy.accountprefs.save.button "Salvar">
@@ -12,52 +12,52 @@
 <!ENTITY torbirdy.prefs.save.button "Salvar">
 <!ENTITY torbirdy.prefs.save.key "s">
 <!ENTITY torbirdy.prefs.cancel.button "Cancelar">
-<!ENTITY torbirdy.prefs.extra2.button "Restaurar padrão">
+<!ENTITY torbirdy.prefs.extra2.button "Restaurar os padrões">
 <!ENTITY torbirdy.prefs.extra2.key "d">
-<!ENTITY torbirdy.prefs.testproxy.button "Testar as Configurações do Proxy">
+<!ENTITY torbirdy.prefs.testproxy.button "Testar as Configurações de Proxy">
 <!ENTITY torbirdy.prefs.testproxy.key "n">
 <!ENTITY torbirdy.prefs.proxy.label "Proxy">
 <!ENTITY torbirdy.prefs.privacy.label "Privacidade">
 <!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
 <!ENTITY torbirdy.prefs.security.label "Segurança">
-<!ENTITY torbirdy.prefs.recommended.text "Utilizar as configurações de proxy recomendadas para o TorBirdy (Tor)">
+<!ENTITY torbirdy.prefs.recommended.text "Use as configurações de proxy recomendadas para o TorBirdy (Tor)">
 <!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "Escolher um serviço de anonimato">
 <!ENTITY torbirdy.prefs.anonservice.key "a">
-<!ENTITY torbirdy.prefs.customsettings.text "Usar configurações de proxy personalizadas">
-<!ENTITY torbirdy.prefs.customsettings.key "p">
-<!ENTITY torbirdy.prefs.socks_host.label "Host SOCKS:">
-<!ENTITY torbirdy.prefs.socks_host.key "s">
+<!ENTITY torbirdy.prefs.customsettings.text "Usar as configurações de proxy personalizadas">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "Host para SOCKS:">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
 <!ENTITY torbirdy.prefs.socks_port.label "Porta:">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "Torificação Transparente">
+<!ENTITY torbirdy.prefs.torification.label "Utilização transparente do Tor (aviso: requer transproxy personalizado ou o roteador Tor)">
 <!ENTITY torbirdy.prefs.torification.key "t">
-<!ENTITY torbirdy.prefs.global "Geral">
-<!ENTITY torbirdy.prefs.imap.label "Ativar suporte a download de emails via IMAP [padrão: desativado]">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Ativar o suporte de e-mail para contas de IMAP [padrão: desativado]">
 <!ENTITY torbirdy.prefs.imap.key "p">
-<!ENTITY torbirdy.prefs.startup_folder.label "Abrir a última pasta acessada ao iniciar [padrão: desativado]">
-<!ENTITY torbirdy.prefs.startup_folder.key "p">
-<!ENTITY torbirdy.prefs.timezone.label "Não defina o fuso horário do Thunderbird para UTC [padrão: definido para UTC]">
-<!ENTITY torbirdy.prefs.timezone.key "f">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Não colocar a ID dos destinatários em mensagens criptografadas [padrão: colocar]">
+<!ENTITY torbirdy.prefs.startup_folder.label "Selecionar a última pasta de e-mail acessada ao iniciar [padrão: desativado]">
+<!ENTITY torbirdy.prefs.startup_folder.key "I">
+<!ENTITY torbirdy.prefs.timezone.label "Não definir o fuso horário do Thunderbird como UTC [padrão: definido como UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Não pôr as identidades dos destinatários em mensagens criptografadas [padrão: pôr]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "Confirmar antes de enviar e-mail se Enigmail estiver ativado [padrão: não confirmar]">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirmar se Enigmail está ativado antes de enviar um e-mail [padrão: não confirmar]">
 <!ENTITY torbirdy.prefs.confirmemail.key "c">
-<!ENTITY torbirdy.prefs.emailwizard.label "Ativar o assistente de configuração de email do Thunderbird [padrão: desativar]">
+<!ENTITY torbirdy.prefs.emailwizard.label "Habilitar o assistente de configuração automática de e-mail do Thunderbird [padrão: desabilitado]">
 <!ENTITY torbirdy.prefs.emailwizard.key "w">
-<!ENTITY torbirdy.prefs.automatic.label "Verifica automaticamente novas mensagens em todas contas [padrão: desabilitado]">
+<!ENTITY torbirdy.prefs.automatic.label "Verificar automaticamente as novas mensagens em todas as contas [padrão: desabilitado]">
 <!ENTITY torbirdy.prefs.automatic.key "f">
-<!ENTITY torbirdy.prefs.renegotiation.label "Permitir conexões a servidores que não suportam SSL/TLS com negociação segura [padrão: não permitir]">
+<!ENTITY torbirdy.prefs.renegotiation.label "Permitir conexões a provedores que não possuem suporte para SSL/TLS com renegociação segura [padrão: não permitir]">
 <!ENTITY torbirdy.prefs.renegotiation.key "r">
-<!ENTITY torbirdy.prefs.account_specific "Configurações da Conta">
-<!ENTITY torbirdy.prefs.select_account.key "s">
+<!ENTITY torbirdy.prefs.account_specific "Conta Específica">
+<!ENTITY torbirdy.prefs.select_account.key "C">
 <!ENTITY torbirdy.prefs.select_account.label "Escolher uma conta:">
-<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Servidor de chave(s) a usar:">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Servidor(es) de chave a usar:">
 <!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
 
 <!ENTITY torbirdy.panel.usetor.label "Usar o Roteador Tor Onion">
-<!ENTITY torbirdy.panel.usejondo.label "Usar o JonDo (Usuário Premium)">
-<!ENTITY torbirdy.panel.usewhonix.label "Usar Whonix">
-<!ENTITY torbirdy.panel.preferences.label "Abrir Preferências do TorBirdy">
+<!ENTITY torbirdy.panel.usejondo.label "Usar o JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Usar o Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Abrir as Preferências do TorBirdy">
 
 <!ENTITY torbirdy.firstrun.title "Primeira execução do TorBirdy">
diff --git a/chrome/locale/pt-BR/torbirdy.properties b/chrome/locale/pt-BR/torbirdy.properties
index f9cf4ed..802d9dc 100644
--- a/chrome/locale/pt-BR/torbirdy.properties
+++ b/chrome/locale/pt-BR/torbirdy.properties
@@ -1,19 +1,19 @@
 torbirdy.name=TorBirdy
 
-torbirdy.enabled.tor=TorBirdy Ativado: Tor
+torbirdy.enabled.tor=TorBirdy Habilitado: Tor
 torbirdy.enabled.jondo=TorBirdy Ativado: JonDo
-torbirdy.enabled.custom=TorBirdy Ativado: Proxy Personalizado
-torbirdy.enabled.torification=TorBirdy Ativado: Torificação Transparent
+torbirdy.enabled.custom=TorBirdy Habilitado: Proxy Personalizado
+torbirdy.enabled.torification=TorBirdy Ativado: Torificação Transparente
 torbirdy.enabled.whonix=TorBirdy Habilitado:  Whonix
-torbirdy.disabled=TorBirdy: Desativado!
+torbirdy.disabled=TorBirdy: Desabilitado!
 
-torbirdy.email.prompt=O TorBirdy desativou o assistente de configuração automática do Thunderbird para proteger sua anonimidade.\nAs configurações de segurança recomendadas para %S foram definidas.\nVocê pode configurar as configurações de outras contas manualmente.
+torbirdy.email.prompt=O TorBirdy desativou o assistente de configuração automática do Thunderbird para proteger seu anonimato.\nAs configurações de segurança recomendadas para %S foram definidas.\nAgora você pode configurar as definições de uma outra conta manualmente.
 
-torbirdy.email.advanced=Por favor, tenha em mente que mudar as configurações avançadas do TorBirdy NÃO É recomendado.\nVocê só deve continuar se souber o que está fazendo.
-torbirdy.email.advanced.nextwarning=Mostrar esse aviso no futuro
+torbirdy.email.advanced=Por favor, tenha em mente que mudar as configurações avançadas do TorBirdy NÃO é recomendado. Você só deve continuar se souber o que está fazendo
+torbirdy.email.advanced.nextwarning=Mostrar esse aviso na próxima vez
 torbirdy.email.advanced.title=Configurações Avançadas do TorBirdy
 
-torbirdy.restart=Reinicie o Thunderbind para que a opção de zona do fuso horário seja ativada.
+torbirdy.restart=Para que a opção do fuso horário de zona seja ativada, por favor reinicie o Thunderbind.
 
-torbirdy.firstrun=Você agora está executando o TorBirdy.\n\nPara melhorar a sua anonimidade o TorBirdy irá forçar as configurações do Thunderbird que ele criou, prevenindo que ela seja modificada por você ou por um acessório.  Há algumas configurações que podem ser modificadas através das preferências do TorBirdy.  Quando o TorBirdy for removido ou desativado, todas suas configurações são restauradas a seus valores padrões (os valores anteriores ao TorBirdy ser instalado)\n\nSe você for  [...]
+torbirdy.firstrun=Você agora está executando o TorBirdy.\n\nPara ajudar a proteger o seu anonimato, o TorBirdy irá impor as configurações do Thunderbird que ele criou, impedindo-os de ser mudado por você ou por qualquer add-on. Há algumas configurações que podem ser alteradas e estas poderão ser acessadas ​​por meio do diálogo de preferências do TorBirdy. Quando o TorBirdy for desinstalado ou desativado, todas as configurações definidas anteriormente irão retornar para os seus valores pa [...]
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/chrome/locale/pt/torbirdy.dtd b/chrome/locale/pt/torbirdy.dtd
new file mode 100644
index 0000000..d085c56
--- /dev/null
+++ b/chrome/locale/pt/torbirdy.dtd
@@ -0,0 +1,63 @@
+<!ENTITY torbirdy.accountprefs.title "Configuração da Conta">
+<!ENTITY torbirdy.accountprefs.startup.label "Verifique as novas mensagens ao iniciar">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
+<!ENTITY torbirdy.accountprefs.minutes.label "Verifique as novas mensagens a cada ">
+<!ENTITY torbirdy.accountprefs.minutes.key "y">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutos">
+<!ENTITY torbirdy.accountprefs.cancel.button "Cancelar">
+<!ENTITY torbirdy.accountprefs.save.button "Guardar">
+<!ENTITY torbirdy.accountprefs.save.key "S">
+
+<!ENTITY torbirdy.prefs.title "Preferências TorBirdy">
+<!ENTITY torbirdy.prefs.save.button "Guardar">
+<!ENTITY torbirdy.prefs.save.key "s">
+<!ENTITY torbirdy.prefs.cancel.button "Cancelar">
+<!ENTITY torbirdy.prefs.extra2.button "Restaurar definições ">
+<!ENTITY torbirdy.prefs.extra2.key "d">
+<!ENTITY torbirdy.prefs.testproxy.button "Testar Configurações de Proxy">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Definições de Privacidade">
+<!ENTITY torbirdy.prefs.enigmail.label "Configurações do Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Configurações de Segurança">
+<!ENTITY torbirdy.prefs.recommended.text "Use as configurações de proxy recomendadas para o TorBirdy (Tor)">
+<!ENTITY torbirdy.prefs.recommended.key "r">
+<!ENTITY torbirdy.prefs.anonservice.text "Escolha um serviço de anonimização">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
+<!ENTITY torbirdy.prefs.customsettings.text "Utilizar as configurações padrão do proxy">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "Host SOCKS:">
+<!ENTITY torbirdy.prefs.socks_host.key "h">
+<!ENTITY torbirdy.prefs.socks_port.label "Porta:">
+<!ENTITY torbirdy.prefs.socks_port.key "p">
+<!ENTITY torbirdy.prefs.torification.label "Torificação Transparente (aviso: necessita de transproxy ou router Tor)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Ative o suporte para push de email de contas IMAP [por defeito: desativado]">
+<!ENTITY torbirdy.prefs.imap.key "p">
+<!ENTITY torbirdy.prefs.startup_folder.label "Selecione a última pasta de email acedida, ao iniciar [por defeito: desativado, escolha Pastas Locais]">
+<!ENTITY torbirdy.prefs.startup_folder.key "I">
+<!ENTITY torbirdy.prefs.timezone.label "Não defina o fuso horário do Thunderbird como UTC [por defeito: definir como ]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Coloque as chaves dos IDs do destinatário em mensagens encriptadas [por defeito: não colocar]">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirme, antes de enviar email, se o Enigmail está ativado [por defeito: não confirmar]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Ative o assistente de configuração automática de email, do Thunderbird [por defeito: desativado]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Verificar a existência de novas mensagens automaticamente em todas as contas [por defeito: desativado]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Permitir ligações a servidores que não suportem SSL/TLS com renegociação segura [por defeito: não permitir]">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
+<!ENTITY torbirdy.prefs.account_specific "Específico-da-Conta">
+<!ENTITY torbirdy.prefs.select_account.key "C">
+<!ENTITY torbirdy.prefs.select_account.label "Escolha uma conta:">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Usar estes keyserver(s):">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
+
+<!ENTITY torbirdy.panel.usetor.label "Usar o Router Tor Onion">
+<!ENTITY torbirdy.panel.usejondo.label "Usar ">
+<!ENTITY torbirdy.panel.usewhonix.label "Usar ">
+<!ENTITY torbirdy.panel.preferences.label "Abrir as Preferências TorBirdy">
+
+<!ENTITY torbirdy.firstrun.title "Primeira-Execução do ">
diff --git a/chrome/locale/pt/torbirdy.properties b/chrome/locale/pt/torbirdy.properties
new file mode 100644
index 0000000..32d3992
--- /dev/null
+++ b/chrome/locale/pt/torbirdy.properties
@@ -0,0 +1,19 @@
+torbirdy.name=TorBirdy
+
+torbirdy.enabled.tor=TorBirdy ativado: Tor
+torbirdy.enabled.jondo=TorBirdy ativado: JonDo
+torbirdy.enabled.custom=TorBirdy ativado: Custom Proxy
+torbirdy.enabled.torification=TorBirdy ativado: Transparent Torification
+torbirdy.enabled.whonix=TorBirdy ativado: Whonix
+torbirdy.disabled=TorBirdy: desativado!
+
+torbirdy.email.prompt=TorBirdy desativou o assistente de auto-configuração do Thunderbird's para proteger a sua anonimidade.\n\nAs definições de segurança recomendadas para %S foram preenchidas.\n\nPode configurar as outras definições da conta manuualmente.
+
+torbirdy.email.advanced=Por favor note que alterar as configurações avançadas do TorBirdy NÃO é recomendado.\n\nDeve apenas continuar se tiver a certeza do que está a fazer.
+torbirdy.email.advanced.nextwarning=Mostrar este aviso na próxima vez
+torbirdy.email.advanced.title=Definições avançadas TorBirdy
+
+torbirdy.restart=Deve reiniciar o Thunderbird para a preferência de horário local ter efeito.
+
+torbirdy.firstrun=Já está a correr o TorBirdy.\n\nPara ajudar a proteger a sua anonimidade, o TorBirdy força as definições do Thunderbird, de modo a prevenir que sejam alteradas por si ou um suplemento. Existem algumas definiões que podem ser alteradas e que podem ser acedidas pelo diálogo de preferências do TorBirdy. Quando o TorBirdy for desinstalado ou desativado, todas as definições alteradas são repostas (para o valor inicial anterior à instalação).\n\nSe é um utilizador novo, é rec [...]
+torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/chrome/locale/ro/torbirdy.dtd b/chrome/locale/ro/torbirdy.dtd
new file mode 100644
index 0000000..3920119
--- /dev/null
+++ b/chrome/locale/ro/torbirdy.dtd
@@ -0,0 +1,63 @@
+<!ENTITY torbirdy.accountprefs.title "Configurare cont">
+<!ENTITY torbirdy.accountprefs.startup.label "Verifică dacă sunt mesaje noi la pornire">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
+<!ENTITY torbirdy.accountprefs.minutes.label "Verifică dacă sunt mesaje noi la fiecare">
+<!ENTITY torbirdy.accountprefs.minutes.key "r">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minute">
+<!ENTITY torbirdy.accountprefs.cancel.button "Revocare">
+<!ENTITY torbirdy.accountprefs.save.button "Salvează">
+<!ENTITY torbirdy.accountprefs.save.key "S">
+
+<!ENTITY torbirdy.prefs.title "Setări TorBirdy">
+<!ENTITY torbirdy.prefs.save.button "Salvează">
+<!ENTITY torbirdy.prefs.save.key "s">
+<!ENTITY torbirdy.prefs.cancel.button "Revocare">
+<!ENTITY torbirdy.prefs.extra2.button "Restaurează setările implicite">
+<!ENTITY torbirdy.prefs.extra2.key "d">
+<!ENTITY torbirdy.prefs.testproxy.button "Testează setările Proxy">
+<!ENTITY torbirdy.prefs.testproxy.key "p">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Intimitate">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Securitate">
+<!ENTITY torbirdy.prefs.recommended.text "Folosește setările proxy recomandate pentru TorBirdy (Tor)">
+<!ENTITY torbirdy.prefs.recommended.key "r">
+<!ENTITY torbirdy.prefs.anonservice.text "Alege un serviciu de anonimizare">
+<!ENTITY torbirdy.prefs.anonservice.key "p">
+<!ENTITY torbirdy.prefs.customsettings.text "Folosește setări individualizate pentru proxy">
+<!ENTITY torbirdy.prefs.customsettings.key "p">
+<!ENTITY torbirdy.prefs.socks_host.label "Host SOCKS:">
+<!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 "Torificare transparentă (atenție: necesită transproxy personalizat sau Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Global">
+<!ENTITY torbirdy.prefs.imap.label "Activează supportul pentru push email pentru conturile IMAP [implicit: dezactivat]">
+<!ENTITY torbirdy.prefs.imap.key "p">
+<!ENTITY torbirdy.prefs.startup_folder.label "Alegeți ultimul folder de mail accesat la pornire [implicit: dezactivat]">
+<!ENTITY torbirdy.prefs.startup_folder.key "p">
+<!ENTITY torbirdy.prefs.timezone.label "Nu seta fusul orar în Thunderbird la UTC [implicit: setează la UTC]">
+<!ENTITY torbirdy.prefs.timezone.key "p">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Nu puneți IDul cheii destinatarului în mesajul criptat [implicit: pune]">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
+<!ENTITY torbirdy.prefs.confirmemail.label "Confirmă înainte de trimiterea emailului dacă Enigmail este activat [implicit: nu confirma]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Permite vrăjitorul de configurare automată a emailului a Thunderbird [implicit: dezactivat]">
+<!ENTITY torbirdy.prefs.emailwizard.key "p">
+<!ENTITY torbirdy.prefs.automatic.label "Verifică pentru mesaje noi automat pentru toate conturile [implicit: dezactivat]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Permite conexiunile către servere care nu suportă SSL/TLS cu renegociere sigură [implicit: nu permite]">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
+<!ENTITY torbirdy.prefs.account_specific "Specific contului">
+<!ENTITY torbirdy.prefs.select_account.key "C">
+<!ENTITY torbirdy.prefs.select_account.label "Alege un cont:">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) de folosit: ">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
+
+<!ENTITY torbirdy.panel.usetor.label "Folosește Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Folosește JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Folosește Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Deschide pagina de setări TorBirdy">
+
+<!ENTITY torbirdy.firstrun.title "Prima rulare a TorBirdy">
diff --git a/chrome/locale/ro/torbirdy.properties b/chrome/locale/ro/torbirdy.properties
new file mode 100644
index 0000000..d5adcd3
--- /dev/null
+++ b/chrome/locale/ro/torbirdy.properties
@@ -0,0 +1,19 @@
+torbirdy.name=TorBirdy
+
+torbirdy.enabled.tor=TorBirdy Activat: Tor
+torbirdy.enabled.jondo=TorBirdy Activat: JonDo
+torbirdy.enabled.custom=TorBirdy Activat: Proxy Personalizat
+torbirdy.enabled.torification=TorBirdy activat: torificare transparentă
+torbirdy.enabled.whonix=TorBirdy Activat: Whonix
+torbirdy.disabled=TorBirdy: Dezactivat!
+
+torbirdy.email.prompt=TorBirdy a dezactivat expertul configurație automată pentru a vă proteja anonimatul.\n\nSetările de securitate recomandate pentru %S au fost stabilite.\n\nPuteți acum configura manual setările celuilalt cont.
+
+torbirdy.email.advanced=Vă rugăm să luați la cunoștință faptul că schimbând setările avansate ale lui TorBirdy NU este recomandat.\n\nAr trebui să continuați doar în cazul în care sunteți sigur de ceea ce faceți.
+torbirdy.email.advanced.nextwarning=Arată această notificare data viitoare
+torbirdy.email.advanced.title=Setări Avansate TorBirdy
+
+torbirdy.restart=Trebuie sa repornesti Thunderbird pentru fusul orar dorit pentru a avea efect.
+
+torbirdy.firstrun=Acum rulați TorBirdy.\n\nPentru a vă proteja anonimatul, TorBirdy face ca Thunderbird settings pe care le-a modificat să nu se schimbe, prevenind schimbarea de către dvs sau alt add-on. Sînt unele setări care pot fi schimbate și acelea se schimbă prin fereastra de preferințe a TorBirdy. Cînd TorBirdy este dezinstalat sau oprit, setările revin la valorile implicite (cele de dinaintea instalării TorBirdy).\n\nDacă sînteți un utilizator nou, recomand să citiți cu atenție s [...]
+torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/chrome/locale/ru/torbirdy.dtd b/chrome/locale/ru/torbirdy.dtd
new file mode 100644
index 0000000..8c90aa2
--- /dev/null
+++ b/chrome/locale/ru/torbirdy.dtd
@@ -0,0 +1,63 @@
+<!ENTITY torbirdy.accountprefs.title "Конфигурация аккаунта">
+<!ENTITY torbirdy.accountprefs.startup.label "Проверять наличие новых сообщений при запуске">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
+<!ENTITY torbirdy.accountprefs.minutes.label "Проверять наличие новых сообщений каждые">
+<!ENTITY torbirdy.accountprefs.minutes.key "y">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "протокол">
+<!ENTITY torbirdy.accountprefs.cancel.button "Отмена">
+<!ENTITY torbirdy.accountprefs.save.button "Сохранить">
+<!ENTITY torbirdy.accountprefs.save.key "S">
+
+<!ENTITY torbirdy.prefs.title "Предпочтения TorBirdy ">
+<!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 "d">
+<!ENTITY torbirdy.prefs.testproxy.button "Проверить настройки прокси">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Прокси">
+<!ENTITY torbirdy.prefs.privacy.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">
+<!ENTITY torbirdy.prefs.anonservice.text "Выберите сервис анонимизации">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
+<!ENTITY torbirdy.prefs.customsettings.text "Использовать параметры прокси:">
+<!ENTITY torbirdy.prefs.customsettings.key "c">
+<!ENTITY torbirdy.prefs.socks_host.label "SOCKS хост: ">
+<!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 "Сквозная тарификация (Внимание: требуется специальный transproxy или Tor маршрутизатор)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Глобальные">
+<!ENTITY torbirdy.prefs.imap.label "Активировать поддержку email push для IMAP аккаунтов [по умолчанию: отключено]">
+<!ENTITY torbirdy.prefs.imap.key "p">
+<!ENTITY torbirdy.prefs.startup_folder.label "Выбор последней почтовой папки, к которой осуществлялся доступ, при запуске [по умолчанию: отключено]">
+<!ENTITY torbirdy.prefs.startup_folder.key "l">
+<!ENTITY torbirdy.prefs.timezone.label "Не устанавливать часовой пояс Thunderbird по Гринвичу [по умолчанию: установить по Гринвичу]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Не помещать идентификаторы ключей получателей в зашифрованные сообщения [по умолчанию: отключено]">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
+<!ENTITY torbirdy.prefs.confirmemail.label "Запрашивать активацию Enigmail перед отправкой письма [по умолчанию: не запрашивать]">
+<!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 "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Разрешить соединения с серверами не поддерживающими SSL/TLS с безопасным согласованием [по умолчанию: запретить]">
+<!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 "k">
+
+<!ENTITY torbirdy.panel.usetor.label "Использовать маршрутизатор Tor Onion">
+<!ENTITY torbirdy.panel.usejondo.label "Использовать JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Использовать Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Открыть предпочтения TorBirdy">
+
+<!ENTITY torbirdy.firstrun.title "Первый запуск TorBirdy">
diff --git a/chrome/locale/ru/torbirdy.properties b/chrome/locale/ru/torbirdy.properties
new file mode 100644
index 0000000..d326adf
--- /dev/null
+++ b/chrome/locale/ru/torbirdy.properties
@@ -0,0 +1,19 @@
+torbirdy.name=TorBirdy
+
+torbirdy.enabled.tor=TorBirdy доступно: Tor
+torbirdy.enabled.jondo=TorBirdy Включен: JonDo
+torbirdy.enabled.custom=TorBirdy доступно: Пользовательский Прокси
+torbirdy.enabled.torification=TorBirdy Включен: Прозрачная Tor-ификация
+torbirdy.enabled.whonix=TorBirdy Включен: Whonix
+torbirdy.disabled=TorBirdy:    Отключено!
+
+torbirdy.email.prompt=TorBirdy отключил помощник авто-конфигурации Thunderbird что бы защитить вашу анонимность.\nДля %S были установлены рекомендуемые настройки безопасности.\nТеперь вы можете настроить другие параметры учетной записи вручную.
+
+torbirdy.email.advanced=Пожалуйста, обратите внимание, что изменение расширенных настроек из TorBirdy не рекомендуется. ⏎ ⏎ Вы должны только продолжать, если вы уверены, что вы делаете.
+torbirdy.email.advanced.nextwarning=Показывать это предупреждение в следующий раз
+torbirdy.email.advanced.title=TorBirdy расширенные настройки
+
+torbirdy.restart=Thunderbird необходимо перезапустить, чтобы настройки часового пояса вступили в силу.
+
+torbirdy.firstrun=Вы запустили TorBirdy.\nЧто бы помочь защитить вашу анонимность, TorBirdy будет контролировать настройки Thunderbird, которые он установил, предотвращая их изменение Вами или любым дополнением. Есть несколько настроек, которые могут быть изменены и они доступны в окне настроек TorBirdy. В случае удаления или отключения TorBirdy, все настройки которые он контролировал сбросятся к своим значениям по-умолчанию (значениям которые были до установки TorBirdy).\nЕсли Вы новый  [...]
+torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/chrome/locale/sk/torbirdy.dtd b/chrome/locale/sk/torbirdy.dtd
new file mode 100644
index 0000000..18eaf68
--- /dev/null
+++ b/chrome/locale/sk/torbirdy.dtd
@@ -0,0 +1,63 @@
+<!ENTITY torbirdy.accountprefs.title "Nastavenia účtu">
+<!ENTITY torbirdy.accountprefs.startup.label "Skontrolovať nové správy pri spustení">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
+<!ENTITY torbirdy.accountprefs.minutes.label "Skontrolovať nové správy každých">
+<!ENTITY torbirdy.accountprefs.minutes.key "d">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "minút">
+<!ENTITY torbirdy.accountprefs.cancel.button "Zrušiť">
+<!ENTITY torbirdy.accountprefs.save.button "Uložiť">
+<!ENTITY torbirdy.accountprefs.save.key "S">
+
+<!ENTITY torbirdy.prefs.title "TorBirdy nastavenia">
+<!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 "Test Proxy nastavenia">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Súkromie">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Bezpečnosť">
+<!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 "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 "Transparentná Torifikácia (varovanie: vyžaduje vlastný transproxy alebo Tor router)">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Globálne">
+<!ENTITY torbirdy.prefs.imap.label "Povoliť emailovú podporu push pre IMAP účty [štandardne: vypnuté]">
+<!ENTITY torbirdy.prefs.imap.key "p">
+<!ENTITY torbirdy.prefs.startup_folder.label "Zvoliť posledne navštívenú mailovú zložku pri štarte [štandardne: vypnuté]">
+<!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 "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Nevkladať ID kľúčov príjemcu do zašifrovaných správ [štandardné: vkladať]">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
+<!ENTITY torbirdy.prefs.confirmemail.label "Potvrdiť pred zaslaním emailu v prípade, že je Enigmail povolený [štandardne: nepotvrdzovať]">
+<!ENTITY torbirdy.prefs.confirmemail.key "c">
+<!ENTITY torbirdy.prefs.emailwizard.label "Povoliť v Thunderbirde sprievodcu automatickou emailovou konfiguráciou [štandardne: vypnuté]">
+<!ENTITY torbirdy.prefs.emailwizard.key "w">
+<!ENTITY torbirdy.prefs.automatic.label "Skontrolovať nové správy automaticky pre všetky účty [štandardne: vypnuté]">
+<!ENTITY torbirdy.prefs.automatic.key "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Umožniť pripojenia k serverom nepodporujúcim SSL/TLS s bezpečným prehodnocovaním [štandardne: neumožniť]">
+<!ENTITY torbirdy.prefs.renegotiation.key "r">
+<!ENTITY torbirdy.prefs.account_specific "Špecifické pre účet">
+<!ENTITY torbirdy.prefs.select_account.key "C">
+<!ENTITY torbirdy.prefs.select_account.label "Vyberte účet:">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(y) na použitie:">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k">
+
+<!ENTITY torbirdy.panel.usetor.label "Použiť Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Použiť JonDo (Prémium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Použiť Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Otvoriť nastavenia TorBirdy">
+
+<!ENTITY torbirdy.firstrun.title "Prvé spustenie TorBirdy">
diff --git a/chrome/locale/sk/torbirdy.properties b/chrome/locale/sk/torbirdy.properties
new file mode 100644
index 0000000..14c35bd
--- /dev/null
+++ b/chrome/locale/sk/torbirdy.properties
@@ -0,0 +1,19 @@
+torbirdy.name=TorBirdy
+
+torbirdy.enabled.tor=TorBirdy Povolený: Tor
+torbirdy.enabled.jondo=TorBirdy Povolený: JonDo
+torbirdy.enabled.custom=TorBirdy Povolený:  Vlastné Proxy
+torbirdy.enabled.torification=TorBirdy povolený: Priehľadná Torifikácia
+torbirdy.enabled.whonix=TorBirdy Povolený: Whonix
+torbirdy.disabled=TorBirdy: Zakázaný!
+
+torbirdy.email.prompt=TorBirdy zablokoval automatické nastavenie klienta Thunderbird aby ochránil vašu anonymitu.\n\nOdporúčané nastavenia pre %S boli nastavené.\n\nTeraz môžete nakonfigurovať ostatné nastavenia manuálne.
+
+torbirdy.email.advanced=Prosím berte na vedomie, že zmena pokročilých nastavení TorBirdy NIE JE odporúčaná.\n\nPokračujte iba ak ste si istý, že viete čo robíte.
+torbirdy.email.advanced.nextwarning=Zobraziť túto výstrahu nabudúce
+torbirdy.email.advanced.title=Pokročilé nastavenia TorBirdy
+
+torbirdy.restart=Musíte reštartovať Thunderbird, aby sa prejavili zmeny v nastavení časového pásma.
+
+torbirdy.firstrun=Práve používate TorBirdy.\n\nPre ochranu Vašej anonymity, TorBirdy vynúti svoje nastavenia Thunderbird-u, aby nemohli byť zmenené Vami alebo nejakým doplnkom. Niektoré nastavenia je možné zmeniť a sú prístupné cez nastavenia TorBirdy. Ak odinštalujete TorBirdy, tak sa všetky nastavenia vrátia na východzie hodnoty (hodnoty po inštalácii TorBirdy).\n\nAk ste nový používateľ, je odporúčané aby ste si prečítali stránku TorBirdy a pochopili čo sa snažíme docieliť pre užívate [...]
+torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/chrome/locale/sl/torbirdy.dtd b/chrome/locale/sl/torbirdy.dtd
new file mode 100644
index 0000000..0445858
--- /dev/null
+++ b/chrome/locale/sl/torbirdy.dtd
@@ -0,0 +1,63 @@
+<!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 "r">
+<!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 "TorBirdy Preferences">
+<!ENTITY torbirdy.prefs.save.button "Shrani">
+<!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 "Test Proxy Settings">
+<!ENTITY torbirdy.prefs.testproxy.key "P">
+<!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 "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 "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 "P">
+<!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 "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 "P">
+<!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 "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 "TorBirdy First-Run">
diff --git a/chrome/locale/sl/torbirdy.properties b/chrome/locale/sl/torbirdy.properties
new file mode 100644
index 0000000..6cc0fee
--- /dev/null
+++ b/chrome/locale/sl/torbirdy.properties
@@ -0,0 +1,19 @@
+torbirdy.name=TorBirdy
+
+torbirdy.enabled.tor=TorBirdy omogočen: Tor
+torbirdy.enabled.jondo=TorBirdy omogočen: JonDo
+torbirdy.enabled.custom=TorBirdy omogočen: poljuben posredniški strežnik
+torbirdy.enabled.torification=TorBirdy omogočen: transparentna torifikacija
+torbirdy.enabled.whonix=TorBirdy omogočen: Whonix
+torbirdy.disabled=TorBirdy: Onemogočen!
+
+torbirdy.email.prompt=TorBirdy je onemogočil Thunderbirodov čarovnik za samodejno nastavljanje, da bi zaščitil vašo anonimnost.\n\nPriporočljive varnostne nastavitve za %S so bile uporabljene.\n\nZdaj lahko spreminjate ročno še druge nastavitve računa.
+
+torbirdy.email.advanced=Vedite, da NI priporočljivo spreminjati naprednih TorBirdy nastavitev.\n\nLahko nadaljujete le, če natanko veste, kaj počnete.
+torbirdy.email.advanced.nextwarning=Prikaži to opozorilo tudi v bodoče
+torbirdy.email.advanced.title=TorBirdy napredne nastavitve
+
+torbirdy.restart=Morate ponovno zagnati Thunderbird, da bo sprememba časovnega pasu učinkovala.
+
+torbirdy.firstrun=Zdaj poganjate TorBirdy.\n\nDa bi zaščitil vašo anonimnost, TorBirdy ohranja nastavitve Thunderbirda, ki jih je uveljavil, da jih ne bi pomotoma spremenili vi ali kateri izmed dodatkov. Nekatere nastavitve je vseeno možno spreminjati, to lahko počnete prek TorBirdyjevih možnosti. Ko je TorBirdy onemogočen ali odstranjen, se vse nastavitve povrnejo na privzete vrednosti (na vrednosti pred namestitvijo TorBirdy dodatka).\n\nNovim uporabnikom priporočamo pozoren ogled sple [...]
+torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/chrome/locale/sr/torbirdy.dtd b/chrome/locale/sr/torbirdy.dtd
new file mode 100644
index 0000000..deff520
--- /dev/null
+++ b/chrome/locale/sr/torbirdy.dtd
@@ -0,0 +1,68 @@
+<!ENTITY torbirdy.accountprefs.title "Подешавање налога">
+<!ENTITY torbirdy.accountprefs.startup.label "Провјери нове поруке одмах након покретања">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
+<!ENTITY torbirdy.accountprefs.minutes.label "Провјери нове поруке сваких">
+<!ENTITY torbirdy.accountprefs.minutes.key "y">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "минута">
+<!ENTITY torbirdy.accountprefs.cancel.button "Откажи">
+<!ENTITY torbirdy.accountprefs.save.button "Запамти">
+<!ENTITY torbirdy.accountprefs.save.key "S">
+
+<!ENTITY torbirdy.prefs.title "TorBirdy подешавања">
+<!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 "Testirajte proxy podesavanja">
+<!ENTITY torbirdy.prefs.testproxy.key "n">
+<!ENTITY torbirdy.prefs.proxy.label "Proxy">
+<!ENTITY torbirdy.prefs.privacy.label "Privatnost">
+<!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
+<!ENTITY torbirdy.prefs.security.label "Sigurnost">
+<!ENTITY torbirdy.prefs.recommended.text "Користите препоручена прокси подешавања за TorBirdy (Tor)">
+<!ENTITY torbirdy.prefs.recommended.key "r">
+<!ENTITY torbirdy.prefs.anonservice.text "Изаберите сервис заштите (анонимности)">
+<!ENTITY torbirdy.prefs.anonservice.key "a">
+<!ENTITY torbirdy.prefs.customsettings.text "Кориштење не стандардних прокси подешавања">
+<!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 "транспарентан Torification">
+<!ENTITY torbirdy.prefs.torification.key "t">
+<!ENTITY torbirdy.prefs.global "Globalno">
+<!ENTITY torbirdy.prefs.imap.label "Укључите просљеђивање порука према вашем IMAP налогу [стандардно: искључено]">
+<!ENTITY torbirdy.prefs.imap.key "p">
+<!ENTITY torbirdy.prefs.startup_folder.label "Odaberite poslednji pristupljeni folder za mail pri pokretanju.
+[standardno podesavanje: iskljuceno]">
+<!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">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Не стављајте кључена ИД примаоца у кодирану порука [дефаулт: пут]
+">
+<!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 "Ukljucite Thunderbird-ov carobnjak za automatsku email konfiguraciju.
+[standardno podesavanje: iskljuceno]">
+<!ENTITY torbirdy.prefs.emailwizard.key "a">
+<!ENTITY torbirdy.prefs.automatic.label "Проверите за нове поруке се аутоматски за све рачуне [дефаулт: искључен]
+">
+<!ENTITY torbirdy.prefs.automatic.key "ф">
+<!ENTITY torbirdy.prefs.renegotiation.label "Dozvolite povezivanje na servere koji ne podrzavaju SSL/TLS sa sigurnom rekonfiguracijom
+[standardn podesavanje: ne dozvoljavaj]">
+<!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 "Kljucni server(i) za upotrebu:">
+<!ENTITY torbirdy.prefs.enigmail.keyserver.key "s">
+
+<!ENTITY torbirdy.panel.usetor.label "Koristi Tor Onion Router">
+<!ENTITY torbirdy.panel.usejondo.label "Koristi JonDo (Premium)">
+<!ENTITY torbirdy.panel.usewhonix.label "Koristi Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Otvori TorBirdy Preferences">
+
+<!ENTITY torbirdy.firstrun.title "Torbirdy Prvi ">
diff --git a/chrome/locale/sr/torbirdy.properties b/chrome/locale/sr/torbirdy.properties
new file mode 100644
index 0000000..0f3a29e
--- /dev/null
+++ b/chrome/locale/sr/torbirdy.properties
@@ -0,0 +1,19 @@
+torbirdy.name=TorBirdy
+
+torbirdy.enabled.tor=TorBirdy Омогућено:    Tor
+torbirdy.enabled.jondo=TorBirdy Омогућено:    JonDo
+torbirdy.enabled.custom=TorBirdy Омогућено:    Нестандардни прокси
+torbirdy.enabled.torification=TorBirdy Омогућено:    транспарентан Torification
+torbirdy.enabled.whonix=TorBirdy omogucen: Whonix
+torbirdy.disabled=TorBirdy:    Искључено!
+
+torbirdy.email.prompt=TorBirdy је искључио Thunderbird-ов чаробњак за аутоматско подешавање да би заштитио вашу анонимност.\n\nПрепоручена сигурносна подешавања за %S су постављена.\n\\Остала подешавања налога можете променити ручно.
+
+torbirdy.email.advanced=Упозорићемо вас да напредна подешавања Tor-a није препоручено миењати ако сте просечан корисник.\n\nНаставите само ако сте сигурни у то што радите.
+torbirdy.email.advanced.nextwarning=Покажи ово упозорење при следећем покретању
+torbirdy.email.advanced.title=TorBirdy Напредна подешавања
+
+torbirdy.restart=Морате рестартовати 'Thunderbird' за временску зону коју ви желите да ступи на снагу.
+
+torbirdy.firstrun=Sada koristite TorBirdy.\n\nDa bi zastili vasu anonimnost, TorBirdy ce sprovesti Thunderbird postavke koje su podesene, sprecavajuci da pobudu promenjene od strane vas ili nekog dodatka.\n\nPostoje neke postavke koje se mogu menjati i njima mozete pristupiti preko Preferences opcije u TorBirdy. Kada izbrisete TorBirdy, sve postavke ce biti vracenje na njihove pocetne vrednosti. (Vrednosti pre instalacije TorBirdy programa)\n\nAko ste vi novi korisnik, preporucujemo vam  [...]
+torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/chrome/locale/sv/torbirdy.properties b/chrome/locale/sv/torbirdy.properties
index bee785b..d5df22f 100644
--- a/chrome/locale/sv/torbirdy.properties
+++ b/chrome/locale/sv/torbirdy.properties
@@ -7,13 +7,13 @@ torbirdy.enabled.torification=TorBirdy aktiverad:    Transparent Torification
 torbirdy.enabled.whonix=TorBirdy aktiverat: Whonix
 torbirdy.disabled=TorBirdy:    Inaktiverad!
 
-torbirdy.email.prompt=TorBirdy har inaktiverat Thunderbirds automatiska konfiguraions guide för att säkerställa din anonymitet.\n\nRekommenderade säkerhetsinställningar för %S har aktiverats.\n\nDu kan nu konfigurera andra kontoinställningar manuellt.
+torbirdy.email.prompt=TorBirdy har inaktiverat Thunderbirds automatiska konfigurationsguide för att skydda din anonymitet.\n\nRekommenderade säkerhetsinställningar för %S har aktiverats.\n\nDu kan nu konfigurera andra kontoinställningar manuellt.
 
-torbirdy.email.advanced=Vänligen notera att ändringar av avancerade inställningar i TorBirdy INTE rekommenderas.\n\nDu bör enbart fortsätta om du är säker på vad du gör.
+torbirdy.email.advanced=Notera att ändringar av avancerade inställningar i TorBirdy INTE rekommenderas.\n\nDu bör enbart fortsätta om du är säker på vad du gör.
 torbirdy.email.advanced.nextwarning=Visa denna varningstext nästa gång
 torbirdy.email.advanced.title=TorBirdy Avancerade Inställningar
 
 torbirdy.restart=Thunderbird måste startas om för att tidszonsinställningarna ska börja gälla.
 
-torbirdy.firstrun=Du kör nu TorBirdy.\n\nFör att skydda din anonymitet kommer TorBirdy att övervaka de Thunderbird inställningar som det satt och hindra dem att ändras av dig eller något tilläggsprogram. Det finns vissa inställningar som kan ändras och du kan nå dessa genom TorBirdys inställningsdialog. När TorBirdy avinstalleras eller inaktiveras kommer alla inställningar som det gjort att återställas till dess standardval (de val som var gjorda innan TorBirdy installeraders).\n\nOm du  [...]
+torbirdy.firstrun=Du kör nu TorBirdy.\n\nFör att skydda din anonymitet kommer TorBirdy att övervaka de Thunderbird-inställningar som det satt och hindra dem att ändras av dig eller något tilläggsprogram. Det finns vissa inställningar som kan ändras och du kan nå dessa genom TorBirdys inställningsdialog. När TorBirdy avinstalleras eller inaktiveras kommer alla inställningar som det gjort att återställas till dess standardval (de val som var gjorda innan TorBirdy installeraders).\n\nOm du  [...]
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/chrome/locale/tr/torbirdy.dtd b/chrome/locale/tr/torbirdy.dtd
index 537fe65..1051852 100644
--- a/chrome/locale/tr/torbirdy.dtd
+++ b/chrome/locale/tr/torbirdy.dtd
@@ -4,14 +4,14 @@
 <!ENTITY torbirdy.accountprefs.minutes.label "Yeni ileti denetleme süresi">
 <!ENTITY torbirdy.accountprefs.minutes.key "y">
 <!ENTITY torbirdy.accountprefs.minutes.trail.label "dakika">
-<!ENTITY torbirdy.accountprefs.cancel.button "İptal">
+<!ENTITY torbirdy.accountprefs.cancel.button "Vazgeç">
 <!ENTITY torbirdy.accountprefs.save.button "Kaydet">
 <!ENTITY torbirdy.accountprefs.save.key "S">
 
 <!ENTITY torbirdy.prefs.title "TorBirdy Seçenekleri">
 <!ENTITY torbirdy.prefs.save.button "Kaydet">
 <!ENTITY torbirdy.prefs.save.key "s">
-<!ENTITY torbirdy.prefs.cancel.button "İptal
+<!ENTITY torbirdy.prefs.cancel.button "Vazgeç
             ">
 <!ENTITY torbirdy.prefs.extra2.button "Varsayılan Ayarlar">
 <!ENTITY torbirdy.prefs.extra2.key "d">
@@ -21,20 +21,20 @@
 <!ENTITY torbirdy.prefs.privacy.label "Gizlilik">
 <!ENTITY torbirdy.prefs.enigmail.label "Enigmail">
 <!ENTITY torbirdy.prefs.security.label "Güvenlik">
-<!ENTITY torbirdy.prefs.recommended.text "TorBirdy(Tor)  için önerilen proxy ayarlarını kullan">
+<!ENTITY torbirdy.prefs.recommended.text "TorBirdy (Tor) için önerilen vekil sunucu ayarlarını kullan">
 <!ENTITY torbirdy.prefs.recommended.key "r">
 <!ENTITY torbirdy.prefs.anonservice.text "Anonimleştirme servisi seçin. ">
 <!ENTITY torbirdy.prefs.anonservice.key "a">
-<!ENTITY torbirdy.prefs.customsettings.text "Özel proxy ayarları kullan">
+<!ENTITY torbirdy.prefs.customsettings.text "Özel vekil sunucu ayarları kullan">
 <!ENTITY torbirdy.prefs.customsettings.key "c">
 <!ENTITY torbirdy.prefs.socks_host.label "SOCKS Konuğu:">
 <!ENTITY torbirdy.prefs.socks_host.key "h">
-<!ENTITY torbirdy.prefs.socks_port.label "Port: ">
+<!ENTITY torbirdy.prefs.socks_port.label "Bağl. Nok.:">
 <!ENTITY torbirdy.prefs.socks_port.key "p">
-<!ENTITY torbirdy.prefs.torification.label "Transparan Tor Bildirimleri (uyarı: özel olarak ayarlanmış Transproxy ya da Tor router gerekir)">
+<!ENTITY torbirdy.prefs.torification.label "Şeffaf Tor Bildirimleri (uyarı: özel olarak ayarlanmış Transproxy ya da Tor yönlendirici gerekir)">
 <!ENTITY torbirdy.prefs.torification.key "t">
 <!ENTITY torbirdy.prefs.global "Küresel">
-<!ENTITY torbirdy.prefs.imap.label "IMAP hesapları için Push E-mail teknolojisini aktifleştir [varsayılan: pasif]">
+<!ENTITY torbirdy.prefs.imap.label "IMAP hesapları için Push (İtme) e-posta desteğini etkinleştir [varsayılan: devre dışı]">
 <!ENTITY torbirdy.prefs.imap.key "p">
 <!ENTITY torbirdy.prefs.startup_folder.label "Başlangıçta en son erişilen posta klasörünü seç [öntanımlı: devre dışı]">
 <!ENTITY torbirdy.prefs.startup_folder.key "l">
@@ -42,9 +42,9 @@
 <!ENTITY torbirdy.prefs.timezone.key "z">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Şifrelenmiş iletiye alıcı anahtar kimliğini koyma [öntanımlı: koy]">
 <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "p">
-<!ENTITY torbirdy.prefs.confirmemail.label "Eğer Enigmail etkin ise email yollamadan önce onayla [default: do not confirm]">
+<!ENTITY torbirdy.prefs.confirmemail.label "Eğer Enigmail etkin ise e-posta yollamadan önce onayla [varsayılan: onaylama]">
 <!ENTITY torbirdy.prefs.confirmemail.key "c">
-<!ENTITY torbirdy.prefs.emailwizard.label "Thunderbird'ün otomatik eposta ayarı sihirbazını aktifleştir [varsayılan: pasif]">
+<!ENTITY torbirdy.prefs.emailwizard.label "Thunderbird'ün otomatik e-posta ayarı sihirbazını etkinleştir [varsayılan: devre dışı]">
 <!ENTITY torbirdy.prefs.emailwizard.key "w">
 <!ENTITY torbirdy.prefs.automatic.label "Tüm hesaplar için iletileri otomatik olarak denetle [öntanımlı: devre dışı]">
 <!ENTITY torbirdy.prefs.automatic.key "f">
diff --git a/chrome/locale/tr/torbirdy.properties b/chrome/locale/tr/torbirdy.properties
index 56c0447..b6ab47e 100644
--- a/chrome/locale/tr/torbirdy.properties
+++ b/chrome/locale/tr/torbirdy.properties
@@ -2,7 +2,7 @@ torbirdy.name=TorBirdy
 
 torbirdy.enabled.tor=TorBirdy Aktif:    Tor
 torbirdy.enabled.jondo=TorBirdy Aktif:    JonDo
-torbirdy.enabled.custom=TorBirdy Aktif:    Özelleştirilmiş Proxy
+torbirdy.enabled.custom=TorBirdy Etkin:    Özel Vekil Sunucu
 torbirdy.enabled.torification=TorBirdy Aktifleştirildi: Transparan Tor Bildirimi
 torbirdy.enabled.whonix=TorBirdy Aktifleştirildi:    Whonix
 torbirdy.disabled=TorBirdy:    Pasif!
diff --git a/chrome/locale/uk/torbirdy.dtd b/chrome/locale/uk/torbirdy.dtd
new file mode 100644
index 0000000..70a02aa
--- /dev/null
+++ b/chrome/locale/uk/torbirdy.dtd
@@ -0,0 +1,63 @@
+<!ENTITY torbirdy.accountprefs.title "Конфігурація Аккаунта">
+<!ENTITY torbirdy.accountprefs.startup.label "Перевіряти наявність нових повідомлень під час запуску">
+<!ENTITY torbirdy.accountprefs.startup.key "C">
+<!ENTITY torbirdy.accountprefs.minutes.label "Перевіряти наявність нових повідомлень кожні">
+<!ENTITY torbirdy.accountprefs.minutes.key "r">
+<!ENTITY torbirdy.accountprefs.minutes.trail.label "Хвилин">
+<!ENTITY torbirdy.accountprefs.cancel.button "Відміна">
+<!ENTITY torbirdy.accountprefs.save.button "Зберегти">
+<!ENTITY torbirdy.accountprefs.save.key "S">
+
+<!ENTITY torbirdy.prefs.title "Налаштування TorBirdy">
+<!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 "d">
+<!ENTITY torbirdy.prefs.testproxy.button "Тестувати налаштування проксі">
+<!ENTITY torbirdy.prefs.testproxy.key "p">
+<!ENTITY torbirdy.prefs.proxy.label "Проксі">
+<!ENTITY torbirdy.prefs.privacy.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">
+<!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 "Вузол SOCKS:">
+<!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 "Наскрізна тарифікація (попередження: необхідно спеціальний transproxy або Tor маршрутизатор)">
+<!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.key "p">
+<!ENTITY torbirdy.prefs.timezone.label "Не встановлювати часовий пояс Thunderbird по Гринвічу [за замовчуванням: встановити по Гринвічу]">
+<!ENTITY torbirdy.prefs.timezone.key "z">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Не вставляти ідентифікатори ключів у зашифровані повідомлення [за замовчуванням: вставляти]">
+<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
+<!ENTITY torbirdy.prefs.confirmemail.label "Підтверджувати перед відправкою листа, якщо Enigmail активний [за замовчуванням: не підтверджувати]">
+<!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 "f">
+<!ENTITY torbirdy.prefs.renegotiation.label "Дозволити з'єднання з серверами, що не підтримують SSL/TLS з безпечним узгодженням [за замовчуванням: не дозволяти]">
+<!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 "k">
+
+<!ENTITY torbirdy.panel.usetor.label "Використовувати Tor Onion маршрутизатор">
+<!ENTITY torbirdy.panel.usejondo.label "Використовувати JonDo ">
+<!ENTITY torbirdy.panel.usewhonix.label "Використовувати Whonix">
+<!ENTITY torbirdy.panel.preferences.label "Відкрити налаштування TorBirdy">
+
+<!ENTITY torbirdy.firstrun.title "Перший запуск TorBirdy">
diff --git a/chrome/locale/uk/torbirdy.properties b/chrome/locale/uk/torbirdy.properties
new file mode 100644
index 0000000..8216ca0
--- /dev/null
+++ b/chrome/locale/uk/torbirdy.properties
@@ -0,0 +1,19 @@
+torbirdy.name=TorBirdy
+
+torbirdy.enabled.tor=TorBirdy доступно: Tor
+torbirdy.enabled.jondo=TorBirdy Включений: JonDo
+torbirdy.enabled.custom=TorBirdy доступно: користувача Проксі
+torbirdy.enabled.torification=TorBirdy Включений: Прозора Tor-іфікація
+torbirdy.enabled.whonix=TorBirdy Включений: Whonix
+torbirdy.disabled=TorBirdy: Відключено!
+
+torbirdy.email.prompt=TorBirdy вимкнув майстра автоконфігурації Thunderbird для захисту вашої анонімності.\n\nРекомендовані захисні опції для %S були встановлені\n\nТепер ви можете коригувати налаштування іншого акаунту.
+
+torbirdy.email.advanced=Пам’ятайте, що зміна рекомендованих налаштувань TorBirdy НЕ рекомендовані.\n\nЯкщо ви впевнені в своїх діях, продовжіть для підтвердження.
+torbirdy.email.advanced.nextwarning=Показувати це попередження наступного разу
+torbirdy.email.advanced.title=TorBirdy розширені налаштування
+
+torbirdy.restart=Thunderbird необхідно перезапустити, щоб налаштування часового поясу вступили в силу.
+
+torbirdy.firstrun=Ви встановили TorBirdy.\n\nДля захисту вашої анонімності TorBirdy буде захищати налаштування Thunderbird, якщо такі були встановленні, тим самим захищаючи їх від змін, що були зроблені Вами або будь-яким додатком. Це декілька опцій, що можуть бути змінені і відповідають вподобанням TorBirdy. Якщо TorBirdy не встановлений або вимкнений, усі налаштування, що були змінені, повернуться на стандартні значення.\n\nЯкщо ви вперше встановили TorBirdy, рекомендуємо вам перейти н [...]
+torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/chrome/locale/zh-CN/torbirdy.dtd b/chrome/locale/zh-CN/torbirdy.dtd
deleted file mode 100644
index 5fb8a34..0000000
--- a/chrome/locale/zh-CN/torbirdy.dtd
+++ /dev/null
@@ -1,63 +0,0 @@
-<!ENTITY torbirdy.accountprefs.title "帐户设置">
-<!ENTITY torbirdy.accountprefs.startup.label "在启动时检查新邮件">
-<!ENTITY torbirdy.accountprefs.startup.key "C">
-<!ENTITY torbirdy.accountprefs.minutes.label "新邮件检查周期,每隔">
-<!ENTITY torbirdy.accountprefs.minutes.key "y">
-<!ENTITY torbirdy.accountprefs.minutes.trail.label "分钟">
-<!ENTITY torbirdy.accountprefs.cancel.button "取消">
-<!ENTITY torbirdy.accountprefs.save.button "保存">
-<!ENTITY torbirdy.accountprefs.save.key "S">
-
-<!ENTITY torbirdy.prefs.title "TorBirdy 首选项">
-<!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 "d">
-<!ENTITY torbirdy.prefs.testproxy.button "测试代理设置">
-<!ENTITY torbirdy.prefs.testproxy.key "n">
-<!ENTITY torbirdy.prefs.proxy.label "代理">
-<!ENTITY torbirdy.prefs.privacy.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">
-<!ENTITY torbirdy.prefs.anonservice.text "选择匿名服务">
-<!ENTITY torbirdy.prefs.anonservice.key "a">
-<!ENTITY torbirdy.prefs.customsettings.text "使用自定义代理设置">
-<!ENTITY torbirdy.prefs.customsettings.key "c">
-<!ENTITY torbirdy.prefs.socks_host.label "SOCKS 主机:">
-<!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 "透明 Torification(警告:需自定义 transproxy 或 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.key "l">
-<!ENTITY torbirdy.prefs.timezone.label "请勿将 Thunderbird 的时区设置为 UTC [默认:设置为 UTC]">
-<!ENTITY torbirdy.prefs.timezone.key "z">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "请勿讲收件人密钥 ID 放入加密邮件[默认:放入]">
-<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r">
-<!ENTITY torbirdy.prefs.confirmemail.label "在发送电子邮件之前,确认 Enigmail 是否已启用 [默认:不确认]">
-<!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 "f">
-<!ENTITY torbirdy.prefs.renegotiation.label "允许连接至不支持具有安全重新协商机制的 SSL/TLS 的服务器 [默认:不允许]">
-<!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 "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 "TorBirdy First-Run">
diff --git a/chrome/locale/zh-CN/torbirdy.properties b/chrome/locale/zh-CN/torbirdy.properties
deleted file mode 100644
index e11825c..0000000
--- a/chrome/locale/zh-CN/torbirdy.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-torbirdy.name=TorBirdy
-
-torbirdy.enabled.tor=TorBirdy 已启用:Tor
-torbirdy.enabled.jondo=TorBirdy 已启用:JonDo
-torbirdy.enabled.custom=TorBirdy 已启用:自定义代理
-torbirdy.enabled.torification=TorBirdy 已启用:透明 Torification
-torbirdy.enabled.whonix=TorBirdy 已启用:Whonix
-torbirdy.disabled=TorBirdy:已禁用!
-
-torbirdy.email.prompt=TorBirdy 已禁用 Thunderbird 自动配置向导以保护你的匿名性。\n\n已设置为 %S 的建议安全设置。\n\n现在可手动配置其他帐户设置。
-
-torbirdy.email.advanced=请注意:建议不要修改高级设置!\n\n除非你非常了解这些操作,否则请勿继续。
-torbirdy.email.advanced.nextwarning=下次显示此警告
-torbirdy.email.advanced.title=TorBirdy 高级设置
-
-torbirdy.restart=您必须重新启动 Thunderbird 才能使时区设置生效。
-
-torbirdy.firstrun=当前正在运行 TorBirdy。\n\n为了保护用户的匿名性,TorBirdy 强制设定了 Thunderbird 设置,以便防止用户或其他任何附加组件对其进行修改。某些设置可通过 TorBirdy 选项对话框访问并修改。卸载或禁用 TorBirdy 之后,该组件对设置所作的全部修改将重置未默认指(即在安装 TorBirdy 之前的值)。\n\n如果你是新用户,建议查阅 TorBirdy 网站,以理解用户可通过 TorBirdy 到达何种目的。
-torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
diff --git a/components/torbirdy.js b/components/torbirdy.js
index a88a19b..40adadb 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -45,7 +45,6 @@ const TorBirdyPrefs = {
   "network.proxy.socks": "127.0.0.1",
   "network.proxy.socks_port": 9150,
   "network.proxy.socks_version": 5,
-  "network.proxy.no_proxies_on": "localhost, 127.0.0.1",
 
   // Set DNS proxying through SOCKS5.
   "network.proxy.socks_remote_dns": true,
@@ -156,6 +155,11 @@ const TorBirdyPrefs = {
   // https://lists.torproject.org/pipermail/tor-talk/2012-May/024395.html
   "mailnews.reply_header_type": 1,
   "mailnews.reply_header_authorwrote": "%s",
+  "mailnews.reply_header_authorwrotesingle": "#1:",
+  // Show Sender header in message pane (#10226).
+  // http://heise.de/-2044405
+  // https://bugzilla.mozilla.org/show_bug.cgi?id=332639
+  "mailnews.headers.showSender": true,
 
   /*
     Mail
@@ -214,7 +218,7 @@ const TorBirdyPrefs = {
                                               "--keyserver-options http-proxy=http://127.0.0.1:8118 ",
                                             
   // The default key server should be a hidden service and this is the only known one (it's part of the normal SKS network)
-  "extensions.enigmail.keyserver": "hkp://2eghzlv2wwcq7u7y.onion",
+  "extensions.enigmail.keyserver": "hkp://qdigse2yzvuglcix.onion",
 
   // Force GnuPG to use SHA512.
   "extensions.enigmail.mimeHashAlgorithm": 5,
@@ -297,7 +301,7 @@ const TorBirdyPrefs = {
 // when TorBirdy is initialized that should be preserved instead. When TorBirdy
 // is disabled or uninstalled, these preferences are restored to their original
 // value. All such preferences go here.
-const TorBirdyOldPrefs = [
+var TorBirdyOldPrefs = [
   "network.proxy.type",
   "network.proxy.ssl_port",
   "network.proxy.ssl",
@@ -409,7 +413,6 @@ TorBirdy.prototype = {
   },
 
   setPrefs: function() {
-    dump("Setting TorBirdy preferences\n");
     // If custom values are set for specific preferences, override the defaults with them.
     // For each preference, get the type and then set the property.
     for (var i = 0; i < this.customPrefs.length; i++) {
@@ -445,7 +448,10 @@ TorBirdy.prototype = {
   setAccountPrefs: function() {
     if (this.prefs.getBoolPref("extensions.torbirdy.first_run")) {
       // Save the current proxy settings so that the settings can be restored in case
-      // TorBirdy is uninstalled or disabled. (TorBirdyOldPrefs)
+      // TorBirdy is uninstalled or disabled. (TorBirdyOldPrefs).
+      // First copy TorBirdyPrefs to TorBirdyOldPrefs.
+      TorBirdyOldPrefs.push.apply(TorBirdyOldPrefs, Object.keys(TorBirdyPrefs));
+
       for (var i = 0; i < TorBirdyOldPrefs.length; i++) {
         var oldPref = TorBirdyOldPrefs[i];
         var type = this.prefs.getPrefType(oldPref);
@@ -485,26 +491,61 @@ TorBirdy.prototype = {
       }
 
       // For only the first run (after that the user can configure the account if need be):
-      //    Iterate through all accounts and disable automatic checking of emails.
+      //    save drafts for IMAP accounts locally
+      //    disable automatic checking of emails and enforce SSL/TLS
       var accounts = this.acctMgr.accounts;
 
-      // To maintain compatibility between Gecko 17+ and Gecko < 17.
       var allAccounts = [];
-      if (accounts.queryElementAt) {
-        for (var i = 0; i < accounts.length; i++) {
-          var account = accounts.queryElementAt(i, Ci.nsIMsgAccount).incomingServer;
-          allAccounts.push(account);
-        }
-      } else {
-        for (var i = 0; i < accounts.Count(); i++) {
-          var account = accounts.QueryElementAt(i, Ci.nsIMsgAccount).incomingServer;
-          allAccounts.push(account);
-        }
+      // To maintain compatibility between Gecko 17+ and Gecko < 17, find out
+      // which version we are on.
+      var newGecko = (accounts.queryElementAt) ? true : false;
+
+      var accountLength = newGecko ? accounts.length : accounts.Count();
+      for (var i = 0; i < accountLength; i++) {
+        var account = (newGecko) ?
+                      accounts.queryElementAt(i, Ci.nsIMsgAccount) :
+                      accounts.QueryElementAt(i, Ci.nsIMsgAccount);
+        allAccounts.push(account);
       }
 
+      // Save account settings for restoring later.
       for (var i = 0; i < allAccounts.length; i++) {
-        // Save account settings for restoring later.
-        var account = allAccounts[i];
+        var identities = allAccounts[i].identities;
+        var account = allAccounts[i].incomingServer;
+
+        // Get the locations of the Draft folder for all identities and save them.
+        // We only need to do this for IMAP accounts.
+        if (account.type === "imap") {
+          // Again ensure we maintain compatibility between different Gecko versions.
+          var identLength = newGecko ? identities.length : identities.Count();
+
+          for (var ident = 0; ident < identLength; ident++) {
+            var identity = (newGecko) ?
+                           identities.queryElementAt(ident, Ci.nsIMsgIdentity) :
+                           identities.QueryElementAt(ident, Ci.nsIMsgIdentity);
+
+            var key = identity.key;
+            // We need to restore the following preferences after we are uninstalled/disabled.
+            var restorePrefs = ["draft_folder", "drafts_folder_picker_mode"];
+
+            for (var i = 0; i < restorePrefs.length; i++) {
+              var pref = "mail.identity.%id%.".replace("%id%", key);
+              var prefName = pref + restorePrefs[i];
+              if (this.prefs.prefHasUserValue(prefName)) {
+                var typePref = this.prefs.getPrefType(prefName);
+                if (typePref === 32) {
+                  var currentPref = this.prefs.getCharPref(prefName);
+                  this.prefs.setCharPref(kRestoreBranch + prefName, currentPref);
+                }
+                TorBirdyOldPrefs.push(prefName);
+              }
+            }
+            // Now apply our setting where we set the Drafts folder to Local Folders.
+            // The user is free to change this as this setting is not enforced.
+            identity.draftFolder = "mailbox://nobody@Local%20Folders/Drafts";
+          }
+        }
+
         var key = account.key;
         var restorePrefs = ["check_new_mail", "login_at_startup",
                             "check_time", "download_on_biff",
diff --git a/gpg.conf b/gpg.conf
new file mode 100644
index 0000000..82a20c7
--- /dev/null
+++ b/gpg.conf
@@ -0,0 +1,91 @@
+## gpg.conf optimized for privacy 0.2
+## homepage:
+## https://github.com/ioerror/torbirdy/pull/11
+## source:
+## https://github.com/ioerror/torbirdy/blob/master/gpg.conf
+
+##################################################################
+## BEGIN some suggestions from TorBirdy setting extensions.enigmail.agentAdditionalParam
+
+## Don't disclose the version
+no-emit-version
+
+## Don't add additional comments (may leak language, etc)
+no-comments
+
+## We want to force UTF-8 everywhere
+display-charset utf-8
+
+## Proxy settings
+keyserver-options http-proxy=socks5://TORIP:TORPORT
+
+keyserver hkp://qdigse2yzvuglcix.onion
+
+## END some suggestions from TorBirdy TorBirdy setting extensions.enigmail.agentAdditionalParam
+##################################################################
+
+##################################################################
+## BEGIN Some suggestions from Debian http://keyring.debian.org/creating-key.html
+
+personal-digest-preferences SHA512
+cert-digest-algo SHA512
+default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed
+
+## END Some suggestions from Debian http://keyring.debian.org/creating-key.html
+##################################################################
+
+##################################################################
+## BEGIN Some suggestions added from riseup https://we.riseup.net/riseuplabs+paow/openpgp-best-practices
+
+## When creating a key, individuals may designate a specific keyserver to use to pull their keys from.
+## The above option will disregard this designation and use the pool, which is useful because (1) it
+## prevents someone from designating an insecure method for pulling their key and (2) if the server
+## designated uses hkps, the refresh will fail because the ca-cert will not match, so the keys will
+## never be refreshed.
+keyserver-options no-honor-keyserver-url
+
+## when outputting certificates, view user IDs distinctly from keys:
+fixed-list-mode
+
+## long keyids are more collision-resistant than short keyids (it's trivial to make a key with any desired short keyid)
+keyid-format 0xlong
+
+## when multiple digests are supported by all recipients, choose the strongest one:
+## already defined above
+#personal-digest-preferences SHA512 SHA384 SHA256 SHA224
+
+## preferences chosen for new keys should prioritize stronger algorithms:
+## already defined above
+#default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 BZIP2 ZLIB ZIP Uncompressed
+
+## If you use a graphical environment (and even if you don't) you should be using an agent:
+## (similar arguments as https://www.debian-administration.org/users/dkg/weblog/64)
+use-agent
+
+## You should always know at a glance which User IDs gpg thinks are legitimately bound to the keys in your keyring:
+verify-options show-uid-validity
+list-options show-uid-validity
+
+## include an unambiguous indicator of which key made a signature:
+## (see http://thread.gmane.org/gmane.mail.notmuch.general/3721/focus=7234)
+sig-notation issuer-fpr at notations.openpgp.fifthhorseman.net=%g
+
+## when making an OpenPGP certification, use a stronger digest than the default SHA1:
+## already defined above
+#cert-digest-algo SHA256
+
+## END Some suggestions added from riseup https://we.riseup.net/riseuplabs+paow/openpgp-best-practices
+##################################################################
+
+##################################################################
+## BEGIN Some suggestions from TorBirdy opt-in's
+
+## Up to you whether you in comment it (remove the single # in front of
+## it) or not. Disabled by default, because it causes too much complaints and
+## confusion.
+
+## Don't include keyids that may disclose the sender or any other non-obvious keyids
+#throw-keyids
+
+## END Some suggestions from TorBirdy opt-in's
+##################################################################
diff --git a/import-translations.sh b/import-translations.sh
new file mode 100755
index 0000000..717c597
--- /dev/null
+++ b/import-translations.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# Script to fetch and update translations. Modified from tor-launcher.
+
+BUNDLE_LOCALES="nl lv de uk ko pl fr nb he el sv sl pt cs it pt-BR  \
+                es id ro sr da ca pa en-GB hu sk ru ar eu tr"
+
+if [ -d translation ];
+then
+  cd translation
+  git fetch origin
+  cd ..
+else
+  git clone https://git.torproject.org/translation.git
+fi
+
+cd translation
+for i in $BUNDLE_LOCALES
+do
+  UL="`echo $i|tr - _`"
+
+  git checkout torbirdy
+  git merge origin/torbirdy
+  cp $UL/torbirdy.dtd ../chrome/locale/$i/torbirdy.dtd
+  cp $UL/torbirdy.properties ../chrome/locale/$i/torbirdy.properties
+done
diff --git a/install.rdf b/install.rdf
index e3b2378..d3108ab 100644
--- a/install.rdf
+++ b/install.rdf
@@ -4,7 +4,7 @@
      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
   <Description about="urn:mozilla:install-manifest">
     <em:id>castironthunderbirdclub at torproject.org</em:id>
-    <em:version>0.1.2</em:version>
+    <em:version>0.1.3</em:version>
     <em:type>2</em:type>
     <em:iconURL>chrome://castironthunderbirdclub/skin/images/tor.png</em:iconURL>
 
@@ -13,7 +13,7 @@
     <Description>
       <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
       <em:minVersion>10.0</em:minVersion>
-      <em:maxVersion>24.*</em:maxVersion>
+      <em:maxVersion>31.*</em:maxVersion>
     </Description>
     </em:targetApplication>
 
diff --git a/patches/date.patch b/patches/date.patch
new file mode 100644
index 0000000..eb3883c
--- /dev/null
+++ b/patches/date.patch
@@ -0,0 +1,70 @@
+# HG changeset patch
+# Parent ec138f1fcabf10f11ba4a4ba662cba34ab625691
+# User Sukhbir Singh <sukhbir.in at gmail.com>
+Added support for removing the Date header
+
+
+diff --git a/mailnews/compose/src/nsMsgCompUtils.cpp b/mailnews/compose/src/nsMsgCompUtils.cpp
+--- a/mailnews/compose/src/nsMsgCompUtils.cpp
++++ b/mailnews/compose/src/nsMsgCompUtils.cpp
+@@ -364,36 +364,42 @@ mime_generate_headers (nsMsgCompFields *
+     if (deliver_mode == MSG_SaveAsTemplate) {
+       const char *pStr = fields->GetTemplateName();
+       pStr = pStr ? pStr : "";
+       ENCODE_AND_PUSH("X-Template: ", false, pStr, charset, usemime);
+     }
+ #endif /* SUPPORT_X_TEMPLATE_NAME */
+   }
+ 
+-  PRExplodedTime now;
+-  PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &now);
+-  int gmtoffset = (now.tm_params.tp_gmt_offset + now.tm_params.tp_dst_offset) / 60;
++  bool local_date_header = true;
++  prefs->GetBoolPref("mailnews.local_date_header_generation", &local_date_header);
+ 
+-  /* Use PR_FormatTimeUSEnglish() to format the date in US English format,
+-     then figure out what our local GMT offset is, and append it (since
+-     PR_FormatTimeUSEnglish() can't do that.) Generate four digit years as
+-     per RFC 1123 (superceding RFC 822.)
+-   */
+-  PR_FormatTimeUSEnglish(buffer_tail, 100,
+-               "Date: %a, %d %b %Y %H:%M:%S ",
+-               &now);
++  if (local_date_header)
++  {
++    PRExplodedTime now;
++    PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &now);
++    int gmtoffset = (now.tm_params.tp_gmt_offset + now.tm_params.tp_dst_offset) / 60;
+ 
+-  buffer_tail += PL_strlen (buffer_tail);
+-  PR_snprintf(buffer_tail, buffer + size - buffer_tail,
+-        "%c%02d%02d" CRLF,
+-        (gmtoffset >= 0 ? '+' : '-'),
+-        ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) / 60),
+-        ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) % 60));
+-  buffer_tail += PL_strlen (buffer_tail);
++    /* Use PR_FormatTimeUSEnglish() to format the date in US English format,
++       then figure out what our local GMT offset is, and append it (since
++       PR_FormatTimeUSEnglish() can't do that.) Generate four digit years as
++       per RFC 1123 (superceding RFC 822.)
++     */
++    PR_FormatTimeUSEnglish(buffer_tail, 100,
++                 "Date: %a, %d %b %Y %H:%M:%S ",
++                 &now);
++
++    buffer_tail += PL_strlen (buffer_tail);
++    PR_snprintf(buffer_tail, buffer + size - buffer_tail,
++          "%c%02d%02d" CRLF,
++          (gmtoffset >= 0 ? '+' : '-'),
++          ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) / 60),
++          ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) % 60));
++    buffer_tail += PL_strlen (buffer_tail);
++  }
+ 
+   if (pFrom && *pFrom)
+   {
+     ENCODE_AND_PUSH("From: ", true, pFrom, charset, usemime);
+   }
+ 
+   if (pReplyTo && *pReplyTo)
+   {
diff --git a/patches/mailnewspref.patch b/patches/mailnewspref.patch
new file mode 100644
index 0000000..6bffc79
--- /dev/null
+++ b/patches/mailnewspref.patch
@@ -0,0 +1,26 @@
+# HG changeset patch
+# Parent 721cec51e68558ab41a21d7f3db1b7de0e20f3bd
+# User Sukhbir Singh <sukhbir.in at gmail.com>
+Set the default preferences for the patches (https://bugzilla.mozilla.org/show_bug.cgi?id=776397)
+
+
+diff --git a/mailnews/mailnews.js b/mailnews/mailnews.js
+--- a/mailnews/mailnews.js
++++ b/mailnews/mailnews.js
+@@ -814,8 +814,16 @@ pref("mail.smtp.qos", 0);
+ pref("mail.nntp.qos", 0);
+ 
+ // default value for IMAP4
+ // in a DSCP environment this should be 56 (0x38, or AF13), ibid.
+ pref("mail.imap.qos", 0);
+ 
+ // PgpMime Addon
+ pref("mail.pgpmime.addon_url", "https://addons.mozilla.org/addon/enigmail/");
++
++// Send emails with the Date header. 
++// If set to false, the Date header will be inserted by the MSA (RFC 4409/RFC 6409).
++pref("mailnews.local_date_header_generation", true);
++
++// Allow a custom message-ID to be set through an extension.
++pref("mailnews.custom_message_id", false);
++pref("mailnews.header.custom_message_id", "");
diff --git a/patches/messageid.patch b/patches/messageid.patch
new file mode 100644
index 0000000..1cbebc8
--- /dev/null
+++ b/patches/messageid.patch
@@ -0,0 +1,49 @@
+# HG changeset patch
+# Parent 433268decbc634fd8855bdc114a9356dfec431dd
+# User Sukhbir Singh <sukhbir.in at gmail.com>
+Added support for setting a custom message-ID
+
+
+diff --git a/mailnews/compose/src/nsMsgCompUtils.cpp b/mailnews/compose/src/nsMsgCompUtils.cpp
+--- a/mailnews/compose/src/nsMsgCompUtils.cpp
++++ b/mailnews/compose/src/nsMsgCompUtils.cpp
+@@ -1109,19 +1109,36 @@ msg_generate_message_id (nsIMsgIdentity 
+       ++host;
+   }
+ 
+   if (!isValidHost(host))
+   /* If we couldn't find a valid host name to use, we can't generate a
+      valid message ID, so bail, and let NNTP and SMTP generate them. */
+     return 0;
+ 
+-  GenerateGlobalRandomBytes((unsigned char *) &salt, sizeof(salt));
+-  return PR_smprintf("<%lX.%lX@%s>",
+-           (unsigned long) now, (unsigned long) salt, host);
++  bool custom_message_id = false;
++  nsCString message_id;
++
++  nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
++  if (NS_SUCCEEDED(rv)) {
++    prefs->GetBoolPref("mailnews.custom_message_id", &custom_message_id);
++    prefs->GetCharPref("mailnews.header.custom_message_id", getter_Copies(message_id));
++  }
++
++  if (!custom_message_id)
++  {
++    GenerateGlobalRandomBytes((unsigned char *) &salt, sizeof(salt));
++    return PR_smprintf("<%lX.%lX@%s>",
++             (unsigned long) now, (unsigned long) salt, host);
++  }
++  else
++  {
++    return PR_smprintf("<%s@%s>",
++             message_id.get(), host);
++  }
+ }
+ 
+ 
+ inline static bool is7bitCharset(const nsCString& charset)
+ {
+   // charset name is canonical (no worry about case-sensitivity)
+   return charset.EqualsLiteral("HZ-GB-2312") ||
+          Substring(charset, 0, 8).EqualsLiteral("ISO-2022-");
diff --git a/patches/unified.patch b/patches/unified.patch
new file mode 100644
index 0000000..0aa1120
--- /dev/null
+++ b/patches/unified.patch
@@ -0,0 +1,130 @@
+# HG changeset patch
+# Parent a9d426e01d37d2a72fcfeb8cd63242982d04adb2
+# User Sukhbir Singh <sukhbir.in at gmail.com>
+Prevent local timestamp disclosure via Date and Message-ID header fields.
+
+
+diff --git a/mailnews/compose/src/nsMsgCompUtils.cpp b/mailnews/compose/src/nsMsgCompUtils.cpp
+--- a/mailnews/compose/src/nsMsgCompUtils.cpp
++++ b/mailnews/compose/src/nsMsgCompUtils.cpp
+@@ -364,36 +364,42 @@ mime_generate_headers (nsMsgCompFields *
+     if (deliver_mode == MSG_SaveAsTemplate) {
+       const char *pStr = fields->GetTemplateName();
+       pStr = pStr ? pStr : "";
+       ENCODE_AND_PUSH("X-Template: ", false, pStr, charset, usemime);
+     }
+ #endif /* SUPPORT_X_TEMPLATE_NAME */
+   }
+ 
+-  PRExplodedTime now;
+-  PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &now);
+-  int gmtoffset = (now.tm_params.tp_gmt_offset + now.tm_params.tp_dst_offset) / 60;
++  bool local_date_header = true;
++  prefs->GetBoolPref("mailnews.local_date_header_generation", &local_date_header);
+ 
+-  /* Use PR_FormatTimeUSEnglish() to format the date in US English format,
+-     then figure out what our local GMT offset is, and append it (since
+-     PR_FormatTimeUSEnglish() can't do that.) Generate four digit years as
+-     per RFC 1123 (superceding RFC 822.)
+-   */
+-  PR_FormatTimeUSEnglish(buffer_tail, 100,
+-               "Date: %a, %d %b %Y %H:%M:%S ",
+-               &now);
++  if (local_date_header)
++  {
++    PRExplodedTime now;
++    PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &now);
++    int gmtoffset = (now.tm_params.tp_gmt_offset + now.tm_params.tp_dst_offset) / 60;
+ 
+-  buffer_tail += PL_strlen (buffer_tail);
+-  PR_snprintf(buffer_tail, buffer + size - buffer_tail,
+-        "%c%02d%02d" CRLF,
+-        (gmtoffset >= 0 ? '+' : '-'),
+-        ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) / 60),
+-        ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) % 60));
+-  buffer_tail += PL_strlen (buffer_tail);
++    /* Use PR_FormatTimeUSEnglish() to format the date in US English format,
++       then figure out what our local GMT offset is, and append it (since
++       PR_FormatTimeUSEnglish() can't do that.) Generate four digit years as
++       per RFC 1123 (superceding RFC 822.)
++     */
++    PR_FormatTimeUSEnglish(buffer_tail, 100,
++                 "Date: %a, %d %b %Y %H:%M:%S ",
++                 &now);
++
++    buffer_tail += PL_strlen (buffer_tail);
++    PR_snprintf(buffer_tail, buffer + size - buffer_tail,
++          "%c%02d%02d" CRLF,
++          (gmtoffset >= 0 ? '+' : '-'),
++          ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) / 60),
++          ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) % 60));
++    buffer_tail += PL_strlen (buffer_tail);
++  }
+ 
+   if (pFrom && *pFrom)
+   {
+     ENCODE_AND_PUSH("From: ", true, pFrom, charset, usemime);
+   }
+ 
+   if (pReplyTo && *pReplyTo)
+   {
+@@ -1109,19 +1115,36 @@ msg_generate_message_id (nsIMsgIdentity 
+       ++host;
+   }
+ 
+   if (!isValidHost(host))
+   /* If we couldn't find a valid host name to use, we can't generate a
+      valid message ID, so bail, and let NNTP and SMTP generate them. */
+     return 0;
+ 
+-  GenerateGlobalRandomBytes((unsigned char *) &salt, sizeof(salt));
+-  return PR_smprintf("<%lX.%lX@%s>",
+-           (unsigned long) now, (unsigned long) salt, host);
++  bool custom_message_id = false;
++  nsCString message_id;
++
++  nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
++  if (NS_SUCCEEDED(rv)) {
++    prefs->GetBoolPref("mailnews.custom_message_id", &custom_message_id);
++    prefs->GetCharPref("mailnews.header.custom_message_id", getter_Copies(message_id));
++  }
++
++  if (!custom_message_id)
++  {
++    GenerateGlobalRandomBytes((unsigned char *) &salt, sizeof(salt));
++    return PR_smprintf("<%lX.%lX@%s>",
++             (unsigned long) now, (unsigned long) salt, host);
++  }
++  else
++  {
++    return PR_smprintf("<%s@%s>",
++             message_id.get(), host);
++  }
+ }
+ 
+ 
+ inline static bool is7bitCharset(const nsCString& charset)
+ {
+   // charset name is canonical (no worry about case-sensitivity)
+   return charset.EqualsLiteral("HZ-GB-2312") ||
+          Substring(charset, 0, 8).EqualsLiteral("ISO-2022-");
+diff --git a/mailnews/mailnews.js b/mailnews/mailnews.js
+--- a/mailnews/mailnews.js
++++ b/mailnews/mailnews.js
+@@ -821,8 +821,16 @@ pref("mail.smtp.qos", 0);
+ pref("mail.nntp.qos", 0);
+ 
+ // default value for IMAP4
+ // in a DSCP environment this should be 56 (0x38, or AF13), ibid.
+ pref("mail.imap.qos", 0);
+ 
+ // PgpMime Addon
+ pref("mail.pgpmime.addon_url", "https://addons.mozilla.org/addon/enigmail/");
++
++// Send emails with the Date header.
++// If set to false, the Date header will be inserted by the MSA (RFC 4409/RFC 6409).
++pref("mailnews.local_date_header_generation", true);
++
++// Allow a custom message-ID to be set through an extension.
++pref("mailnews.custom_message_id", false);
++pref("mailnews.header.custom_message_id", "");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/torbirdy.git



More information about the Pkg-mozext-commits mailing list