[tor-commits] [torbutton/maint-1.9.3] Release preparations for 1.9.3.4

[gk at torproject.org]

commit f266b4cc8fb8d4d277289aab4e09f914bbc064df
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Sep 17 13:11:38 2015 +0000

    Release preparations for 1.9.3.4
    
    Version bump, CHANGELOG update and translations update.
---
 src/CHANGELOG                             |    7 ++++++
 src/chrome/locale/ar/brand.properties     |    1 +
 src/chrome/locale/de/aboutDialog.dtd      |    2 +-
 src/chrome/locale/de/aboutTor.dtd         |    2 +-
 src/chrome/locale/de/brand.properties     |    1 +
 src/chrome/locale/es/brand.properties     |    1 +
 src/chrome/locale/eu/brand.properties     |    1 +
 src/chrome/locale/fa/brand.properties     |    1 +
 src/chrome/locale/fr/brand.properties     |    1 +
 src/chrome/locale/it/brand.properties     |    1 +
 src/chrome/locale/ja/brand.properties     |    1 +
 src/chrome/locale/ja/torbutton.dtd        |   36 ++++++++++++++---------------
 src/chrome/locale/ko/brand.properties     |    1 +
 src/chrome/locale/nl/brand.properties     |    1 +
 src/chrome/locale/pl/brand.properties     |    1 +
 src/chrome/locale/pt/aboutTor.dtd         |    4 ++--
 src/chrome/locale/pt/brand.dtd            |    8 +++----
 src/chrome/locale/pt/brand.properties     |    1 +
 src/chrome/locale/pt/torbutton.dtd        |    8 +++----
 src/chrome/locale/pt/torbutton.properties |    2 +-
 src/chrome/locale/ru/brand.properties     |    1 +
 src/chrome/locale/sv/aboutTor.dtd         |    4 ++--
 src/chrome/locale/sv/brand.properties     |    3 ++-
 src/chrome/locale/tr/aboutDialog.dtd      |   14 +++++------
 src/chrome/locale/tr/aboutTor.dtd         |   10 ++++----
 src/chrome/locale/tr/brand.dtd            |    2 +-
 src/chrome/locale/tr/brand.properties     |    1 +
 src/chrome/locale/tr/torbutton.dtd        |    2 +-
 src/chrome/locale/vi/aboutDialog.dtd      |    2 +-
 src/chrome/locale/vi/aboutTor.dtd         |    2 +-
 src/chrome/locale/vi/brand.dtd            |    6 ++---
 src/chrome/locale/vi/brand.properties     |    5 ++--
 src/chrome/locale/vi/torbutton.dtd        |   34 +++++++++++++--------------
 src/chrome/locale/zh-CN/brand.properties  |    1 +
 src/install.rdf                           |    2 +-
 35 files changed, 97 insertions(+), 73 deletions(-)

diff --git a/src/CHANGELOG b/src/CHANGELOG
index 05472f6..7c2f05f 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,10 @@
+1.9.3.4
+ * Bug 16887: Update intl.accept_languages value
+ * Bug 15493: Update circuit display on new circuit info
+ * Bug 16797: brandShorterName is missing from brand.properties
+ * Bug 14429: Make sure the automatic resizing is disabled
+ * Translation updates
+
 1.9.3.3
  * Bug 14429: Make sure the automatic resizing is enabled
 
diff --git a/src/chrome/locale/ar/brand.properties b/src/chrome/locale/ar/brand.properties
index b1b159d..3cbd6f2 100644
--- a/src/chrome/locale/ar/brand.properties
+++ b/src/chrome/locale/ar/brand.properties
@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+brandShorterName=Tor Browser
 brandShortName=متصفح تور
 brandFullName=متصفح تور
 vendorShortName=مشروع تور
diff --git a/src/chrome/locale/de/aboutDialog.dtd b/src/chrome/locale/de/aboutDialog.dtd
index 649f543..063fa21 100644
--- a/src/chrome/locale/de/aboutDialog.dtd
+++ b/src/chrome/locale/de/aboutDialog.dtd
@@ -16,4 +16,4 @@
 <!ENTITY bottomLinks.grow        "Helfen Sie beim Ausweiten des Tor-Netzwerks!">
 <!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
 <!ENTITY bottomLinks.license  "Lizenzinformationen">
-<!ENTITY tor.TrademarkStatement   ""Tor" und das "Onion-Logo" sind eingetragene Warenzeichen von Tor Project, Inc.">
+<!ENTITY tor.TrademarkStatement   ""Tor" und das "Onion-Logo" sind eingetragene Warenzeichen von the Tor Project, Inc.">
diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd
index 955ac10..2c9535d 100644
--- a/src/chrome/locale/de/aboutTor.dtd
+++ b/src/chrome/locale/de/aboutTor.dtd
@@ -6,7 +6,7 @@
 
 <!ENTITY aboutTor.title "Ãœber Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "Dieser Browser ist nicht mehr aktuell.">
+<!ENTITY aboutTor.outOfDateTorOn.label "ALLERDINGS, ist dieser Browser ist nicht mehr aktuell.">
 <!ENTITY aboutTor.outOfDateTorOff.label "DIESER Browser ist auch veraltet.">
 <!ENTITY aboutTor.outOfDate2.label "Klicken Sie auf die Zwiebel und wählen Sie dann Suche nach Tor-Browser-Aktualisierung.">
 
diff --git a/src/chrome/locale/de/brand.properties b/src/chrome/locale/de/brand.properties
index 84e9a07..60b05d1 100644
--- a/src/chrome/locale/de/brand.properties
+++ b/src/chrome/locale/de/brand.properties
@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+brandShorterName=Tor-Browser
 brandShortName=Tor-Browser
 brandFullName=Tor-Browser
 vendorShortName=Tor-Projekt
diff --git a/src/chrome/locale/es/brand.properties b/src/chrome/locale/es/brand.properties
index 035057f..c59e88f 100644
--- a/src/chrome/locale/es/brand.properties
+++ b/src/chrome/locale/es/brand.properties
@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+brandShorterName=Navegador Tor
 brandShortName=Navegador Tor
 brandFullName=Navegador Tor
 vendorShortName=Proyecto Tor
diff --git a/src/chrome/locale/eu/brand.properties b/src/chrome/locale/eu/brand.properties
index 341c4df..9d0b74c 100644
--- a/src/chrome/locale/eu/brand.properties
+++ b/src/chrome/locale/eu/brand.properties
@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+brandShorterName=Tor Browser
 brandShortName=Tor Browser
 brandFullName=Tor Browser
 vendorShortName=Tor Project
diff --git a/src/chrome/locale/fa/brand.properties b/src/chrome/locale/fa/brand.properties
index fcf2e20..b0589eb 100644
--- a/src/chrome/locale/fa/brand.properties
+++ b/src/chrome/locale/fa/brand.properties
@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+brandShorterName=مرورگر تور
 brandShortName=مرورگر تور
 brandFullName=مرورگر تور
 vendorShortName=پروژهٔ تور
diff --git a/src/chrome/locale/fr/brand.properties b/src/chrome/locale/fr/brand.properties
index 34bbdf9..1e596f1 100644
--- a/src/chrome/locale/fr/brand.properties
+++ b/src/chrome/locale/fr/brand.properties
@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+brandShorterName=Navigateur Tor
 brandShortName=Navigateur Tor
 brandFullName=Navigateur Tor
 vendorShortName=Projet Tor
diff --git a/src/chrome/locale/it/brand.properties b/src/chrome/locale/it/brand.properties
index 3308a03..d43e654 100644
--- a/src/chrome/locale/it/brand.properties
+++ b/src/chrome/locale/it/brand.properties
@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+brandShorterName=Tor Browser
 brandShortName=Tor Browser
 brandFullName=Tor Browser
 vendorShortName=Tor Project
diff --git a/src/chrome/locale/ja/brand.properties b/src/chrome/locale/ja/brand.properties
index e7f8d56..6f4884f 100644
--- a/src/chrome/locale/ja/brand.properties
+++ b/src/chrome/locale/ja/brand.properties
@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+brandShorterName=Tor ブラウザー
 brandShortName=Tor Browser
 brandFullName=Tor Browser
 vendorShortName=Tor Project
diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd
index 31f6db9..0222021 100644
--- a/src/chrome/locale/ja/torbutton.dtd
+++ b/src/chrome/locale/ja/torbutton.dtd
@@ -1,7 +1,7 @@
 <!ENTITY torbutton.prefs.title "Torbutton設定">
-<!ENTITY torbutton.prefs.tor_settings "プロクシ設定">
-<!ENTITY torbutton.prefs.recommended_settings "Firefoxのプロクシ設定を使う">
-<!ENTITY torbutton.prefs.use_privoxy "プロキシを使う">
+<!ENTITY torbutton.prefs.tor_settings "プロキシ設定">
+<!ENTITY torbutton.prefs.recommended_settings "Firefoxのプロキシ設定を使う">
+<!ENTITY torbutton.prefs.use_privoxy "Privoxyを使う">
 <!ENTITY torbutton.prefs.use_polipo "Polipoを使う">
 <!ENTITY torbutton.prefs.custom_settings "カスタム設定のプロキシを使う">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTPプロキシ">
@@ -22,13 +22,13 @@
 <!ENTITY torbutton.pref_connection.more_info "è©³ç´°æƒ…å ±">
 <!ENTITY torbutton.pref_connection_more_info.title "ヘルプ">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbuttonは現在オンになっています。もし、非Torã®è¨­å®šã‚’å¤‰æ›´ã™ã‚‹å ´åˆã¯ã€ã¾ãšTorbuttonをオフにしてください。Torã®è¨­å®šã‚’å¤‰æ›´ã™ã‚‹å ´åˆã«ã¯Torbutton設定ウィンドウを使ってください。">
-<!ENTITY torbutton.context_menu.new_identity "新しい識別">
+<!ENTITY torbutton.context_menu.new_identity "新しい匿名">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
+<!ENTITY torbutton.context_menu.new_circuit "このサイト用の新しい Tor サーキット">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
 <!ENTITY torbutton.context_menu.toggle "Torのステータスを変更">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settings…">
+<!ENTITY torbutton.context_menu.preferences "プライバシーとセキュリティー設定">
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Torbuttonについて...">
 <!ENTITY torbutton.context_menu.about.key "A">
@@ -45,7 +45,7 @@
 <!ENTITY torbutton.context_menu.openTorWindow "新しいウィンドウでTorのURLを開く">
 <!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
-<!ENTITY torbutton.button.tooltip "Torbuttomを初期状態に戻す">
+<!ENTITY torbutton.button.tooltip "Torbuttonを初期状態に戻す">
 <!ENTITY torbutton.prefs.privacy_security_settings "プライバシーとセキュリティーの設定">
 <!ENTITY torbutton.prefs.block_thread "ブロック履歴がTor中に読みます (重要)">
 <!ENTITY torbutton.prefs.block_thwrite "ブロック履歴がTor中に書き込まれます (推奨)">
@@ -55,7 +55,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Torのディスクキャッシュをブロックして、Torの切り替え時にすべてのキャッシュをクリアする">
 <!ENTITY torbutton.prefs.block_cache "Tor中ディスクとメモリーキャッシュのアクセスをブロックする">
 <!ENTITY torbutton.prefs.cookie_jars "非Torのcookieを保護されたjarで保管する">
-<!ENTITY torbutton.prefs.cookie_protection "選択するにはCookie保護ダイアログを使用しましょう">
+<!ENTITY torbutton.prefs.cookie_protection "選択するにはCookie保護ダイアログを使用する">
 <!ENTITY torbutton.prefs.mmm_cookies "手動で自分のcookieを管理する (危険)">
 <!ENTITY torbutton.prefs.clear_cookies "Tor切り替え時にcookieをクリア">
 <!ENTITY torbutton.prefs.disable_plugins "Tor使用中プラグインを無効 (重要)">
@@ -76,9 +76,9 @@
 <!ENTITY torbutton.prefs.headers "ヘッダ送信">
 <!ENTITY torbutton.prefs.spoof_english "アメリカ英語のブラウザを詐称する">
 <!ENTITY torbutton.prefs.refererspoofing "リファラを偽装する">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.spoofblank "Tor使用中は空白のリファラに偽装する (一部のサイトを壊すかもしれません)">
 <!ENTITY torbutton.prefs.smartspoof "Tor使用中はスマートなリファラ偽装 (クロスドメインのリファラを偽装する)">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.nospoof "Tor使用中はリファラ偽装をしない (通常通りリファラを送る)">
 <!ENTITY torbutton.prefs.disable_domstorage "Tor使用中はDOMストレージを無効化 (重要)">
 <!ENTITY torbutton.prefs.forms "フォーム入力">
 <!ENTITY torbutton.prefs.block_tforms "Tor中はパスワードが保存されないようにする (推奨)">
@@ -106,7 +106,7 @@
 <!ENTITY torbutton.prefs.restore_defaults "デフォルト設定に戻す">
 <!ENTITY torbutton.prefs.test_settings "設定をテストする">
 <!ENTITY torbutton.prefs.test_auto "常に最初にFirefoxを起動した後自分のTorの設定をテストする">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
+<!ENTITY torbutton.prefs.disable_livemarks "Tor使用中はライブブックマークの更新を無効化">
 <!ENTITY torbutton.prefs.tor_memory_jar "Torのcookieをディスクに書き込まない">
 <!ENTITY torbutton.prefs.nontor_memory_jar "非Torのcookieをディスクに書き込まない">
 <!ENTITY torbutton.prefs.session_restore "セッションストアに保存し回復するタブ:">
@@ -118,10 +118,10 @@
 <!ENTITY torbutton.prefs.no_proxy_warning "警告: 以上のどんなホストネームの使用も避けてください">
 <!ENTITY torbutton.prefs.spoofreresh "偽装更新">
 <!ENTITY torbutton.prefs.refereroptions "リファラ偽装オプション">
-<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.nospoof "Tor使用中はリファラ偽装をしない (通常通りリファラを送る)">
 <!ENTITY torbutton.prefs.spoofroot "ページの含んでいるフォルダーを偽装する">
 <!ENTITY torbutton.prefs.spoofdomain "ドメインをリファラとして偽装する">
-<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.spoofblank "Tor使用中は空白のリファラに偽装する (一部のサイトを壊すかもしれません)">
 <!ENTITY torbutton.cookiedialog.title "Cookie保護を管理">
 <!ENTITY torbutton.cookiedialog.lockCol "保護済み">
 <!ENTITY torbutton.cookiedialog.domainCol "ホスト">
@@ -132,8 +132,8 @@
 <!ENTITY torbutton.cookiedialog.unprotectCookie "Cookieの保護を解除">
 <!ENTITY torbutton.cookiedialog.removeAllBut "保護されているもの以外削除">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "新しいCookieを保護">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "新しいCOokieを保護しない">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "新しいCookieを保護しない">
+<!ENTITY torbutton.prefs.disable_livemarks "Tor使用中はライブブックマークの更新を無効化">
 <!ENTITY torbutton.prefs.dtd_recommended "(推奨)">
 <!ENTITY torbutton.prefs.dtd_optional "(オプション)">
 <!ENTITY torbutton.prefs.dtd_crucial "(重要)">
@@ -156,7 +156,7 @@
 <!ENTITY torbutton.prefs.sec_low_usable_desc "最大の利便性を提供します。">
 <!ENTITY torbutton.prefs.sec_low_desc "このレベルでは、全てのブラウザーの機能が有効化されます。">
 <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG OpenType フォントレンダリング機能は無効化されます。">
-<!ENTITY torbutton.prefs.sec_med_low "中の低">
+<!ENTITY torbutton.prefs.sec_med_low "低中">
 <!ENTITY torbutton.prefs.sec_gen_desc "このレベルでは、以下の変更が適用されます。(マウスを重ねると詳細を表示)">
 <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 ã®æ˜ åƒã¨éŸ³æ¥½ã¯ No-Script によりクリックするまで再生されません。">
 <!ENTITY torbutton.prefs.sec_html5_tooltip "いくつかのサイトでは、メディアを有効にするために No-Script ツールバーを使う必要があります。">
@@ -168,7 +168,7 @@
 <!ENTITY torbutton.prefs.sec_jar_tooltip "Web 上で JAR ファイルが利用されることは稀ですが、 XSS などに使われることがあります。">
 <!ENTITY torbutton.prefs.sec_mathml_desc "数式を表示するためのいくつかの機能が無効化されます。">
 <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML が無効化されます。">
-<!ENTITY torbutton.prefs.sec_med_high "中の上">
+<!ENTITY torbutton.prefs.sec_med_high "高中">
 <!ENTITY torbutton.prefs.sec_all_jit_desc "全ての JavaScript のパフォーマンス最適化機能が無効化されます。">
 <!ENTITY torbutton.prefs.sec_font_rend_desc "いくつかのフォントレンダリング機能が無効化されます。">
 <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite フォントレンダリング機能は無効化されます。">
@@ -183,5 +183,5 @@
 <!ENTITY torbutton.prefs.sec_webfonts_desc "いくつかのフォントとアイコンは正常に表示されません。">
 <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Web サイトが提供するフォントはブロックされます。">
 <!ENTITY torbutton.prefs.sec_custom "カスタム値">
-<!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
+<!ENTITY torbutton.circuit_display.title "このサイト用の Tor サーキット">
 
diff --git a/src/chrome/locale/ko/brand.properties b/src/chrome/locale/ko/brand.properties
index 8273888..36b8d8b 100644
--- a/src/chrome/locale/ko/brand.properties
+++ b/src/chrome/locale/ko/brand.properties
@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+brandShorterName=Tor Browser
 brandShortName=Tor ë¸Œë¼ìš°ì €
 brandFullName=Tor ë¸Œë¼ìš°ì €
 vendorShortName=Tor í”„ë¡œì íŠ¸
diff --git a/src/chrome/locale/nl/brand.properties b/src/chrome/locale/nl/brand.properties
index 33caa67..036f97a 100644
--- a/src/chrome/locale/nl/brand.properties
+++ b/src/chrome/locale/nl/brand.properties
@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+brandShorterName=Tor Browser
 brandShortName=Tor Browser
 brandFullName=Tor Browser
 vendorShortName=Tor Project
diff --git a/src/chrome/locale/pl/brand.properties b/src/chrome/locale/pl/brand.properties
index d40c141..0381bab 100644
--- a/src/chrome/locale/pl/brand.properties
+++ b/src/chrome/locale/pl/brand.properties
@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+brandShorterName=PrzeglÄ…darka Tor
 brandShortName=PrzeglÄ…darka Tor
 brandFullName=PrzeglÄ…darka Tor
 vendorShortName=Project Tor
diff --git a/src/chrome/locale/pt/aboutTor.dtd b/src/chrome/locale/pt/aboutTor.dtd
index 65aadb6..d3294cf 100644
--- a/src/chrome/locale/pt/aboutTor.dtd
+++ b/src/chrome/locale/pt/aboutTor.dtd
@@ -8,13 +8,13 @@
 
 <!ENTITY aboutTor.outOfDateTorOn.label "CONTUDO, este navegador está desatualizado.">
 <!ENTITY aboutTor.outOfDateTorOff.label "TAMBÉM, este navegador está desatualizado.">
-<!ENTITY aboutTor.outOfDate2.label "Clique na cebola e escolha Procurar por Atualizações do Navegador Tor">
+<!ENTITY aboutTor.outOfDate2.label "Clique na cebola e escolha 'Procurar por Atualizações do Navegador Tor'">
 
 <!ENTITY aboutTor.check.label "Testar as Configurações da Rede Tor">
 
 <!ENTITY aboutTor.success.label "Parabéns!">
 <!ENTITY aboutTor.success2.label "Este navegador está configurado para utilizar o Tor.">
-<!ENTITY aboutTor.success3.label "Agora já pode navegar na Internet anonimamente.">
+<!ENTITY aboutTor.success3.label "Agora já está livre para navegar na Internet anonimamente.">
 <!ENTITY aboutTor.failure.label "Ocorreu Algo de Errado!">
 <!ENTITY aboutTor.failure2.label "O Tor não está  a funcionar neste navegador.">
 <!ENTITY aboutTor.failure3prefix.label "Para assistência, por favor, contacte">
diff --git a/src/chrome/locale/pt/brand.dtd b/src/chrome/locale/pt/brand.dtd
index a39564a..d3566f4 100644
--- a/src/chrome/locale/pt/brand.dtd
+++ b/src/chrome/locale/pt/brand.dtd
@@ -2,14 +2,14 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY  brandShorterName      "Nagador Tor">
+<!ENTITY  brandShorterName      "Navegador Tor">
 <!ENTITY  brandShortName        "Navegador Tor">
 <!ENTITY  brandFullName         "Navegador Tor">
 <!ENTITY  vendorShortName       "Projeto Tor">
 <!ENTITY  trademarkInfo.part1   "O Firefox e os logótipos Firefox são marcas registadas da Fundação Mozilla.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
-<!ENTITY plugins.installed.find "Clique para carregar os plugins do sistema instalados">
-<!ENTITY plugins.installed.enable "Ativar plugins">
-<!ENTITY plugins.installed.disable "Desativar plugins">
+<!ENTITY plugins.installed.find "Clique para carregar os plugi-ns do sistema instalados">
+<!ENTITY plugins.installed.enable "Ativar plug-ins">
+<!ENTITY plugins.installed.disable "Desativar plug-ins">
 <!ENTITY plugins.installed.disable.tip "Clique para evitar o carregamento dos plugins do sistema">
diff --git a/src/chrome/locale/pt/brand.properties b/src/chrome/locale/pt/brand.properties
index e08b760..1374192 100644
--- a/src/chrome/locale/pt/brand.properties
+++ b/src/chrome/locale/pt/brand.properties
@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+brandShorterName=Tor Browser
 brandShortName=Navegador Tor
 brandFullName=Navegador Tor
 vendorShortName=Projeto Tor
diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd
index 0bf3ad6..bb521a3 100644
--- a/src/chrome/locale/pt/torbutton.dtd
+++ b/src/chrome/locale/pt/torbutton.dtd
@@ -1,6 +1,6 @@
 <!ENTITY torbutton.prefs.title "Preferências Torbutton">
 <!ENTITY torbutton.prefs.tor_settings "Configurações do Proxy">
-<!ENTITY torbutton.prefs.recommended_settings "Use as configurações recomendadas do proxy para a minha versão do Firefox">
+<!ENTITY torbutton.prefs.recommended_settings "Utilize as configurações recomendadas do proxy para a minha versão do Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Utilizar Privoxy">
 <!ENTITY torbutton.prefs.use_polipo "Utilizar Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Utilize as configurações do proxy personalizadas">
@@ -159,11 +159,11 @@
 <!ENTITY torbutton.prefs.sec_med_low "Médio-Baixo">
 <!ENTITY torbutton.prefs.sec_gen_desc "Neste nível de segurança, aplicam-se as seguintes alterações ('rato sobre' para os detalhes).">
 <!ENTITY torbutton.prefs.sec_html5_desc "A multimédia de áudio e vídeo HTML5 torna-se clique-par-reproduzir via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "Em alguns sítios, poderá precisar de usar o botão da barra de ferramentas NoScript para ativar estes objetos de multimédia.">
+<!ENTITY torbutton.prefs.sec_html5_tooltip "Em alguns sites, poderá precisar de utilizar o botão da barra de ferramentas NoScript para ativar estes objetos de multimédia.">
 <!ENTITY torbutton.prefs.sec_some_jit_desc "Algumas otimizações de desempenho JavaScript estão desativadas.">
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Linha de base JIT.">
-<!ENTITY torbutton.prefs.sec_jit_slower_desc "Os scripts em alguns sítios poderão funcionar muito lentamente.">
+<!ENTITY torbutton.prefs.sec_jit_slower_desc "Os scripts em alguns sites poderão funcionar muito lentamente.">
 <!ENTITY torbutton.prefs.sec_jar_desc "Os ficheiros JAR remotos estão bloqueados.">
 <!ENTITY torbutton.prefs.sec_jar_tooltip "Os ficheiros JAR são extremamente raros na Web, mas podem ser uma fonte de XSS e outros ataques.">
 <!ENTITY torbutton.prefs.sec_mathml_desc "Alguns mecanismos de visualização de equações matemáticas estão desativados.">
@@ -177,7 +177,7 @@
 <!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript está desativado por predefinição em todos os sites não HTTPS.">
 <!ENTITY torbutton.prefs.sec_js_desc_tooltip "O JavaScript pode ser ativado numa base de per-sítio através do botão da barra de ferramentas NoScript.">
 <!ENTITY torbutton.prefs.sec_high "Alto">
-<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript está desativado por predefinição em todos os sítios.">
+<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript está desativado por predefinição em todos os sites.">
 <!ENTITY torbutton.prefs.sec_audio_video_desc "A maioria dos formatos de áudio e vídeo estão desativados.">
 <!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM é o único codec que se mantém ativado.">
 <!ENTITY torbutton.prefs.sec_webfonts_desc "Alguns tipos de letra e ícones poderão ser visualizados incorretamente.">
diff --git a/src/chrome/locale/pt/torbutton.properties b/src/chrome/locale/pt/torbutton.properties
index ceec3a8..2ec7378 100644
--- a/src/chrome/locale/pt/torbutton.properties
+++ b/src/chrome/locale/pt/torbutton.properties
@@ -59,7 +59,7 @@ torbutton.popup.confirm_newnym = O Navegador Tor irá fechar todas as janela e s
 torbutton.slider_notification = Agora, o menu da cebola verde tem um cursor de segurança que o deixa ajustar o seu nível de segurança. Verifique-o!
 torbutton.slider_notification_button = Abra as definições de segurança
 
-torbutton.maximize_warning = Ao maximizar o Navegador Tor pode permitir que os sítios da Web determinem o tamanho do seu monitor, o que poderá ser utilizado para o rastrear. Nós recomendamos que deixe as janelas do Navegador no seu tamanho original predefinido.
+torbutton.maximize_warning = Ao maximizar o Navegador Tor pode permitir que os sites da Web determinem o tamanho do seu monitor, o que poderá ser utilizado para o rastrear. Nós recomendamos que deixe as janelas do Navegador no seu tamanho original predefinido.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=Este site (%S) tentou extrair informação HTML5, que pode ser usada para identificar claramente o seu computador.\n\nQuer que o navegador Tor permita que o site extraia a informação HTML5?
diff --git a/src/chrome/locale/ru/brand.properties b/src/chrome/locale/ru/brand.properties
index 93347e1..5f0d9a8 100644
--- a/src/chrome/locale/ru/brand.properties
+++ b/src/chrome/locale/ru/brand.properties
@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+brandShorterName=Tor Browser
 brandShortName=Tor Browser
 brandFullName=Tor Browser
 vendorShortName=Проект Tor
diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd
index d6406c9..6e261f3 100644
--- a/src/chrome/locale/sv/aboutTor.dtd
+++ b/src/chrome/locale/sv/aboutTor.dtd
@@ -25,14 +25,14 @@
 
 <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">
-<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_option=US&source=tor">
+<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_option=SE&source=tor">
 
 <!ENTITY aboutTor.torInfo1.label "Ytterligare information:">
 <!ENTITY aboutTor.torInfo2.label "Land och IP-adress:">
 <!ENTITY aboutTor.torInfo3.label "Exitnod:">
 <!ENTITY aboutTor.torInfo4.label "Den här servern sparar inte någon information om besökare.">
 <!ENTITY aboutTor.whatnextQuestion.label "Och nu då?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor är INTE allt som behövs för att vara anonym på nätet! Du behöver kanske ändra några av dina vanor för att försäkra att din identitet förblir skyddad.">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor är INTE allt som behövs för att vara anonym på nätet! Du behöver kanske ändra några av dina vanor för att säkerställa att din identitet förblir skyddad.">
 <!ENTITY aboutTor.whatnext.label "Tips på hur man förblir anonym »">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning">
 <!ENTITY aboutTor.helpInfo1.label "Du kan hjälpa till!">
diff --git a/src/chrome/locale/sv/brand.properties b/src/chrome/locale/sv/brand.properties
index ae59c81..555e01e 100644
--- a/src/chrome/locale/sv/brand.properties
+++ b/src/chrome/locale/sv/brand.properties
@@ -2,9 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+brandShorterName=Tor Browser
 brandShortName=Tor Browser
 brandFullName=Tor Browser
-vendorShortName=Tor Browser
+vendorShortName=Tor-projektet
 
 homePageSingleStartMain=Firefox Start, en snabb hemsida med inbyggd sökfunktion
 homePageImport=Importera din startsida från %S
diff --git a/src/chrome/locale/tr/aboutDialog.dtd b/src/chrome/locale/tr/aboutDialog.dtd
index 4958996..0e9100d 100644
--- a/src/chrome/locale/tr/aboutDialog.dtd
+++ b/src/chrome/locale/tr/aboutDialog.dtd
@@ -1,19 +1,19 @@
 <!ENTITY project.start           "&brandShortName;, ">
 <!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to https://www.torproject.org -->
-<!ENTITY project.tpoLink         "kar amacı gütmeyen, çevrim içi gizlilik ve özgürlüğünüzü koruyan">
+<!ENTITY project.tpoLink         "kar amacı gütmeyen, çevrimiçi gizlilik ve özgürlüğünüzü koruyan">
 <!ENTITY project.end             "&vendorShortName; tarafından geliştirilmiştir.">
 
-<!ENTITY help.start              "Yardım ister misiniz?">
+<!ENTITY help.start              "Yardım etmek ister misiniz? ">
 <!-- LOCALIZATION NOTE (help.donate): This is a link title that links to https://www.torproject.org/donate/donate.html.en -->
-<!ENTITY help.donateLink         "Bağış yapın">
-<!ENTITY help.or                 "ya da">
+<!ENTITY help.donateLink         "Bağışta bulunun">
+<!ENTITY help.or                 " ya da ">
 <!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links to https://www.torproject.org/getinvolved/volunteer.html.en -->
-<!ENTITY help.getInvolvedLink    "çalışmalara katılın">
+<!ENTITY help.getInvolvedLink    "çalışmalarımızda yer alın">
 <!ENTITY help.end                "!">
 <!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/docs/trademark-faq.html.en -->
 <!ENTITY bottomLinks.questions   "Sorularınız mı var?">
 <!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/getinvolved/relays -->
-<!ENTITY bottomLinks.grow        "Tor Ağı'nın Büyümesine Katkıda Bulunun!">
+<!ENTITY bottomLinks.grow        "Tor Ağının Büyümesine Yardımcı Olun!">
 <!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
 <!ENTITY bottomLinks.license  "Lisans Bilgileri">
-<!ENTITY tor.TrademarkStatement   "'Tor' ve 'Soğan Logosu' Tor Project Inc. tarafından tescil edilmiş markalardır.">
+<!ENTITY tor.TrademarkStatement   "'Tor' ve 'Onion Logo' Tor Project, Inc. tarafından tescillenmiş markalardır.">
diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd
index 2b7f14a..f6de534 100644
--- a/src/chrome/locale/tr/aboutTor.dtd
+++ b/src/chrome/locale/tr/aboutTor.dtd
@@ -6,18 +6,18 @@
 
 <!ENTITY aboutTor.title "Tor Hakkında">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "BUNUNLA BİRLİKTE, bu tarayıcı güncel değil.">
+<!ENTITY aboutTor.outOfDateTorOn.label "ANCAK, bu tarayıcı güncel değil.">
 <!ENTITY aboutTor.outOfDateTorOff.label "AYRICA, bu tarayıcı güncel değil.">
 <!ENTITY aboutTor.outOfDate2.label "Soğan simgesine tıklayın ve ardından Tor Browser Güncellemesini denetleyin.">
 
 <!ENTITY aboutTor.check.label "Tor Ağ Ayarlarını Sınayın">
 
 <!ENTITY aboutTor.success.label "Tebrikler!">
-<!ENTITY aboutTor.success2.label "Bu tarayıcı Tor kullanımı için ayarlandı.">
-<!ENTITY aboutTor.success3.label "Artık İnternet üzerinde anonim olarak işlem yapabilirsiniz.">
-<!ENTITY aboutTor.failure.label "Bir Åžeyler Ters Gitti!">
+<!ENTITY aboutTor.success2.label "Bu tarayıcı Tor kullanımı için yapılandırıldı.">
+<!ENTITY aboutTor.success3.label "Artık Internet'te özgürce ve anonim olarak dolaşabilirsiniz.">
+<!ENTITY aboutTor.failure.label "BirÅŸeyler Ters Gitti!">
 <!ENTITY aboutTor.failure2.label "Tor bu tarayıcıda çalışmıyor.">
-<!ENTITY aboutTor.failure3prefix.label "Yardım almak için şu adresi kullanarak %S ile görüşün">
+<!ENTITY aboutTor.failure3prefix.label "Yardım için lütfen iletişime geçin ">
 <!ENTITY aboutTor.failure3Link "help at rt.torproject.org">
 <!ENTITY aboutTor.failure3suffix.label ".">
 
diff --git a/src/chrome/locale/tr/brand.dtd b/src/chrome/locale/tr/brand.dtd
index 6d9d1ed..6b8bf0c 100644
--- a/src/chrome/locale/tr/brand.dtd
+++ b/src/chrome/locale/tr/brand.dtd
@@ -6,7 +6,7 @@
 <!ENTITY  brandShortName        "Tor Browser">
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Projesi">
-<!ENTITY  trademarkInfo.part1   "Firefox ve Firefox logoları Mozilla Vakfı tarafından tescil edilmiş ticari markalardır.">
+<!ENTITY  trademarkInfo.part1   "Firefox ve Firefox logoları Mozilla Vakfı'nın ticari markalarıdır.">
 
 <!-- The following strings are for bug #10280's UI. We place them here for our translators -->
 <!ENTITY plugins.installed.find "Kurulmuş sistem uygulama eklerini yüklemek için tıklayın">
diff --git a/src/chrome/locale/tr/brand.properties b/src/chrome/locale/tr/brand.properties
index 9635260..2c16808 100644
--- a/src/chrome/locale/tr/brand.properties
+++ b/src/chrome/locale/tr/brand.properties
@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+brandShorterName=Tor Browser
 brandShortName=Tor Browser
 brandFullName=Tor Browser
 vendorShortName=Tor Projesi
diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd
index 00e9a7a..6039178 100644
--- a/src/chrome/locale/tr/torbutton.dtd
+++ b/src/chrome/locale/tr/torbutton.dtd
@@ -2,7 +2,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Vekil Sunucu Ayarları">
 <!ENTITY torbutton.prefs.recommended_settings "Firefox sürümüm için önerilen vekil sunucu ayarlarını kullan">
 <!ENTITY torbutton.prefs.use_privoxy "Privoxy Kullan">
-<!ENTITY torbutton.prefs.use_polipo "Polipo Kullan">
+<!ENTITY torbutton.prefs.use_polipo "Polipo kullan">
 <!ENTITY torbutton.prefs.custom_settings "Özel vekil sunucu ayarları kullanılsın">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Vekil Sunucusu:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Vekil Sunucusu:">
diff --git a/src/chrome/locale/vi/aboutDialog.dtd b/src/chrome/locale/vi/aboutDialog.dtd
index 844f4e0..d6693ed 100644
--- a/src/chrome/locale/vi/aboutDialog.dtd
+++ b/src/chrome/locale/vi/aboutDialog.dtd
@@ -1,4 +1,4 @@
-<!ENTITY project.start           "&brandShortName; is developed by ">
+<!ENTITY project.start           "&brandShortName; được phát triển bởi">
 <!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to https://www.torproject.org -->
 <!ENTITY project.tpoLink         "the &vendorShortName;">
 <!ENTITY project.end             ", a nonprofit working to defend your privacy and freedom online.">
diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd
index 6f2f46b..2321976 100644
--- a/src/chrome/locale/vi/aboutTor.dtd
+++ b/src/chrome/locale/vi/aboutTor.dtd
@@ -44,6 +44,6 @@
 <!ENTITY aboutTor.helpInfo5.label "Make a Donation »">
 <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en">
 
-<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
+<!ENTITY aboutTor.footer.label "Dự án Tor là một US 501(c)(3) không lợi nhuận chuyên dùng cho nghiên cứu, phát triển và giao dục về vô danh và riêng tư trực tuyến">
 <!ENTITY aboutTor.learnMore.label "Tìm hiểu thêm về Tor Project">
 <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">
diff --git a/src/chrome/locale/vi/brand.dtd b/src/chrome/locale/vi/brand.dtd
index 94522e3..6664eca 100644
--- a/src/chrome/locale/vi/brand.dtd
+++ b/src/chrome/locale/vi/brand.dtd
@@ -2,9 +2,9 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY  brandShorterName      "Tor Browser">
-<!ENTITY  brandShortName        "Tor Browser">
-<!ENTITY  brandFullName         "Tor Browser">
+<!ENTITY  brandShorterName      "Trình duyệt Tor">
+<!ENTITY  brandShortName        "Trình duyệt Tor">
+<!ENTITY  brandFullName         "Trình duyệt Tor">
 <!ENTITY  vendorShortName       "Dự án Tor">
 <!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
 
diff --git a/src/chrome/locale/vi/brand.properties b/src/chrome/locale/vi/brand.properties
index 51608eb..87d9b23 100644
--- a/src/chrome/locale/vi/brand.properties
+++ b/src/chrome/locale/vi/brand.properties
@@ -2,8 +2,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShortName=Tor Browser
-brandFullName=Tor Browser
+brandShorterName=Tor Browser
+brandShortName=Trình duyệt Tor
+brandFullName=Trình duyệt Tor
 vendorShortName=Dự án Tor
 
 homePageSingleStartMain=Firefox Start, a fast home page with built-in search
diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd
index cd3d3ce..b310687 100644
--- a/src/chrome/locale/vi/torbutton.dtd
+++ b/src/chrome/locale/vi/torbutton.dtd
@@ -24,19 +24,19 @@
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton hiện đang được hiệu hóa.  Nếu bạn muốn thay đổi thiết lập proxy không thuộc chương trình Tor, vui lòng tắt Torbutton và quay trở lại đây.  Nếu bạn muốn thay đổi thiết lập từ Tor, vui lòng dùng cửa sổ tùy chỉnh Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Giám định Mới">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
+<!ENTITY torbutton.context_menu.new_circuit "Vòng Tor mới cho trang nà y">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
 <!ENTITY torbutton.context_menu.toggle "Bật/tắt trạng thái của Tor">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settings…">
+<!ENTITY torbutton.context_menu.preferences "Cà i đặt Riêng tư và Bảo mật...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Thông tin về Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
-<!ENTITY torbutton.context_menu.networksettings "Tor Network Settings…">
+<!ENTITY torbutton.context_menu.networksettings "Cà i đặt Mạng Tor...">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
-<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…">
+<!ENTITY torbutton.context_menu.downloadUpdate "Kiểm tra việc cập nhật trình duyệt Tor">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections…">
+<!ENTITY torbutton.context_menu.cookieProtections "Bảo vệ Cookie...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.context_menu.copyTor "Sao chép địa chỉ URL của Tor">
 <!ENTITY torbutton.context_menu.copyTor.key "p">
@@ -46,7 +46,7 @@
 <!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Nhấp để nhận diện Torbutton">
-<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.privacy_security_settings "Cà i đặt Riêng tư và Bảo mật">
 <!ENTITY torbutton.prefs.block_thread "Chặn việc đọc lịch sử h.đ trong quá trình dùng Tor (cấp thiết)">
 <!ENTITY torbutton.prefs.block_thwrite "Chặn việc ghi lịch sử h.đ trong quá trình dùng Tor (khuyến cáo)">
 <!ENTITY torbutton.prefs.block_nthread "Chặn việc đọc lịch sử trong quá trình không dùng Tor (tùy chọn)">
@@ -146,21 +146,21 @@
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
-<!ENTITY torbutton.prefs.priv_caption "Privacy Settings">
+<!ENTITY torbutton.prefs.priv_caption "Cà i đặt Riêng tư">
 <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
 <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
-<!ENTITY torbutton.prefs.sec_caption "Security Level">
-<!ENTITY torbutton.prefs.sec_low "Low (default)">
-<!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience.">
-<!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">
-<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled.">
-<!ENTITY torbutton.prefs.sec_med_low "Medium-Low">
-<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):">
-<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript.">
-<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects.">
-<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled.">
+<!ENTITY torbutton.prefs.sec_caption "Mức độ Bảo mật">
+<!ENTITY torbutton.prefs.sec_low "Thấp (mặc định)">
+<!ENTITY torbutton.prefs.sec_low_usable_desc "Điều nà y cung cấp trải nghiệm tiện lợi nhất">
+<!ENTITY torbutton.prefs.sec_low_desc "Ở mức nà y, tất cả tính năng của trình duyệt đều được kích hoạt.">
+<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Cơ chế kết xuất font SVG OpenType bị vô hiệu.">
+<!ENTITY torbutton.prefs.sec_med_low "Trung bình-Thấp">
+<!ENTITY torbutton.prefs.sec_gen_desc "Ở mức bảo mật nà y, những thay đổi sau sẽ được áp dụng (rê chuột và o để xem chi tiết):">
+<!ENTITY torbutton.prefs.sec_html5_desc "Video và âm thanh HTML5 có thể nhấp để phát qua NoScript.">
+<!ENTITY torbutton.prefs.sec_html5_tooltip "Trên một số trang, có thể bạn cần phải dùng nút thanh công cụ NoScript để kích hoạt những đối tượng đa phương tiện nà y.">
+<!ENTITY torbutton.prefs.sec_some_jit_desc "Một số tối ưu hoá JavaScript bị vô hiệu.">
 <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS.">
 <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT.">
 <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower.">
diff --git a/src/chrome/locale/zh-CN/brand.properties b/src/chrome/locale/zh-CN/brand.properties
index 5f9a8c7..4804bae 100644
--- a/src/chrome/locale/zh-CN/brand.properties
+++ b/src/chrome/locale/zh-CN/brand.properties
@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+brandShorterName=Tor Browser
 brandShortName=Tor Browser
 brandFullName=Tor Browser
 vendorShortName=Tor Project
diff --git a/src/install.rdf b/src/install.rdf
index 160baa4..e195570 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -6,7 +6,7 @@
         <em:name>Torbutton</em:name>
         <em:creator>Mike Perry</em:creator>
         <em:id>torbutton at torproject.org</em:id>
-        <em:version>1.9.3.3</em:version>
+        <em:version>1.9.3.4</em:version>
         <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL>
         <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>
         <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>