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

[tor-commits] [torbutton/master] Update translations

To: tor-commits@xxxxxxxxxxxxxxxxxxxx, tbb-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [torbutton/master] Update translations
From: gk@xxxxxxxxxxxxxx
Date: Mon, 16 Feb 2015 10:13:01 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 16 Feb 2015 05:13:13 -0500
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 959da7f6b237910d2ff5132394bbcb9628983bc4
Author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Date:   Mon Feb 16 11:12:32 2015 +0000

    Update translations
---
 src/chrome/locale/ar/aboutTor.dtd            |    5 +++--
 src/chrome/locale/ar/brand.dtd               |    6 ++++++
 src/chrome/locale/ar/browser.properties      |    8 --------
 src/chrome/locale/ar/torbutton.dtd           |   11 +++++++----
 src/chrome/locale/ar/torbutton.properties    |    6 ++++++
 src/chrome/locale/de/aboutTor.dtd            |    5 +++--
 src/chrome/locale/de/brand.dtd               |    6 ++++++
 src/chrome/locale/de/browser.properties      |    8 --------
 src/chrome/locale/de/torbutton.dtd           |   11 +++++++----
 src/chrome/locale/de/torbutton.properties    |    6 ++++++
 src/chrome/locale/es/aboutTor.dtd            |    5 +++--
 src/chrome/locale/es/brand.dtd               |    6 ++++++
 src/chrome/locale/es/browser.properties      |    8 --------
 src/chrome/locale/es/torbutton.dtd           |   11 +++++++----
 src/chrome/locale/es/torbutton.properties    |    6 ++++++
 src/chrome/locale/eu/aboutTor.dtd            |    5 +++--
 src/chrome/locale/eu/brand.dtd               |    6 ++++++
 src/chrome/locale/eu/browser.properties      |    8 --------
 src/chrome/locale/eu/torbutton.dtd           |   25 ++++++++++++++-----------
 src/chrome/locale/eu/torbutton.properties    |    6 ++++++
 src/chrome/locale/fa/aboutTor.dtd            |    5 +++--
 src/chrome/locale/fa/brand.dtd               |    6 ++++++
 src/chrome/locale/fa/browser.properties      |    8 --------
 src/chrome/locale/fa/torbutton.dtd           |   11 +++++++----
 src/chrome/locale/fa/torbutton.properties    |    6 ++++++
 src/chrome/locale/fr/aboutTor.dtd            |    5 +++--
 src/chrome/locale/fr/brand.dtd               |    6 ++++++
 src/chrome/locale/fr/browser.properties      |    8 --------
 src/chrome/locale/fr/torbutton.dtd           |   11 +++++++----
 src/chrome/locale/fr/torbutton.properties    |    6 ++++++
 src/chrome/locale/it/aboutTor.dtd            |    5 +++--
 src/chrome/locale/it/brand.dtd               |    6 ++++++
 src/chrome/locale/it/browser.properties      |    8 --------
 src/chrome/locale/it/torbutton.dtd           |   11 +++++++----
 src/chrome/locale/it/torbutton.properties    |    6 ++++++
 src/chrome/locale/ja/aboutTor.dtd            |    5 +++--
 src/chrome/locale/ja/brand.dtd               |    6 ++++++
 src/chrome/locale/ja/browser.properties      |    8 --------
 src/chrome/locale/ja/torbutton.dtd           |   11 +++++++----
 src/chrome/locale/ja/torbutton.properties    |    6 ++++++
 src/chrome/locale/ko/aboutTor.dtd            |    5 +++--
 src/chrome/locale/ko/brand.dtd               |    6 ++++++
 src/chrome/locale/ko/browser.properties      |    8 --------
 src/chrome/locale/ko/torbutton.dtd           |   11 +++++++----
 src/chrome/locale/ko/torbutton.properties    |    6 ++++++
 src/chrome/locale/nl/aboutTor.dtd            |   15 ++++++++-------
 src/chrome/locale/nl/brand.dtd               |    6 ++++++
 src/chrome/locale/nl/browser.properties      |    8 --------
 src/chrome/locale/nl/torbutton.dtd           |   11 +++++++----
 src/chrome/locale/nl/torbutton.properties    |    6 ++++++
 src/chrome/locale/pl/aboutTor.dtd            |    5 +++--
 src/chrome/locale/pl/brand.dtd               |    6 ++++++
 src/chrome/locale/pl/browser.properties      |    8 --------
 src/chrome/locale/pl/torbutton.dtd           |   11 +++++++----
 src/chrome/locale/pl/torbutton.properties    |    6 ++++++
 src/chrome/locale/pt/aboutTor.dtd            |    5 +++--
 src/chrome/locale/pt/brand.dtd               |    6 ++++++
 src/chrome/locale/pt/browser.properties      |    8 --------
 src/chrome/locale/pt/torbutton.dtd           |   11 +++++++----
 src/chrome/locale/pt/torbutton.properties    |    6 ++++++
 src/chrome/locale/ru/aboutTor.dtd            |    5 +++--
 src/chrome/locale/ru/brand.dtd               |    6 ++++++
 src/chrome/locale/ru/browser.properties      |    8 --------
 src/chrome/locale/ru/torbutton.dtd           |   11 +++++++----
 src/chrome/locale/ru/torbutton.properties    |    6 ++++++
 src/chrome/locale/sv/aboutTor.dtd            |    5 +++--
 src/chrome/locale/sv/brand.dtd               |    6 ++++++
 src/chrome/locale/sv/browser.properties      |    8 --------
 src/chrome/locale/sv/torbutton.dtd           |   11 +++++++----
 src/chrome/locale/sv/torbutton.properties    |    6 ++++++
 src/chrome/locale/tr/aboutTor.dtd            |    5 +++--
 src/chrome/locale/tr/brand.dtd               |    6 ++++++
 src/chrome/locale/tr/browser.properties      |    8 --------
 src/chrome/locale/tr/torbutton.dtd           |   11 +++++++----
 src/chrome/locale/tr/torbutton.properties    |    6 ++++++
 src/chrome/locale/vi/aboutTor.dtd            |    5 +++--
 src/chrome/locale/vi/brand.dtd               |    6 ++++++
 src/chrome/locale/vi/browser.properties      |    8 --------
 src/chrome/locale/vi/torbutton.dtd           |   11 +++++++----
 src/chrome/locale/vi/torbutton.properties    |    6 ++++++
 src/chrome/locale/zh-CN/aboutTor.dtd         |    5 +++--
 src/chrome/locale/zh-CN/brand.dtd            |    6 ++++++
 src/chrome/locale/zh-CN/browser.properties   |    8 --------
 src/chrome/locale/zh-CN/torbutton.dtd        |   11 +++++++----
 src/chrome/locale/zh-CN/torbutton.properties |    6 ++++++
 85 files changed, 386 insertions(+), 250 deletions(-)

diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd
index e02388f..4ab6609 100644
--- a/src/chrome/locale/ar/aboutTor.dtd
+++ b/src/chrome/locale/ar/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2015, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -8,7 +8,7 @@
 
 <!ENTITY aboutTor.outOfDateTorOn.label "Ù?Ù?Ø¹ Ø°Ù?Ù?Ø? Ù?Ø°Ø§ Ø§Ù?Ù?ØªØµÙ?Ø Ù?Ø¯Ù?Ù?.">
 <!ENTITY aboutTor.outOfDateTorOff.label "Ø£Ù?Ø¶Ø§Ù?Ø? Ù?Ø°Ø§ Ø§Ù?Ù?ØªØµÙ?Ø Ù?Ø¯Ù?Ù?.">
-<!ENTITY aboutTor.outOfDate2.label "Ø§Ø¶ØºØ· Ø¹Ù?Ù? Ø§Ù?Ø¨ØµÙ?Ø© Ù? Ø§Ø®ØªØ± ØÙ?Ù? ØªØØ¯Ù?Ø« ØØ²Ù?Ø© Ù?ØªØµÙ?Ø ØªÙ?Ø±.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update.">
 
 <!ENTITY aboutTor.check.label "Ø§Ø®ØªØ¨Ø± Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø´Ø¨Ù?Ø© ØªÙ?Ø±.">
 
@@ -25,6 +25,7 @@
 
 <!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&amp;location_option=US";>
 
 <!ENTITY aboutTor.torInfo1.label "Ù?Ø¹Ù?Ù?Ù?Ø§Øª Ø¥Ø¶Ø§Ù?Ù?Ø©:">
 <!ENTITY aboutTor.torInfo2.label "Ø§Ù?Ø¯Ù?Ù?Ø© Ù?Ø¹Ù?Ù?Ø§Ù? Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª:">
diff --git a/src/chrome/locale/ar/brand.dtd b/src/chrome/locale/ar/brand.dtd
index 3faaf01..b599c91 100644
--- a/src/chrome/locale/ar/brand.dtd
+++ b/src/chrome/locale/ar/brand.dtd
@@ -6,3 +6,9 @@
 <!ENTITY  brandFullName         "Ù?ØªØµÙ?Ø ØªÙ?Ø±">
 <!ENTITY  vendorShortName       "Ù?Ø´Ø±Ù?Ø¹ ØªÙ?Ø±">
 <!ENTITY  trademarkInfo.part1   "Ù?Ø§Ù?Ø±Ù?Ù?Ù?Ø³ Ù?Ø´Ø¹Ø§Ø±Ø§Øª Ù?Ø§Ù?Ø±Ù?Ù?Ù?Ø³ Ø¹Ù?Ø§Ù?Ø§Øª ØªØ¬Ø§Ø±Ù?Ø© Ù?Ø³Ø¬Ù?Ø© Ù?Ù?Ø¤Ø³Ø³Ø© Ù?Ù?Ø²Ù?Ù?Ø§.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Click to load installed system plugins">
+<!ENTITY plugins.installed.enable "Enable plugins">
+<!ENTITY plugins.installed.disable "Disable plugins">
+<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins">
diff --git a/src/chrome/locale/ar/browser.properties b/src/chrome/locale/ar/browser.properties
index 295a03a..8849b67 100644
--- a/src/chrome/locale/ar/browser.properties
+++ b/src/chrome/locale/ar/browser.properties
@@ -3,11 +3,3 @@ browser.startup.homepage=about:tor
 
 # Spell checker dictionary
 spellchecker.dictionary=en_US
-
-# Default search engine
-browser.search.defaultenginename=Startpage
-
-# Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Startpage
-browser.search.order.2=DuckDuckGo
-browser.search.order.3=Google
diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd
index 94ef3aa..2928c62 100644
--- a/src/chrome/locale/ar/torbutton.dtd
+++ b/src/chrome/locale/ar/torbutton.dtd
@@ -24,17 +24,19 @@
 <!ENTITY torbutton.pref_connection_more_info.text "Ø²Ø± ØªÙ?Ø± Ù?Ù?Ø¹Ù?Ù? ØØ§Ù?Ù?Ù?Ø§. Ø¥Ù? Ù?Ù?Øª ØªØ±Ù?Ø¯ ØªØºÙ?Ù?Ø± Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ù?Ø³Ù?Ø· ØºÙ?Ø± Ø§Ù?Ù?ØªØ¹Ù?Ù?Ø© Ø¨ØªÙ?Ø±Ø? Ù?Ø¶Ù?Ø§Ù? Ø¹Ø·Ù? Ø²Ø± ØªÙ?Ø± Ø£Ù?Ù?Ø§Ù? Ø«Ù? Ø¹Ø¯ Ø¥Ù?Ù? Ù?Ù?Ø§. Ø¥Ù? Ù?Ù?Øª ØªØ±Ù?Ø¯ ØªØ¹Ø¯Ù?Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø²Ø± ØªÙ?Ø± Ù?Ø§Ø³ØªØ®Ø¯Ù? Ù?Ø§Ù?Ø°Ø© ØªÙ?Ø¶Ù?Ù?Ø§Øª Ø²Ø± ØªÙ?Ø±.">
 <!ENTITY torbutton.context_menu.new_identity "Ù?Ù?Ù?Ø© Ø¬Ø¯Ù?Ø¯Ø©">
 <!ENTITY torbutton.context_menu.new_identity_key "Ø£Ù?Ø§">
+<!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
+<!ENTITY torbutton.context_menu.new_circuit_key "C">
 <!ENTITY torbutton.context_menu.toggle "Ø¨Ø¯Ù?Ù? ØØ§Ù?Ø© ØªÙ?Ø±">
 <!ENTITY torbutton.context_menu.toggle.key "Øª">
-<!ENTITY torbutton.context_menu.preferences "Ø§Ù?ØªÙ?Ø¶Ù?Ù?Ø§Øª...">
+<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settingsâ?¦">
 <!ENTITY torbutton.context_menu.preferences.key "Ù?">
 <!ENTITY torbutton.context_menu.about "Ø¹Ù? Ø²Ø± ØªÙ?Ø±...">
 <!ENTITY torbutton.context_menu.about.key "Ø">
-<!ENTITY torbutton.context_menu.networksettings "Ù?ØªØ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø´Ø¨Ù?Ø©...">
+<!ENTITY torbutton.context_menu.networksettings "Tor Network Settingsâ?¦">
 <!ENTITY torbutton.context_menu.networksettings.key "Ø">
-<!ENTITY torbutton.context_menu.downloadUpdate "ØªÙ?Ø²Ù?Ù? ØªØØ¯Ù?Ø« ØØ²Ù?Ø© Ù?ØªØµÙ?Ø ØªÙ?Ø±...">
+<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "Øª">
-<!ENTITY torbutton.context_menu.cookieProtections "Ù?Ø¹Ù?Ø© Ø§Ù?ØÙ?Ø§Ù?Ø©">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.context_menu.copyTor "Ù?Ø³Ø® Ø±Ø§Ø¨Ø· ØªÙ?Ø±">
 <!ENTITY torbutton.context_menu.copyTor.key "p">
@@ -155,3 +157,4 @@
 <!ENTITY torbutton.prefs.sec_med_high "Ø´Ø¨Ù? Ø¹Ø§Ù?Ù?">
 <!ENTITY torbutton.prefs.sec_high "Ø¹Ø§Ù?Ù?">
 <!ENTITY torbutton.prefs.sec_custom "Ù?Ù?Ù? Ù?Ø®ØµØµØ©">
+<!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties
index f35285f..8846f57 100644
--- a/src/chrome/locale/ar/torbutton.properties
+++ b/src/chrome/locale/ar/torbutton.properties
@@ -1,5 +1,10 @@
 torbutton.button.tooltip.disabled = Ù?Ø¹Ù?Ù? ØªÙ?Ø±
 torbutton.button.tooltip.enabled = Ø¹Ø·Ù?Ù? ØªÙ?Ø±
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = IP unknown
+torbutton.circuit_display.this_browser = This browser
+torbutton.circuit_display.tor_bridge = Bridge
+torbutton.circuit_display.unknown_country = Unknown country
 torbutton.panel.tooltip.disabled = Ø§Ù?Ù?Ø± Ù?ØªÙ?Ø¹Ù?Ù? ØªÙ?Ø±
 torbutton.panel.tooltip.enabled = Ø§Ù?Ù?Ø± Ù?ØªØ¹Ø·Ù?Ù? ØªÙ?Ø±
 torbutton.panel.plugins.disabled = Ø§Ù?Ù?Ø± Ù?ØªÙ?Ø¹Ù?Ù? Ø§Ù?Ù?Ù?ØÙ?Ø§Øª
@@ -46,6 +51,7 @@ torbutton.popup.short_torbrowser = Ù?Ø¹Ù?Ù?Ù?Ø§Øª Ù?Ø§Ù?Ø© Ø¹Ù? Ø²Ø± ØªÙ?Ø± \n\n
 
 torbutton.popup.confirm_plugins = Ø§Ù?Ø¨Ø±Ø§Ù?Ø¬ Ø§Ù?Ø¥Ø¶Ø§Ù?Ù?Ø© Ù?Ø«Ù? Ù?Ù?Ø§Ø´ ØªØ³ØªØ·Ù?Ø¹ Ø§Ù? ØªØ¶Ø± Ø¨Ø®ØµÙ?ØµÙ?ØªÙ? Ù? ØªÙ?Ø´Ù? Ù?Ù?Ù?ØªÙ?.\n\nÙ? ØªØ³ØªØ·Ù?Ø¹ Ø§Ù?Ø¶Ø§ Ø§Ù? ØªØªØ¬Ù?Ø¨ ØªÙ?Ø± Ù? ØªÙ?Ø´Ù? Ø¹Ù? Ù?Ù?Ø§Ù?Ù? Ø§Ù?ØØ§Ù?Ù? Ù? Ø¹Ù?Ù?Ø§Ù? Ø§Ù?Ø£Ù? Ø¨Ù? Ø§Ù?Ø®Ø§Øµ Ø¨Ù?.\n\nÙ?Ù? Ø£Ù?Øª Ù?ØªØ£Ù?Ø¯ Ø£Ù?Ù? ØªØ±Ù?Ø¯ ØªÙ?Ø¹Ù?Ù? Ø§Ù?Ø¨Ø±Ø§Ù?Ø¬ Ø§Ù?Ø¥Ø¶Ø§Ù?Ù?Ø©Ø?\n\n
 torbutton.popup.never_ask_again = Ù?Ø§ ØªØ³Ø£Ù?Ù?Ù? Ù?Ø±Ø© Ø§Ø®Ø±Ù?
+torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=Ù?Ø°Ø§ Ø§Ù?Ù?Ù?Ù?Ø¹ (Ùª S) ØØ§Ù?Ù? Ø§Ø³ØªØ®Ø±Ø§Ø¬ Ø¨Ù?Ø§Ù?Ø§Øª Ø§Ù?ØµÙ?Ø±Ø© HTML5Ø? Ù?Ø§Ù?ØªÙ? Ù?Ù?Ù?Ù? Ø§Ø³ØªØ®Ø¯Ø§Ù?Ù?Ø§ Ù?ØªØØ¯Ù?Ø¯ Ù?Ù?Ø§Ù?Ù? Ù?ØªØØ¯Ù?Ø¯ Ø§Ù?Ù?Ù?Ù?Ø¨Ù?Ù?ØªØ±.\n\nÙ?Ù? ØªØ±Ù?Ø¯ Ø£Ù? Ù?Ø³Ù?Ø Ù?ØªØµÙ?Ø Tor Ù?Ù?Ø°Ø§ Ø§Ù?Ù?Ù?Ù?Ø¹ Ù?Ø§Ø³ØªØ®Ø±Ø§Ø¬ Ø¨Ù?Ø§Ù?Ø§Øª Ø§Ù?ØµÙ?Ø±Ø© Ø?
diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd
index beab0ff..f757363 100644
--- a/src/chrome/locale/de/aboutTor.dtd
+++ b/src/chrome/locale/de/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2015, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -8,7 +8,7 @@
 
 <!ENTITY aboutTor.outOfDateTorOn.label "Dieser Browser ist nicht mehr aktuell.">
 <!ENTITY aboutTor.outOfDateTorOff.label "DIESER Browser ist auch veraltet.">
-<!ENTITY aboutTor.outOfDate2.label "Auf die Zwiebel klicken und dann die Aktualisierung des Tor-Browser-Paketes herunterladen.">
+<!ENTITY aboutTor.outOfDate2.label "Klicke auf die Zwiebel und dann ">
 
 <!ENTITY aboutTor.check.label "Tor-Netzwerkeinstellungen testen">
 
@@ -25,6 +25,7 @@
 
 <!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&amp;location_option=US";>
 
 <!ENTITY aboutTor.torInfo1.label "ZusÃ¤tzliche Informationen:">
 <!ENTITY aboutTor.torInfo2.label "Land &amp; IP-Adresse:">
diff --git a/src/chrome/locale/de/brand.dtd b/src/chrome/locale/de/brand.dtd
index e3a2aae..6089707 100644
--- a/src/chrome/locale/de/brand.dtd
+++ b/src/chrome/locale/de/brand.dtd
@@ -6,3 +6,9 @@
 <!ENTITY  brandFullName         "Tor-Browser">
 <!ENTITY  vendorShortName       "Tor-Projekt">
 <!ENTITY  trademarkInfo.part1   "Firefox und die Firefox-Logos sind Warenzeichen der Mozilla Foundation.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Klicke um System-Erweiterungen zu laden">
+<!ENTITY plugins.installed.enable "Erweiterungen aktivieren">
+<!ENTITY plugins.installed.disable "Erweiterungen deaktivieren">
+<!ENTITY plugins.installed.disable.tip "Klicke um das Laden von System-Erweiterungen zu verhindern">
diff --git a/src/chrome/locale/de/browser.properties b/src/chrome/locale/de/browser.properties
index df47914..c8a19c5 100644
--- a/src/chrome/locale/de/browser.properties
+++ b/src/chrome/locale/de/browser.properties
@@ -3,11 +3,3 @@ browser.startup.homepage=about:tor
 
 # Spell checker dictionary
 spellchecker.dictionary=de_DE
-
-# Default search engine
-browser.search.defaultenginename=Startseite
-
-# Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Startseite
-browser.search.order.2=DuckDuckGo
-browser.search.order.3=Google
diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd
index e0199c4..1772e47 100644
--- a/src/chrome/locale/de/torbutton.dtd
+++ b/src/chrome/locale/de/torbutton.dtd
@@ -24,17 +24,19 @@
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutten ist momentan aktiv. Wenn Sie die Vermittlungsservereinstellungen fÃ¼r den Betrieb ohne Tor Ã¤ndern mÃ¶chten, bitte zuerst Torbutton deaktivieren. Zum Ã?ndern der Tor-Einstellungen bitte das Fenster Â»Torbutton-EinstellungenÂ« verwenden.">
 <!ENTITY torbutton.context_menu.new_identity "Neue IdentitÃ¤t">
 <!ENTITY torbutton.context_menu.new_identity_key "N">
+<!ENTITY torbutton.context_menu.new_circuit "Neuer Kanal fÃ¼r diese Seite">
+<!ENTITY torbutton.context_menu.new_circuit_key "B">
 <!ENTITY torbutton.context_menu.toggle "Tor-Modus umschalten">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "Einstellungen â?¦">
+<!ENTITY torbutton.context_menu.preferences "PrivatssphÃ¤re- und Sicherheits-Einstellungen...">
 <!ENTITY torbutton.context_menu.preferences.key "E">
 <!ENTITY torbutton.context_menu.about "Ã?ber Torbutton â?¦">
 <!ENTITY torbutton.context_menu.about.key "Ã?">
-<!ENTITY torbutton.context_menu.networksettings "Netzwerkeinstellungen Ã¶ffnen â?¦">
+<!ENTITY torbutton.context_menu.networksettings "Tor-Netzwerk-Einstellungen...">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
-<!ENTITY torbutton.context_menu.downloadUpdate "Aktualisierung des Tor-Browser-Pakets herunterladen â?¦">
+<!ENTITY torbutton.context_menu.downloadUpdate "Suche nach Tor-Browser-Aktualisierungen...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie-Schutzvorkehrungen">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie-Schutz...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.context_menu.copyTor "Tor-Adresse kopieren">
 <!ENTITY torbutton.context_menu.copyTor.key "k">
@@ -155,3 +157,4 @@
 <!ENTITY torbutton.prefs.sec_med_high "oberes Mittel">
 <!ENTITY torbutton.prefs.sec_high "hoch">
 <!ENTITY torbutton.prefs.sec_custom "Eigene Werte">
+<!ENTITY torbutton.circuit_display.title "Tor-Kanal fÃ¼r diese Seite">
diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties
index 29bfaf4..ba20cf9 100644
--- a/src/chrome/locale/de/torbutton.properties
+++ b/src/chrome/locale/de/torbutton.properties
@@ -1,5 +1,10 @@
 torbutton.button.tooltip.disabled = Tor aktivieren
 torbutton.button.tooltip.enabled = Tor deaktivieren
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = IP unbekannt
+torbutton.circuit_display.this_browser = Dieser Browser
+torbutton.circuit_display.tor_bridge = Bridge
+torbutton.circuit_display.unknown_country = Unbekanntes Land
 torbutton.panel.tooltip.disabled = Klicken, um Tor zu aktivieren
 torbutton.panel.tooltip.enabled = Klicken, um Tor zu deaktivieren
 torbutton.panel.plugins.disabled = Klicken, um die Erweiterungen zu aktivieren
@@ -46,6 +51,7 @@ torbutton.popup.short_torbrowser = Wichtige Torbutton-Information!\n\nTorbutton
 
 torbutton.popup.confirm_plugins = Erweiterungen wie Flash kÃ¶nnen ihre PrivatsphÃ¤re und AnonymitÃ¤t schÃ¤digen.\n\nSie kÃ¶nnen auch das Tor-Netzwerk umgehen, und Ihren derzeitigen Aufenthaltsort und ihre IP-Adresse verraten.\n\nSind Sie sicher, dass Sie Erweiterungen aktivieren wollen?\n\n
 torbutton.popup.never_ask_again = Nicht mehr nachfragen
+torbutton.popup.confirm_newnym = Tor-Browser wird alle Fenster und Tabs schlieÃ?en. Alle Webseiten-Sitzungen gehen verloren.\n\nTor-Browser jetzt neu starten um Ihre IdentitÃ¤t zurÃ¼ckzusetzen?\n\n
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=Die Internetseite (%S) hat versucht, HTML5-Canvas-Bilddaten zu extrahieren, die verwendet werden kÃ¶nnen, um Ihren Rechner eindeutig zu identifizieren. \n\nSoll Tor-Browser es dieser Internetseite erlauben HTML5-Canvas-Bilddaten zu extrahieren?
diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd
index af9ff47..f2c865c 100644
--- a/src/chrome/locale/es/aboutTor.dtd
+++ b/src/chrome/locale/es/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2015, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -8,7 +8,7 @@
 
 <!ENTITY aboutTor.outOfDateTorOn.label "SIN EMBARGO, este navegador no estÃ¡ actualizado.">
 <!ENTITY aboutTor.outOfDateTorOff.label "ADEMÃ?S, este navegador tampoco estÃ¡ actualizado.">
-<!ENTITY aboutTor.outOfDate2.label "Haga clic en la cebolla y luego elija 'Descargar actualizaciÃ³n del Paquete de Navegador Tor'.">
+<!ENTITY aboutTor.outOfDate2.label "Haga clic en la cebolla y luego seleccione Comprobar actualizaciones del Navegador Tor.">
 
 <!ENTITY aboutTor.check.label "Probar las preferencias de red Tor">
 
@@ -25,6 +25,7 @@
 
 <!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&amp;location_option=ES";>
 
 <!ENTITY aboutTor.torInfo1.label "InformaciÃ³n adicional:">
 <!ENTITY aboutTor.torInfo2.label "PaÃs y direcciÃ³n IP:">
diff --git a/src/chrome/locale/es/brand.dtd b/src/chrome/locale/es/brand.dtd
index 7710d47..c2c9e68 100644
--- a/src/chrome/locale/es/brand.dtd
+++ b/src/chrome/locale/es/brand.dtd
@@ -6,3 +6,9 @@
 <!ENTITY  brandFullName         "Navegador Tor">
 <!ENTITY  vendorShortName       "Proyecto Tor">
 <!ENTITY  trademarkInfo.part1   "Firefox y los logotipos de Firefox son marcas registradas de la Mozilla Foundation.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Haga clic para cargar los complementos de sistema instalados">
+<!ENTITY plugins.installed.enable "Habilitar complementos">
+<!ENTITY plugins.installed.disable "Deshabilitar complementos">
+<!ENTITY plugins.installed.disable.tip "Haga clic para prevenir que se carguen complementos de sistema">
diff --git a/src/chrome/locale/es/browser.properties b/src/chrome/locale/es/browser.properties
index b236c3c..173fa7b 100644
--- a/src/chrome/locale/es/browser.properties
+++ b/src/chrome/locale/es/browser.properties
@@ -3,11 +3,3 @@ browser.startup.homepage=about:tor
 
 # Spell checker dictionary
 spellchecker.dictionary=es-ES
-
-# Default search engine
-browser.search.defaultenginename=Startpage
-
-# Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Startpage
-browser.search.order.2=DuckDuckGo
-browser.search.order.3=Google
diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd
index c51f7f9..c33695c 100644
--- a/src/chrome/locale/es/torbutton.dtd
+++ b/src/chrome/locale/es/torbutton.dtd
@@ -24,17 +24,19 @@
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton estÃ¡ activo. Si desea cambiar la configuraciÃ³n para proxy de su navegaciÃ³n sin Tor, desactive Torbutton y regrese aquÃ. Si desea cambiar su configuraciÃ³n para Tor, use la ventana de preferencias de Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Nueva identidad (nueva instancia y conexiones de Tor)">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
+<!ENTITY torbutton.context_menu.new_circuit "Nuevo circuito Tor para este sitio">
+<!ENTITY torbutton.context_menu.new_circuit_key "C">
 <!ENTITY torbutton.context_menu.toggle "Cambiar estado de Tor">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "Preferencias...">
+<!ENTITY torbutton.context_menu.preferences "ConfiguraciÃ³n de privacidad y seguridad...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Acerca de Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
-<!ENTITY torbutton.context_menu.networksettings "Abrir configuraciÃ³n de redâ?¦">
+<!ENTITY torbutton.context_menu.networksettings "ConfiguraciÃ³n de red Tor...">
 <!ENTITY torbutton.context_menu.networksettings.key "G">
-<!ENTITY torbutton.context_menu.downloadUpdate "Descargar actualizaciÃ³n del Paquete de Navegador Tor">
+<!ENTITY torbutton.context_menu.downloadUpdate "Comprobar actualizaciÃ³n del Navegador Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "a">
-<!ENTITY torbutton.context_menu.cookieProtections "Protecciones de cookie">
+<!ENTITY torbutton.context_menu.cookieProtections "Protecciones de cookie...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.context_menu.copyTor "Copiar URL de Tor">
 <!ENTITY torbutton.context_menu.copyTor.key "U">
@@ -155,3 +157,4 @@
 <!ENTITY torbutton.prefs.sec_med_high "Medio-Alto">
 <!ENTITY torbutton.prefs.sec_high "Alto">
 <!ENTITY torbutton.prefs.sec_custom "Valores Personalizados">
+<!ENTITY torbutton.circuit_display.title "Circuito Tor para este sitio">
diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties
index f40fc06..8cd1ed5 100644
--- a/src/chrome/locale/es/torbutton.properties
+++ b/src/chrome/locale/es/torbutton.properties
@@ -1,5 +1,10 @@
 torbutton.button.tooltip.disabled = Habilitar Tor
 torbutton.button.tooltip.enabled = Deshabilitar Tor
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = IP desconocida
+torbutton.circuit_display.this_browser = Este navegador
+torbutton.circuit_display.tor_bridge = Repetior puente (bridge)
+torbutton.circuit_display.unknown_country = PaÃs desconocido
 torbutton.panel.tooltip.disabled = Haga clic para habilitar Tor
 torbutton.panel.tooltip.enabled = Haga clic para deshabilitar Tor
 torbutton.panel.plugins.disabled = Haga clic para habilitar extensiones (plugins).
@@ -46,6 +51,7 @@ torbutton.popup.short_torbrowser = Â¡InformaciÃ³n importante sobre Torbutton! \n
 
 torbutton.popup.confirm_plugins = Complementos (plugins) como Flash pueden daÃ±ar su privacidad y anonimato.\n\nTambiÃ©n pueden evitar Tor, revelando su actual ubicaciÃ³n y direcciÃ³n IP.\n\nÂ¿EstÃ¡ seguro de que quiere habilitar los complementos?\n\n
 torbutton.popup.never_ask_again = No volver a preguntar
+torbutton.popup.confirm_newnym = El Navegador Tor cerrarÃ¡ todas las ventanas y pestaÃ±as. Todas las sesiones de sitios web se perderÃ¡n.\n\nÂ¿Reiniciar el Navegador Tor para restablecer su identidad?\n\n
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=Este sitio web (%s) intentÃ³ extraer datos de imagen de un lienzo HTML5, que podrÃan usarse para identificar de forma Ãºnica su computadora.\n\nÂ¿Debe permitir el Navegador Tor a este sitio web extraer los datos de imagen de lienzos HTML5?
diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd
index 7afe64b..692e1d1 100644
--- a/src/chrome/locale/eu/aboutTor.dtd
+++ b/src/chrome/locale/eu/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2015, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -8,7 +8,7 @@
 
 <!ENTITY aboutTor.outOfDateTorOn.label "HALA ERE, nabigatzaile hau zaharkituta dago.">
 <!ENTITY aboutTor.outOfDateTorOff.label "BAITA, nabigatzaile hau zaharkituta dago.">
-<!ENTITY aboutTor.outOfDate2.label "Tipulan sakatu eta ondoren hautatu Tor Browser Bundle eguneraketa deskargatu.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update.">
 
 <!ENTITY aboutTor.check.label "Tor sare ezarpenak frogatu">
 
@@ -25,6 +25,7 @@
 
 <!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&amp;location_option=US";>
 
 <!ENTITY aboutTor.torInfo1.label "Informazio gehiago:">
 <!ENTITY aboutTor.torInfo2.label "Herrialde eta IP helbidea:">
diff --git a/src/chrome/locale/eu/brand.dtd b/src/chrome/locale/eu/brand.dtd
index f144e27..c4f0039 100644
--- a/src/chrome/locale/eu/brand.dtd
+++ b/src/chrome/locale/eu/brand.dtd
@@ -6,3 +6,9 @@
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
 <!ENTITY  trademarkInfo.part1   "Firefox eta Firefox logoak Mozilla Fundazioaren marka errgistratuak dira.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Click to load installed system plugins">
+<!ENTITY plugins.installed.enable "Enable plugins">
+<!ENTITY plugins.installed.disable "Disable plugins">
+<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins">
diff --git a/src/chrome/locale/eu/browser.properties b/src/chrome/locale/eu/browser.properties
index 295a03a..8849b67 100644
--- a/src/chrome/locale/eu/browser.properties
+++ b/src/chrome/locale/eu/browser.properties
@@ -3,11 +3,3 @@ browser.startup.homepage=about:tor
 
 # Spell checker dictionary
 spellchecker.dictionary=en_US
-
-# Default search engine
-browser.search.defaultenginename=Startpage
-
-# Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Startpage
-browser.search.order.2=DuckDuckGo
-browser.search.order.3=Google
diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd
index 3c6d032..14f216f 100644
--- a/src/chrome/locale/eu/torbutton.dtd
+++ b/src/chrome/locale/eu/torbutton.dtd
@@ -24,17 +24,19 @@
 <!ENTITY torbutton.pref_connection_more_info.text "Une honetan Torbutton gaituta dago. Zure ez-Tor proxy ezarpenak aldatu nahi badituzu, mesedez ezgaitu Torbutton eta hona bueltatu. Zure Tor ezarpenak aldatu nahi badituzu, mesedez erabili Torbutton ezarpen leihoa.">
 <!ENTITY torbutton.context_menu.new_identity "Nortasun berria">
 <!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_key "C">
 <!ENTITY torbutton.context_menu.toggle "Aldatu Toren egoera">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "Hobespenak...">
+<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settingsâ?¦">
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Torbuttoni buruz...">
 <!ENTITY torbutton.context_menu.about.key "A">
-<!ENTITY torbutton.context_menu.networksettings "Sare ezarpenak ireki...">
+<!ENTITY torbutton.context_menu.networksettings "Tor Network Settingsâ?¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
-<!ENTITY torbutton.context_menu.downloadUpdate "Deskargatu Tor Browser Bundle eguneraketa...">
+<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie Babesak">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.context_menu.copyTor "Kopiatu Tor URLa">
 <!ENTITY torbutton.context_menu.copyTor.key "p">
@@ -44,7 +46,7 @@
 <!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Sakatu Torbutton abiarazteko">
-<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
+<!ENTITY torbutton.prefs.privacy_security_settings "Pribatutasun eta segurtasun ezarpenak">
 <!ENTITY torbutton.prefs.block_thread "Blokeatu historia irakurketak Tor bitartean (erabakigarria)">
 <!ENTITY torbutton.prefs.block_thwrite "Blokeatu historia idazketak Tor bitartean (gomendatua)">
 <!ENTITY torbutton.prefs.block_nthread "Blokeatu historia irakurketak Ez-Tor bitartean (hautazkoa)">
@@ -149,9 +151,10 @@
 <!ENTITY torbutton.prefs.restrict_thirdparty "Hirugarrenen cookie-ak eta beste jarraipen datuak murriztu">
 <!ENTITY torbutton.prefs.block_plugins "Nabigatzaile pluginak ezgaitu (Flash bezala)">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Zu beste Tor Browser erabiltzaileengandik nabarmentzen zaituzten xehetasunak aldatu">
-<!ENTITY torbutton.prefs.sec_caption "Security Level">
-<!ENTITY torbutton.prefs.sec_low "Low (default)">
-<!ENTITY torbutton.prefs.sec_med_low "Medium-Low">
-<!ENTITY torbutton.prefs.sec_med_high "Medium-High">
-<!ENTITY torbutton.prefs.sec_high "High">
-<!ENTITY torbutton.prefs.sec_custom "Custom Values">
+<!ENTITY torbutton.prefs.sec_caption "Segurtasun maila">
+<!ENTITY torbutton.prefs.sec_low "Baxua (lehentsia)">
+<!ENTITY torbutton.prefs.sec_med_low "Ertaina-baxua">
+<!ENTITY torbutton.prefs.sec_med_high "Ertaina-altua">
+<!ENTITY torbutton.prefs.sec_high "Altua">
+<!ENTITY torbutton.prefs.sec_custom "Balio pertsonalizatuak">
+<!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/src/chrome/locale/eu/torbutton.properties b/src/chrome/locale/eu/torbutton.properties
index bd4f51e..d856bec 100644
--- a/src/chrome/locale/eu/torbutton.properties
+++ b/src/chrome/locale/eu/torbutton.properties
@@ -1,5 +1,10 @@
 torbutton.button.tooltip.disabled = Tor gaitu
 torbutton.button.tooltip.enabled = Tor ezgaitu
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = IP unknown
+torbutton.circuit_display.this_browser = This browser
+torbutton.circuit_display.tor_bridge = Bridge
+torbutton.circuit_display.unknown_country = Unknown country
 torbutton.panel.tooltip.disabled = Sakatu Tor gaitzeko
 torbutton.panel.tooltip.enabled = Sakatu Tor ezgaitzeko
 torbutton.panel.plugins.disabled = Sakatu gehigarriak gaitzeko
@@ -46,6 +51,7 @@ torbutton.popup.short_torbrowser = Torbutton informazio garrantzitsua!\n\nTorbut
 
 torbutton.popup.confirm_plugins = Flash bezalako pluginek zure pribatutasuna eta anonimotasuna kaltetu dezakete.\n\nTor saltatu dezakete zure uneko kokalekua eta IP helbidea erakusteko.\n\nPluginak gaitu nahi dituzulaz ziur al zaude?\n\n
 torbutton.popup.never_ask_again = Ez nazazu galdetu berriz
+torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=Webgune hau (% S) HTML5 canvas irudi datuak ateratzen saiatu da, eta zure ordenagailua identifikatzeko erabil daitezke.\n\nTor Nabigatzailea baimendu nahi duzu webgune honetan HTML5 canvas irudiaren datuak ateratzeko?
diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd
index e0768d3..8c94506 100644
--- a/src/chrome/locale/fa/aboutTor.dtd
+++ b/src/chrome/locale/fa/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2015, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -8,7 +8,7 @@
 
 <!ENTITY aboutTor.outOfDateTorOn.label "Ø¨Ø§ Ø§Û?Ù? ØØ§Ù? Ù« Ø§Û?Ù? Ù?Ø±Ù?Ø±Ú¯Ø± Ù?Ø¯Û?Ù?Û? Ù?Û? Ø¨Ø§Ø´Ø¯.">
 <!ENTITY aboutTor.outOfDateTorOff.label "Ù?Ù?Ú?Ù?Û?Ù? Ù« Ø§Û?Ù? Ù?Ø±Ù?Ø±Ú¯Ø± Ù?Ø¯Û?Ù?Û? Ù?Û? Ø¨Ø§Ø´Ø¯ .">
-<!ENTITY aboutTor.outOfDate2.label "Ø¨Ø± Ø±Ù?Û? Ù¾Û?Ø§Ø²(Ù?Ù?Ø§Ø¯ ØªÙ?Ø±) Ú©Ù?Û?Ú© Ù?Ù?Ø§Û?Û?Ø¯ Ù? Ø¨Ø³ØªÙ? Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø± Ø±Ø§ Ø¬Ù?Øª Ø¨Ø±Ù?Ø²Ø±Ø³Ø§Ù?Û? Ø¯Ø±Û?Ø§Ù?Øª Ù?Ù?Ø§Û?Û?Ø¯.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update.">
 
 <!ENTITY aboutTor.check.label "ØªÙ?Ø¸Û?Ù?Ø§Øª Ø´Ø¨Ú©Ù?â??Û? ØªÙ?Ø± Ø±Ø§ Ø¨Ø±Ø±Ø³Û? Ú©Ù?Û?Ø¯">
 
@@ -25,6 +25,7 @@
 
 <!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&amp;location_option=US";>
 
 <!ENTITY aboutTor.torInfo1.label "Ø§Ø·Ù?Ø§Ø¹Ø§Øª Ø¨Ù?Ø´ØªØ±">
 <!ENTITY aboutTor.torInfo2.label "Ù?Ø´Ù?Ø± Ù? Ø¢Ø¯Ø±Ø³ Ø¢Ù? Ù¾Û?:">
diff --git a/src/chrome/locale/fa/brand.dtd b/src/chrome/locale/fa/brand.dtd
index b11f2dc..62d877c 100644
--- a/src/chrome/locale/fa/brand.dtd
+++ b/src/chrome/locale/fa/brand.dtd
@@ -6,3 +6,9 @@
 <!ENTITY  brandFullName         "Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø±">
 <!ENTITY  vendorShortName       "Ù¾Ø±Ù?Ú?Ù?Ù? ØªÙ?Ø±">
 <!ENTITY  trademarkInfo.part1   "Ù?Ø§Û?Ø±Ù?Ø§Ú©Ø³ Ù? Ù?Ù?Ú¯Ù? Ù?Ø§Û?Ø±Ù?Ø§Ú©Ø³ Ù?Ø´Ø§Ù? ØªØ¬Ø§Ø±Û? Ø¨Ù?Û?Ø§Ø¯ Ù?Ù?Ø²Û?Ù?Ø§ Ù?Û? Ø¨Ø§Ø´Ù?Ø¯.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Click to load installed system plugins">
+<!ENTITY plugins.installed.enable "Enable plugins">
+<!ENTITY plugins.installed.disable "Disable plugins">
+<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins">
diff --git a/src/chrome/locale/fa/browser.properties b/src/chrome/locale/fa/browser.properties
index 37e0215..8849b67 100644
--- a/src/chrome/locale/fa/browser.properties
+++ b/src/chrome/locale/fa/browser.properties
@@ -3,11 +3,3 @@ browser.startup.homepage=about:tor
 
 # Spell checker dictionary
 spellchecker.dictionary=en_US
-
-# Default search engine
-browser.search.defaultenginename=Startpage
-
-# Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Startpage
-browser.search.order.2=DuckDuckGo
-browser.search.order.3=Ú¯Ù?Ú¯Ù? Ú©Ø§Ù?Ø§Ø¯Ø§
diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd
index 07c0bc7..1c999fd 100644
--- a/src/chrome/locale/fa/torbutton.dtd
+++ b/src/chrome/locale/fa/torbutton.dtd
@@ -24,17 +24,19 @@
 <!ENTITY torbutton.pref_connection_more_info.text "Ø¯Ú©Ù?Ù? ØªÙ?Ø±Ù?Ù? Ø§Ú©Ù?Ù?Ù? Ù?Ø¹Ø§Ù? Ø´Ø¯Ù? Ø§Ø³Øª.Ø§Ú¯Ø± Ù?Û?â??Ø®Ù?Ø§Ù?Ù?Ø¯ ØªÙ?Ø¸Ù?Ù?Ø§Øª Ù¾Ø±Ø§Ú©Ø³Û? ØºÙ?Ø±Ù?Ø±ØªØ¨Ø· Ø¨Ø§ ØªÙ?Ø± Ø±Ø§ ØªØºÙ?Ù?Ø± Ø¯Ù?Ù?Ø¯Ø? Ù?Ø·Ù?Ø§ Ø¯Ú©Ù?Ù? ØªÙ?Ø± Ø±Ø§ ØºÙ?Ø±Ù?Ø¹Ø§Ù? Ú©Ù?Ù?Ø¯ Ù? Ø¯Ù?Ø¨Ø§Ø±Ù? Ø¨Ù? Ø§Ù?Ù?Ø¬Ø§ Ø¨Ø§Ø²Ú¯Ø±Ø¯Ù?Ø¯. Ø§Ú¯Ø± Ù?Ù?Ø®Ù?Ø§Ù?Ù?Ø¯ ØªÙ?Ø¸Ù?Ù?Ø§Øª ØªÙ?Ø± Ø±Ø§ ØªØºÙ?Ù?Ø± Ø¯Ù?Ù?Ø¯Ø? Ø§Ø² Ù¾Ù?Ø¬Ø±Ù? ØªÙ?Ø¸Ù?Ù?Ø§Øª Ø¯Ú©Ù?Ù? ØªÙ?Ø± Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ù?Ù?Ø¯.">
 <!ENTITY torbutton.context_menu.new_identity "Ù?Ù?Û?Øª Ø¬Ø¯Û?Ø¯">
 <!ENTITY torbutton.context_menu.new_identity_key "Ù?Ù?">
+<!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
+<!ENTITY torbutton.context_menu.new_circuit_key "C">
 <!ENTITY torbutton.context_menu.toggle "Ø¶Ø§Ù?Ù? Ù?Ø¹Ø§Ù?/ØºÙ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? ØªÙ?Ø±">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "ØªÙ?Ø¸Ù?Ù?Ø§Øª...">
+<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settingsâ?¦">
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Ø¯Ø±Ø¨Ø§Ø±Ù? Ù? Ø¯Ú©Ù?Ù? ØªÙ?Ø±...">
 <!ENTITY torbutton.context_menu.about.key "A">
-<!ENTITY torbutton.context_menu.networksettings "Ø¨Ø§Ø² Ú©Ø±Ø¯Ù? ØªÙ?Ø¸Û?Ù?Ø§Øª Ø´Ø¨Ú©Ù?">
+<!ENTITY torbutton.context_menu.networksettings "Tor Network Settingsâ?¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
-<!ENTITY torbutton.context_menu.downloadUpdate "Ø¨Ù?â??Ø±Ù?Ø²Ø±Ø³Ø§Ù?Ø¯Ù? Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø±">
+<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "ØÙ?Ø§Ø¸Øª Ú©Ù?Ù?Ú?Ú©â??Ù?Ø§">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.context_menu.copyTor "Ú©Ù¾Û? Ø¨Ù? Ù?Ø´Ø§Ù?Û? Ø§Ù?Ù?ØªØ±Ù?ØªÛ?">
 <!ENTITY torbutton.context_menu.copyTor.key "p">
@@ -155,3 +157,4 @@
 <!ENTITY torbutton.prefs.sec_med_high "Ù?ØªÙ?Ø³Ø· â??â??- Ø¨Ø§Ù?Ø§">
 <!ENTITY torbutton.prefs.sec_high "Ø²Û?Ø§Ø¯">
 <!ENTITY torbutton.prefs.sec_custom "ØªÙ?Ø¸Û?Ù? Ø³Ù?Ø§Ø±Ø´Û?">
+<!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties
index 265aa65..8e02910 100644
--- a/src/chrome/locale/fa/torbutton.properties
+++ b/src/chrome/locale/fa/torbutton.properties
@@ -1,5 +1,10 @@
 torbutton.button.tooltip.disabled = Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? ØªÙ?Ø±
 torbutton.button.tooltip.enabled = ØºÙ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? ØªÙ?Ø±
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = IP unknown
+torbutton.circuit_display.this_browser = This browser
+torbutton.circuit_display.tor_bridge = Bridge
+torbutton.circuit_display.unknown_country = Unknown country
 torbutton.panel.tooltip.disabled = Ø¨Ø±Ø§Û? Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? ØªÙ?Ø±Ú©Ù?Ù?Ú© Ú©Ù?Ù?Ø¯
 torbutton.panel.tooltip.enabled = Ø¨Ø±Ø§Û? ØºÙ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? ØªÙ?Ø± Ú©Ù?Ù?Ú© Ú©Ù?Ù?Ø¯
 torbutton.panel.plugins.disabled = Ø¨Ø±Ø§Û? Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? Ù¾Ù?Ø§Ú¯Ù?Ù? Ù?Ø§ Ú©Ù?Ù?Ú© Ú©Ù?Ù?Ø¯
@@ -46,6 +51,7 @@ torbutton.popup.short_torbrowser = Ø§Ø·Ù?Ø§Ø¹Ù?Øª Ù?Ù?Ù? Torbutton!\n\nTorbutton
 
 torbutton.popup.confirm_plugins = Ù¾Ù?Ø§Ú¯Û?Ù?Ù?Ø§ Ù?Ø§Ù?Ù?Ø¯ Ù?Ù?Ø´Ø? Ù?Û?ØªÙ?Ø§Ù?Ù?Ø¯ Ø§Ø®ØªÙ?Ø§ Ù? Ù?Ø§Ø´Ù?Ø§Ø³ Ø¨Ù?Ø¯Ù? Ø´Ù?Ø§ Ø±Ø§ Ø¨Ù? Ø®Ø·Ø± Ø¨Û?Ø§Ù?Ø¯Ø§Ø²Ù?Ø¯.\n\nØ¢Ù?Ù?Ø§ Ù?Ù?Ú?Ù?Û?Ù? Ù?Û?ØªÙ?Ø§Ù?Ù?Ø¯ "ØªØ±" Ø±Ø§ Ø¯Ù?Ø± Ø²Ø¯Ù? ØªØ§ Ù?Ù?Ù?Ø¹Û?Øª Ú©Ù?Ù?Ù?Û? Ù? Ø¢Ø¯Ø±Ø³ IP Ø´Ù?Ø§ Ø±Ø§ Ø¨Ø±Ù?Ù?Ø§ Ú©Ù?Ù?Ø¯.\n\nÙ?Ø·Ù?Ø¦Ù?Û?Ø¯ Ú©Ù? Ù?Û?Ø®Ù?Ø§Ù?Û?Ø¯ Ù¾Ù?Ø§Ú¯Û?Ù?Ù?Ø§ Ø±Ø§ Ù?Ø¹Ø§Ù? Ú©Ù?Û?Ø¯Ø?\n\n
 torbutton.popup.never_ask_again = Ø¯Û?Ú¯Ø± Ù?Û?Ú?Ú¯Ø§Ù? Ø§Û?Ù? Ø±Ø§ Ø§Ø² Ù?Ù? Ù?Ù¾Ø±Ø³
+torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=Ø§Û?Ù? Ù?Ø¨â??Ø³Ø§Û?Øª (%S) Ø³Ø¹Û? Ø¯Ø§Ø±Ø¯ Ø§Ø·Ù?Ø§Ø¹Ø§Øª Ø¨Ù?Ù? ØªØµÙ?Û?Ø± HTML5 Ø±Ø§ Ø¯Ø±Û?Ø§Ù?Øª Ú©Ù?Ø¯ Ú©Ù? Ù?Ù?Ú©Ù? Ø§Ø³Øª Ø¨Ø±Ø§Û? Ø´Ù?Ø§Ø³Ø§Û?Û? Ù?Ù?ØØµØ± Ø¨Ù? Ù?Ø±Ø¯ Ú©Ø§Ù?Ù¾Û?Ù?ØªØ± Ø´Ù?Ø§ Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø´Ù?Ø¯.\n\nØ¢Û?Ø§ Ù?Ø±Ù?Ø±Ú¯Ø± ØªÙ?Ø± Ù?Û?Ø¨Ø§Û?Ø³Øª Ø§Ø¬Ø§Ø²Ù? Ø¯Ø±Û?Ø§Ù?Øª Ø§Û?Ù? Ø§Ø·Ù?Ø§Ø¹Ø§Øª Ø±Ø§ Ø¨Ø¯Ù?Ø¯Ø?
diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd
index 41ad3e5..baeba8e 100644
--- a/src/chrome/locale/fr/aboutTor.dtd
+++ b/src/chrome/locale/fr/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2015, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -8,7 +8,7 @@
 
 <!ENTITY aboutTor.outOfDateTorOn.label "CEPENDANT, ce navigateur n'est pas Ã  jour.">
 <!ENTITY aboutTor.outOfDateTorOff.label "DE PLUS, ce navigateur n'est pas Ã  jour.">
-<!ENTITY aboutTor.outOfDate2.label "Cliquez sur l'oignon, puis choisissez TÃ©lÃ©charger les mises Ã  jour du Tor Browser Bundle.">
+<!ENTITY aboutTor.outOfDate2.label "Cliquez sur l'oignon et choissisez ensuite VÃ©rifier les mises Ã  jour du Tor Browser">
 
 <!ENTITY aboutTor.check.label "Tester les paramÃ¨tres du rÃ©seau Tor">
 
@@ -25,6 +25,7 @@
 
 <!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&amp;location_option=US";>
 
 <!ENTITY aboutTor.torInfo1.label "Informations supplÃ©mentairesÂ :">
 <!ENTITY aboutTor.torInfo2.label "Pays &amp; adresse IPÂ :">
diff --git a/src/chrome/locale/fr/brand.dtd b/src/chrome/locale/fr/brand.dtd
index 775472a..4a4f0ea 100644
--- a/src/chrome/locale/fr/brand.dtd
+++ b/src/chrome/locale/fr/brand.dtd
@@ -6,3 +6,9 @@
 <!ENTITY  brandFullName         "Navigateur Tor">
 <!ENTITY  vendorShortName       "Projet Tor">
 <!ENTITY  trademarkInfo.part1   "Firefox et les logos de Firefox sont des marques dÃ©posÃ©es de la Fondation Mozilla.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Cliquer pour charger les modules complÃ©mentaires du systÃ¨me installÃ©s">
+<!ENTITY plugins.installed.enable "Activer les modules complÃ©mentaires">
+<!ENTITY plugins.installed.disable "DÃ©sactiver les modules complÃ©mentaires">
+<!ENTITY plugins.installed.disable.tip "Cliquer pour empÃªcher le chargement de modules complÃ©mentaires du systÃ¨me">
diff --git a/src/chrome/locale/fr/browser.properties b/src/chrome/locale/fr/browser.properties
index e8c588c..3b96d52 100644
--- a/src/chrome/locale/fr/browser.properties
+++ b/src/chrome/locale/fr/browser.properties
@@ -3,11 +3,3 @@ browser.startup.homepage=about:tor
 
 # Spell checker dictionary
 spellchecker.dictionary=fr_FR
-
-# Default search engine
-browser.search.defaultenginename=Page d'accueil
-
-# Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Page d'accueil
-browser.search.order.2=DuckDuckGo
-browser.search.order.3=Google
diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd
index f72e094..0e7b345 100644
--- a/src/chrome/locale/fr/torbutton.dtd
+++ b/src/chrome/locale/fr/torbutton.dtd
@@ -24,17 +24,19 @@
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton est actuellement activÃ©.  Si vous souhaitez modifier vos paramÃ¨tres proxy non-Tor, veuillez dÃ©sactiver Torbutton et revenir Ã  cette fenÃªtre.  Si vous souhaitez modifier vos paramÃ¨tres Tor, veuillez utiliser la fenÃªtre des prÃ©fÃ©rences Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Nouvelle identitÃ©">
 <!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_key "C">
 <!ENTITY torbutton.context_menu.toggle "Activer/DÃ©sactiver Tor">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "PrÃ©fÃ©rences...">
+<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settingsâ?¦">
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Ã? propos de Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
-<!ENTITY torbutton.context_menu.networksettings "Ouvrir les paramÃ¨tres rÃ©seaux...">
+<!ENTITY torbutton.context_menu.networksettings "Tor Network Settingsâ?¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
-<!ENTITY torbutton.context_menu.downloadUpdate "TÃ©lÃ©charger la mise Ã  jour de Tor Browser Bundle...">
+<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "Protections de cookies">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.context_menu.copyTor "Copier l'URL Tor">
 <!ENTITY torbutton.context_menu.copyTor.key "p">
@@ -155,3 +157,4 @@
 <!ENTITY torbutton.prefs.sec_med_high "Moyen-Haut">
 <!ENTITY torbutton.prefs.sec_high "Haut">
 <!ENTITY torbutton.prefs.sec_custom "Valeurs personnalisÃ©es">
+<!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties
index 870d293..61083eb 100644
--- a/src/chrome/locale/fr/torbutton.properties
+++ b/src/chrome/locale/fr/torbutton.properties
@@ -1,5 +1,10 @@
 torbutton.button.tooltip.disabled = Activer Tor
 torbutton.button.tooltip.enabled = DÃ©sactiver Tor
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = IP unknown
+torbutton.circuit_display.this_browser = This browser
+torbutton.circuit_display.tor_bridge = Bridge
+torbutton.circuit_display.unknown_country = Unknown country
 torbutton.panel.tooltip.disabled = Cliquer pour activer Tor
 torbutton.panel.tooltip.enabled = Cliquer pour dÃ©sactiver Tor
 torbutton.panel.plugins.disabled = Cliquer pour activer les plugins
@@ -46,6 +51,7 @@ torbutton.popup.short_torbrowser = Information importante concernant Torbutton!\
 
 torbutton.popup.confirm_plugins = Les greffons tels que Flash peuvent nuire Ã  votre anonymat et vie privÃ©e.\n\nIls peuvent Ã©galement contourner Tor afin de rÃ©vÃ©ler votre position actuelle ainsi que votre adresse IP.\n\nÃ?tes-vous certain de vouloir activer les greffons ?\n\n
 torbutton.popup.never_ask_again = Ne plus me poser la question.
+torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=Ce site (%S) tente d'extraire des informations d'image canvas HTML5 qui pourraient Ãªtre utilisÃ©es comme identifiant unique pour votre ordinateur.\n\nTor Browser doit-il autoriser le site Ã  extraire les informations d'image canvas HTML5 ?
diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd
index 09e2064..ae9aeae 100644
--- a/src/chrome/locale/it/aboutTor.dtd
+++ b/src/chrome/locale/it/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2015, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -8,7 +8,7 @@
 
 <!ENTITY aboutTor.outOfDateTorOn.label "TUTTAVIA, questo browser non Ã¨ aggiornato.">
 <!ENTITY aboutTor.outOfDateTorOff.label "INOLTRE, questo browser non Ã¨ aggiornato.">
-<!ENTITY aboutTor.outOfDate2.label "Clicca sulla cipolla e poi scegli Scarica Aggiornamento Tor Browser Bundle.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update.">
 
 <!ENTITY aboutTor.check.label "Test Impostazioni della Rete Tor">
 
@@ -25,6 +25,7 @@
 
 <!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&amp;location_option=US";>
 
 <!ENTITY aboutTor.torInfo1.label "Ulteriori Info:">
 <!ENTITY aboutTor.torInfo2.label "Nazione &amp; Indirizzo IP:">
diff --git a/src/chrome/locale/it/brand.dtd b/src/chrome/locale/it/brand.dtd
index f813020..17fbe4b 100644
--- a/src/chrome/locale/it/brand.dtd
+++ b/src/chrome/locale/it/brand.dtd
@@ -6,3 +6,9 @@
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
 <!ENTITY  trademarkInfo.part1   "Firefox e i loghi Firefox sono marchi registrati della Mozilla Foundation.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Click to load installed system plugins">
+<!ENTITY plugins.installed.enable "Enable plugins">
+<!ENTITY plugins.installed.disable "Disable plugins">
+<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins">
diff --git a/src/chrome/locale/it/browser.properties b/src/chrome/locale/it/browser.properties
index 295a03a..8849b67 100644
--- a/src/chrome/locale/it/browser.properties
+++ b/src/chrome/locale/it/browser.properties
@@ -3,11 +3,3 @@ browser.startup.homepage=about:tor
 
 # Spell checker dictionary
 spellchecker.dictionary=en_US
-
-# Default search engine
-browser.search.defaultenginename=Startpage
-
-# Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Startpage
-browser.search.order.2=DuckDuckGo
-browser.search.order.3=Google
diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd
index 11741a7..18d0a25 100644
--- a/src/chrome/locale/it/torbutton.dtd
+++ b/src/chrome/locale/it/torbutton.dtd
@@ -24,17 +24,19 @@
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton Ã¨ attualmente attivo. Se vuoi cambiare la configurazione del proxy quando non usi Tor, disabilita Torbutton e torna qui.  Se vuoi modificare la configurazione quando usi Tor, usa la finestra delle preferenze di Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Nuova identitÃ ">
 <!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_key "C">
 <!ENTITY torbutton.context_menu.toggle "Cambia lo stato di Tor">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "Preferenze...">
+<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settingsâ?¦">
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Informazioni su Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
-<!ENTITY torbutton.context_menu.networksettings "Apri Impostazioni di Rete...">
+<!ENTITY torbutton.context_menu.networksettings "Tor Network Settingsâ?¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
-<!ENTITY torbutton.context_menu.downloadUpdate "Download Aggiornamento Tor Browser Bundle...">
+<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
-<!ENTITY torbutton.context_menu.cookieProtections "Protezione dei Cookies">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.context_menu.copyTor "Copia URL Tor">
 <!ENTITY torbutton.context_menu.copyTor.key "p">
@@ -155,3 +157,4 @@
 <!ENTITY torbutton.prefs.sec_med_high "Medio-Alto">
 <!ENTITY torbutton.prefs.sec_high "Alto">
 <!ENTITY torbutton.prefs.sec_custom "Valori Customizzabili">
+<!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/src/chrome/locale/it/torbutton.properties b/src/chrome/locale/it/torbutton.properties
index 34f7671..641dc07 100644
--- a/src/chrome/locale/it/torbutton.properties
+++ b/src/chrome/locale/it/torbutton.properties
@@ -1,5 +1,10 @@
 torbutton.button.tooltip.disabled = Attiva Tor
 torbutton.button.tooltip.enabled = Disattiva Tor
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = IP unknown
+torbutton.circuit_display.this_browser = This browser
+torbutton.circuit_display.tor_bridge = Bridge
+torbutton.circuit_display.unknown_country = Unknown country
 torbutton.panel.tooltip.disabled = Fai clic per attivare Tor
 torbutton.panel.tooltip.enabled = Fai clic per disattivare Tor
 torbutton.panel.plugins.disabled = Fai clic per attivare i plugin
@@ -46,6 +51,7 @@ torbutton.popup.short_torbrowser = Informazioni importanti su Torbutton!\n\nTorb
 
 torbutton.popup.confirm_plugins = Alcuni plugin come Flash possono violare la tua privacy e anonimitÃ .\n\nPossono anche eludere Tor per rivelare la tua posizione attuale e il tuo indirizzo IP.\n\nSei sicuro di volere attivare i plugin?\n
 torbutton.popup.never_ask_again = Non chiedermelo piÃ¹
+torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=Questo sito (%S) tentato di estrarre i dati di immagine HTML5 canvas, che possono essere utilizzati per identificare in modo univoco il computer.\n\nPermettere a Tor Browser di estrarre l'immagine HTML5 canvas per questo sito?
diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd
index cf272b4..fe1edef 100644
--- a/src/chrome/locale/ja/aboutTor.dtd
+++ b/src/chrome/locale/ja/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2015, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -8,7 +8,7 @@
 
 <!ENTITY aboutTor.outOfDateTorOn.label "ã??ã??ã??ã??ã??ã?®ã??ã?©ã?¦ã?¶ã?¯å?¤ã??ã??ã?¼ã?¸ã?§ã?³ã?§ã??ã??">
 <!ENTITY aboutTor.outOfDateTorOff.label "ã?¾ã??ã??ã??ã?®ã??ã?©ã?¦ã?¶ã?¯å?¤ã??ã??ã?¼ã?¸ã?§ã?³ã?§ã??ã??">
-<!ENTITY aboutTor.outOfDate2.label "ã?ªã??ã?ªã?³ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??Tor Browser Bundleã?®ã?¢ã??ã??ã??ã?¼ã??ã??ã??ã?¦ã?³ã?ã?¼ã??ã??é?¸æ??">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update.">
 
 <!ENTITY aboutTor.check.label "Torã?®ã??ã??ã??ã?¯ã?¼ã?¯è¨å®?ã??ã??ã?¹ã??ã??ã??">
 
@@ -25,6 +25,7 @@
 
 <!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&amp;location_option=US";>
 
 <!ENTITY aboutTor.torInfo1.label "è¿½å? æ??å ±: ">
 <!ENTITY aboutTor.torInfo2.label "å?½ã?¨IPã?¢ã??ã?¬ã?¹:">
diff --git a/src/chrome/locale/ja/brand.dtd b/src/chrome/locale/ja/brand.dtd
index dd9e0d2..35a8894 100644
--- a/src/chrome/locale/ja/brand.dtd
+++ b/src/chrome/locale/ja/brand.dtd
@@ -6,3 +6,9 @@
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
 <!ENTITY  trademarkInfo.part1   "Firefoxã??ã??ã?³Firefoxã?®ã?ã?´ã?¯Mozillaè²¡å?£ã?®ç?»é?²å??æ¨?ã?§ã??ã??">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Click to load installed system plugins">
+<!ENTITY plugins.installed.enable "Enable plugins">
+<!ENTITY plugins.installed.disable "Disable plugins">
+<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins">
diff --git a/src/chrome/locale/ja/browser.properties b/src/chrome/locale/ja/browser.properties
index 1c59f6e..8849b67 100644
--- a/src/chrome/locale/ja/browser.properties
+++ b/src/chrome/locale/ja/browser.properties
@@ -3,11 +3,3 @@ browser.startup.homepage=about:tor
 
 # Spell checker dictionary
 spellchecker.dictionary=en_US
-
-# Default search engine
-browser.search.defaultenginename=ã?¹ã?¿ã?¼ã??ã??ã?¼ã?¸
-
-# Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=ã?¹ã?¿ã?¼ã??ã??ã?¼ã?¸
-browser.search.order.2=DuckDuckGo
-browser.search.order.3=Google
diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd
index 1f1d0a2..1dc7e6c 100644
--- a/src/chrome/locale/ja/torbutton.dtd
+++ b/src/chrome/locale/ja/torbutton.dtd
@@ -24,17 +24,19 @@
 <!ENTITY torbutton.pref_connection_more_info.text "Torbuttonã?¯ç?¾å?¨ã?ªã?³ã?«ã?ªã?£ã?¦ã??ã?¾ã??ã??ã??ã??ã??é??Torã?®è¨å®?ã??å¤?æ?´ã??ã??å ´å??ã?¯ã??ã?¾ã??Torbuttonã??ã?ªã??ã?«ã??ã?¦ã??ã? ã??ã??ã??Torã?®è¨å®?ã??å¤?æ?´ã??ã??å ´å??ã?«ã?¯Torbuttonè¨å®?ã?¦ã?£ã?³ã??ã?¦ã??ä½¿ã?£ã?¦ã??ã? ã??ã??ã??">
 <!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_key "C">
 <!ENTITY torbutton.context_menu.toggle "Torã?®ã?¹ã??ã?¼ã?¿ã?¹ã??å¤?æ?´">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "è¨å®?...">
+<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settingsâ?¦">
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Torbuttonã?«ã?¤ã??ã?¦...">
 <!ENTITY torbutton.context_menu.about.key "A">
-<!ENTITY torbutton.context_menu.networksettings "ã??ã??ã??ã?¯ã?¼ã?¯è¨å®?ã??é??ã??...">
+<!ENTITY torbutton.context_menu.networksettings "Tor Network Settingsâ?¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
-<!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser Bundleã?®ã?¢ã??ã??ã??ã?¼ã??ã??ã??ã?¦ã?³ã?ã?¼ã??">
+<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookieä¿?è·">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.context_menu.copyTor "Torã?®URLã??ã?³ã??ã?¼">
 <!ENTITY torbutton.context_menu.copyTor.key "p">
@@ -155,3 +157,4 @@
 <!ENTITY torbutton.prefs.sec_med_high "ä¸ã?®ä¸?">
 <!ENTITY torbutton.prefs.sec_high "é«?ã??">
 <!ENTITY torbutton.prefs.sec_custom "ã?«ã?¹ã?¿ã? å?¤">
+<!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/src/chrome/locale/ja/torbutton.properties b/src/chrome/locale/ja/torbutton.properties
index 4d10949..44c6155 100644
--- a/src/chrome/locale/ja/torbutton.properties
+++ b/src/chrome/locale/ja/torbutton.properties
@@ -1,5 +1,10 @@
 torbutton.button.tooltip.disabled = Torã??æ??å?¹ã?«ã??ã??
 torbutton.button.tooltip.enabled = Torã??ç?¡å?¹ã?«ã??ã??
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = IP unknown
+torbutton.circuit_display.this_browser = This browser
+torbutton.circuit_display.tor_bridge = Bridge
+torbutton.circuit_display.unknown_country = Unknown country
 torbutton.panel.tooltip.disabled = ã?¯ã?ªã??ã?¯ã??ã?¦Torã??æ??å?¹ã?«ã??ã??
 torbutton.panel.tooltip.enabled = ã?¯ã?ªã??ã?¯ã??ã?¦Torã??ç?¡å?¹ã?«ã??ã??
 torbutton.panel.plugins.disabled = ã??ã?©ã?°ã?¤ã?³ã??æ??å?¹ã?«ã??ã??
@@ -46,6 +51,7 @@ torbutton.popup.short_torbrowser = é??è¦?ã?ªTorbuttonã?®æ??å ±!\n\nTorbuttonã?¯
 
 torbutton.popup.confirm_plugins = Flashã?ªã?©ã?®ã??ã?©ã?°ã?¤ã?³ã?¯ã??ã?ªã??ã?®ã??ã?©ã?¤ã??ã?·ã?¼ã??å?¿å??æ?§ã??æ??ã?ªã??æ??ã??ã??ã??ã??ã?¾ã??ã?? \n\nã??ã??ã??ã?¯Torã??è¿?å??ã??ã??ã?ªã??ã?®ç?¾å?¨ã?®ä½?ç½®ã??IPã?¢ã??ã?¬ã?¹ã??æ¼?ã??ã??ã?¦ã??ã?¾ã??æ??ã??ã??ã??ã??ã?¾ã??ã??\n\næ?¬å½?ã?«ã??ã?©ã?°ã?¤ã?³ã??æ??å?¹ã?«ã??ã?¾ã??ã??ï¼?\n\n
 torbutton.popup.never_ask_again = æ¬¡ã??ã??ã?¯ã??ã??ã?ã?ªã??
+torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=ã??ã?®Webã?µã?¤ã??(%S)ã??HTML5 canvasç?»å??ã??ä½¿ç?¨ã??ã??ã??ã?¨ã??ã?¦ã??ã?¾ã??ã??ã??ã??ã?¯ã??ã?ªã??ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?¼ã??è?å?¥ã??ã??ã??ã??ã?«ä½¿ã??ã??ã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??ã??\n\nTor ã??ã?©ã?¦ã?¶ã?¼ã?«HTML5 canvasç?»å??ã?®ä½¿ç?¨ã??è¨±å?¯ã??ã?¾ã??ã??ï¼?
diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd
index 2817dd6..53f141e 100644
--- a/src/chrome/locale/ko/aboutTor.dtd
+++ b/src/chrome/locale/ko/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2015, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -8,7 +8,7 @@
 
 <!ENTITY aboutTor.outOfDateTorOn.label "ê·¸ë?¬ë??, ì?´ ë¸?ë?¼ì?°ì ?ê°? ì??ë?°ì?´í?¸ ë??ì§? ì??ì??ì?µë??ë?¤.">
 <!ENTITY aboutTor.outOfDateTorOff.label "ë??í??, ì?´ ë¸?ë?¼ì?°ì ?ê°? ì??ë?°ì?´í?¸ ë??ì§? ì??ì??ì?µë??ë?¤.">
-<!ENTITY aboutTor.outOfDate2.label "ì??í?? ëª¨ì??ì?? í?´ë¦í??ê³  Tor ë¸?ë?¼ì?°ì ? ë²?ë?¤ ì??ë?°ì?´í?¸ë¥¼ ë?¤ì?´ë¡?ë?? í?©ë??ë?¤.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update.">
 
 <!ENTITY aboutTor.check.label "Tor ë?¤í?¸ì??í?¬ ì?¤ì ? í??ì?¤í?¸">
 
@@ -25,6 +25,7 @@
 
 <!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&amp;location_option=US";>
 
 <!ENTITY aboutTor.torInfo1.label "ì¶?ê°? ì ?ë³´ :">
 <!ENTITY aboutTor.torInfo2.label "êµê°? &amp; IP ì£¼ì?? :">
diff --git a/src/chrome/locale/ko/brand.dtd b/src/chrome/locale/ko/brand.dtd
index 4b55e20..c7bdff6 100644
--- a/src/chrome/locale/ko/brand.dtd
+++ b/src/chrome/locale/ko/brand.dtd
@@ -6,3 +6,9 @@
 <!ENTITY  brandFullName         "Tor ë¸?ë?¼ì?°ì ?">
 <!ENTITY  vendorShortName       "Tor í??ë¡?ì ?í?¸">
 <!ENTITY  trademarkInfo.part1   "í??ì?´ì?´í?ì?¤ì?? í??ì?´ì?´í?ì?¤ ë¡?ê³ ë?¤ì?? ëª¨ì§?ë?¼ ì?¬ë?¨ì?? ë?±ë¡? ì??í??ì??ë??ë?¤.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Click to load installed system plugins">
+<!ENTITY plugins.installed.enable "Enable plugins">
+<!ENTITY plugins.installed.disable "Disable plugins">
+<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins">
diff --git a/src/chrome/locale/ko/browser.properties b/src/chrome/locale/ko/browser.properties
index a2b61b5..99872f4 100644
--- a/src/chrome/locale/ko/browser.properties
+++ b/src/chrome/locale/ko/browser.properties
@@ -3,11 +3,3 @@ browser.startup.homepage=Torì?? ê´?í??ì?¬
 
 # Spell checker dictionary
 spellchecker.dictionary=ì??ì?´-ë¯¸êµ
-
-# Default search engine
-browser.search.defaultenginename=ì??ì?? í??ì?´ì§?
-
-# Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=ì??ì?? í??ì?´ì§?
-browser.search.order.2=DuckDuckGo
-browser.search.order.3=êµ¬ê¸?
diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd
index 26023f7..9ef3362 100644
--- a/src/chrome/locale/ko/torbutton.dtd
+++ b/src/chrome/locale/ko/torbutton.dtd
@@ -24,17 +24,19 @@
 <!ENTITY torbutton.pref_connection_more_info.text "Torbuttonì?´ í??ì?¬ í??ì?±í??ë??ì??ì?µë??ë?¤. ë§?ì?½ Tor í??ë¡?ì??ê°? ì??ë?? ì?¼ë°? í??ë¡?ì?? ì??ë²? ì?¤ì ?ì?? í??ì??ë ¤ë©´, Torbuttonì?? ë¹?í??ì?±í??í??ê³  ì?´ ì°½ì?¼ë¡? ë??ì??ì?¤ì?ì??ì?¤. í?¹ì?? Tor í??ë¡?ì?? ì?¤ì ?ì?? ë°?ê¾¸ê³  ì?¶ì?¼ì??ë?¤ë©´, Torbutton ì?¤ì ? í??ë©´ì?? ì?¬ì?©í?´ ì£¼ì?¸ì??.">
 <!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_key "C">
 <!ENTITY torbutton.context_menu.toggle "Tor ì??ë?? ì??í??">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "ì?¤ì ?...">
+<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settingsâ?¦">
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Torbuttonì?? ë??í??ì?¬...">
 <!ENTITY torbutton.context_menu.about.key "A">
-<!ENTITY torbutton.context_menu.networksettings "ë?¤í?¸ì??í?¬ ì?¤ì ? ì?´ê¸°">
+<!ENTITY torbutton.context_menu.networksettings "Tor Network Settingsâ?¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
-<!ENTITY torbutton.context_menu.downloadUpdate "Tor browser bundle ì??ë?°ì?´í?¸ ë?¤ì?´ë¡?ë??">
+<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "ì¿ í?¤ ë³´í?¸">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.context_menu.copyTor "Tor URL ë³µì?¬">
 <!ENTITY torbutton.context_menu.copyTor.key "P">
@@ -155,3 +157,4 @@
 <!ENTITY torbutton.prefs.sec_med_high "ì¤?ê°? ë??ì??">
 <!ENTITY torbutton.prefs.sec_high "ë??ì??">
 <!ENTITY torbutton.prefs.sec_custom "ë§?ì¶¤ ê°?">
+<!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/src/chrome/locale/ko/torbutton.properties b/src/chrome/locale/ko/torbutton.properties
index 03ce18a..2a72a99 100644
--- a/src/chrome/locale/ko/torbutton.properties
+++ b/src/chrome/locale/ko/torbutton.properties
@@ -1,5 +1,10 @@
 torbutton.button.tooltip.disabled = Tor í??ì?±í??
 torbutton.button.tooltip.enabled = Tor ë¹?í??ì?±í??
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = IP unknown
+torbutton.circuit_display.this_browser = This browser
+torbutton.circuit_display.tor_bridge = Bridge
+torbutton.circuit_display.unknown_country = Unknown country
 torbutton.panel.tooltip.disabled = Torë¥¼ í??ì?±í??í??ë ¤ë©´ í?´ë¦
 torbutton.panel.tooltip.enabled = Torë¥¼ ë¹?í??ì?±í??í??ë ¤ë©´ í?´ë¦
 torbutton.panel.plugins.disabled = í??ë?¬ê·¸ì?¸ì?? í??ì?±í??í??ë ¤ë©´ í?´ë¦
@@ -46,6 +51,7 @@ torbutton.popup.short_torbrowser = ì¤?ì??í?? Torbutton ì ?ë³´! Torbuttonì?? ì?´
 
 torbutton.popup.confirm_plugins = í??ë??ì??ì?? ê°?ì?? í??ë?¬ê·¸ì?¸ë?¤ì?? ë?¹ì? ì?? í??ë?¼ì?´ë²?ì??ì?? ì?µëª?ì?±ì?? í?´ì¹  ì?? ì??ì?µë??ë?¤.\n\në??í?? Torì?? ì?°í??í??ì?¬ ë?¹ì? ì?? í??ì?¬ ì??ì¹?ì?? IPì£¼ì??ë¥¼ ë?¸ì¶?ì??í?¬ ì??ë?? ì??ì?µë??ë?¤.\n\nì ?ë§?ë¡? í??ë?¬ê·¸ì?¸ì?? í??ì?©í??ì??ê² ì?µë??ê¹??\n\n
 torbutton.popup.never_ask_again = ë?¤ì??ë?? ë¬¼ì?´ë³´ì§? ì??ê¸°
+torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
diff --git a/src/chrome/locale/nl/aboutTor.dtd b/src/chrome/locale/nl/aboutTor.dtd
index 980ac35..6e92558 100644
--- a/src/chrome/locale/nl/aboutTor.dtd
+++ b/src/chrome/locale/nl/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2015, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -8,9 +8,9 @@
 
 <!ENTITY aboutTor.outOfDateTorOn.label "ECHTER, deze browser is verouderd.">
 <!ENTITY aboutTor.outOfDateTorOff.label "BOVENDIEN is deze browser verouderd.">
-<!ENTITY aboutTor.outOfDate2.label "Click op de ui en kies Download Tor Browser Pakket Update.">
+<!ENTITY aboutTor.outOfDate2.label "Klik op de ui en kies Controleer op Tor Browser Update">
 
-<!ENTITY aboutTor.check.label "Test Tor Netwerk Instellingen">
+<!ENTITY aboutTor.check.label "Test Tor Netwerkinstellingen">
 
 <!ENTITY aboutTor.success.label "Gefeliciteerd!">
 <!ENTITY aboutTor.success2.label "Deze browser is ingesteld om Tor te gebruiken.">
@@ -25,22 +25,23 @@
 
 <!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&amp;location_option=NL";>
 
 <!ENTITY aboutTor.torInfo1.label "Bijkomende informatie:">
-<!ENTITY aboutTor.torInfo2.label "Land &amp; IP Adres:">
+<!ENTITY aboutTor.torInfo2.label "Land &amp; IP-adres:">
 <!ENTITY aboutTor.torInfo3.label "Exit Node:">
 <!ENTITY aboutTor.torInfo4.label "Deze server logt geen enkele informatie over bezoekers.">
 <!ENTITY aboutTor.whatnextQuestion.label "Wat nu?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor is NIET alles wat u nodig heeft om anoniem te kunnen browsen. Mogelijk is het nodig dat u bepaalde browsing-gewoontes veranderen om te vezekeren dat uw identiteit veilig blijft.">
+<!ENTITY aboutTor.whatnextAnswer.label "Tor is NIET alles wat je nodig hebt om anoniem te kunnen browsen. Mogelijk is het nodig dat je bepaalde browsing-gewoontes veranderen om te verzekeren dat je identiteit veilig blijft.">
 <!ENTITY aboutTor.whatnext.label "Tips om anoniem te blijven Â»">
 <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
 <!ENTITY aboutTor.helpInfo1.label "Jij kan helpen!">
 <!ENTITY aboutTor.helpInfo2.label "Er zijn veel verschillende manieren hoe jij kan helpen het Tor Netwerk sneller en sterker te maken:">
 <!ENTITY aboutTor.helpInfo3.label "Draai een Tor Relay Node Â»">
 <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Wordt vrijwilliger">
+<!ENTITY aboutTor.helpInfo4.label "Word vrijwilliger">
 <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Doe een donatie Â»">
+<!ENTITY aboutTor.helpInfo5.label "Maak een donatie Â»">
 <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
 
 <!ENTITY aboutTor.footer.label "Het Tor Project is een US 501(c)(3) non-profit voor onderzoek, ontwikkeling, onderwijs in online anonimiteit en privacy.">
diff --git a/src/chrome/locale/nl/brand.dtd b/src/chrome/locale/nl/brand.dtd
index af3e58a..bdd9afb 100644
--- a/src/chrome/locale/nl/brand.dtd
+++ b/src/chrome/locale/nl/brand.dtd
@@ -6,3 +6,9 @@
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
 <!ENTITY  trademarkInfo.part1   "Firefox and het Firefox logo zijn handelsmerken van de Mozilla Foundation.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Klok om de geÃ¯nstalleerde systeem plugins te laden">
+<!ENTITY plugins.installed.enable "Zet de plugins aan">
+<!ENTITY plugins.installed.disable "Zet de plugins uit">
+<!ENTITY plugins.installed.disable.tip "Klik om het laden van systeem plugins te voorkomen">
diff --git a/src/chrome/locale/nl/browser.properties b/src/chrome/locale/nl/browser.properties
index 8196ec1..8849b67 100644
--- a/src/chrome/locale/nl/browser.properties
+++ b/src/chrome/locale/nl/browser.properties
@@ -3,11 +3,3 @@ browser.startup.homepage=about:tor
 
 # Spell checker dictionary
 spellchecker.dictionary=en_US
-
-# Default search engine
-browser.search.defaultenginename=Startpage
-
-# Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Startpage
-browser.search.order.2=Startpage
-browser.search.order.3=Startpage
diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd
index c963be5..4e48991 100644
--- a/src/chrome/locale/nl/torbutton.dtd
+++ b/src/chrome/locale/nl/torbutton.dtd
@@ -24,17 +24,19 @@
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is momenteel ingeschakeld. Als u uw niet aan Tor gerelateerde proxy-instellingen wilt wijzigen dient u Torbutton uit te schakelen en dan hier terug te komen. Als u uw Tor instellingen wilt wijzigen, gebruik dan het Torbutton Voorkeuren-venster.">
 <!ENTITY torbutton.context_menu.new_identity "Nieuwe identiteit">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
+<!ENTITY torbutton.context_menu.new_circuit "Nieuw tor circuit voor deze website">
+<!ENTITY torbutton.context_menu.new_circuit_key "C">
 <!ENTITY torbutton.context_menu.toggle "Tor status wisselen">
 <!ENTITY torbutton.context_menu.toggle.key "W">
-<!ENTITY torbutton.context_menu.preferences "Voorkeuren...">
+<!ENTITY torbutton.context_menu.preferences "Privacy en beveiliging instellingen...">
 <!ENTITY torbutton.context_menu.preferences.key "V">
 <!ENTITY torbutton.context_menu.about "Over Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "O">
-<!ENTITY torbutton.context_menu.networksettings "Open netwerkinstellingen">
+<!ENTITY torbutton.context_menu.networksettings "Tor netwerk instellingen">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
-<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle update...">
+<!ENTITY torbutton.context_menu.downloadUpdate "Controleer op updates voor de Tor Browser...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie Beveiligingen">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie beveiligingen...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.context_menu.copyTor "Kopieer Tor URL">
 <!ENTITY torbutton.context_menu.copyTor.key "P">
@@ -155,3 +157,4 @@
 <!ENTITY torbutton.prefs.sec_med_high "Medium-Hoog">
 <!ENTITY torbutton.prefs.sec_high "Hoog">
 <!ENTITY torbutton.prefs.sec_custom "Aangepaste waarden">
+<!ENTITY torbutton.circuit_display.title "Tor circuit voor deze website">
diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties
index c2e105d..4e24acf 100644
--- a/src/chrome/locale/nl/torbutton.properties
+++ b/src/chrome/locale/nl/torbutton.properties
@@ -1,5 +1,10 @@
 torbutton.button.tooltip.disabled = Tor inschakelen
 torbutton.button.tooltip.enabled = Tor uitschakelen
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = Onbekend IP adres
+torbutton.circuit_display.this_browser = Deze browser
+torbutton.circuit_display.tor_bridge = Bridge
+torbutton.circuit_display.unknown_country = Onbekend land
 torbutton.panel.tooltip.disabled = Hier klikken om Tor in te schakelen
 torbutton.panel.tooltip.enabled = Hier klikken om Tor uit te schakelen
 torbutton.panel.plugins.disabled = Hier klikken om plugins in te schakelen
@@ -46,6 +51,7 @@ torbutton.popup.short_torbrowser = Belangrijke Torbutton Informatie!\n\nTorbutte
 
 torbutton.popup.confirm_plugins = plug-ins zoals flash kunnen u privacy en anonimiteit schaden.â?? â?? Ze kunnen ook tor negeren om zo u huidige locatie en IP adres uit te vindenâ?? â?? Weet u zeker dat u deze plug-ins wilt inschakelen?â?? \n\n
 torbutton.popup.never_ask_again = Vraag me dit nooit meer.
+torbutton.popup.confirm_newnym = De Tor Browser zal alle windows en tabs sluiten. Alle website sessies zullen verloren gaan.\n\nHerstart de Tor Browser om je identiteit te resetten?\n\n
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=De website (%S) heeft geprobeerd HTML5 canvas image data op te vragen, wat kan gebruikt worden voor een unieke identificatie van je computer.\n\nMoet Tor Browser deze website toestaan om HTML5 canvas image data op te vragen?
diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd
index 654dc58..d3a938d 100644
--- a/src/chrome/locale/pl/aboutTor.dtd
+++ b/src/chrome/locale/pl/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2015, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -8,7 +8,7 @@
 
 <!ENTITY aboutTor.outOfDateTorOn.label "JEDNAK, ta przeglÄ?darka jest nieaktualna.">
 <!ENTITY aboutTor.outOfDateTorOff.label "PONADTO, ta przeglÄ?darka jest nieaktualna.">
-<!ENTITY aboutTor.outOfDate2.label "Kliknij na cebulÄ?, a nastÄ?pnie wybierz Pobierz aktualizacjÄ? Tor Browser Bundle.">
+<!ENTITY aboutTor.outOfDate2.label "Kliknij na cebulÄ? a nastÄ?pnie wybierz SprawdÅº czy sÄ? dostÄ?pne aktualizacje.">
 
 <!ENTITY aboutTor.check.label "Przetestuj Ustawienia Sieci Tor">
 
@@ -25,6 +25,7 @@
 
 <!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&amp;location_option=US";>
 
 <!ENTITY aboutTor.torInfo1.label "Dodatkowe informacje:">
 <!ENTITY aboutTor.torInfo2.label "Kraj i adres IP:">
diff --git a/src/chrome/locale/pl/brand.dtd b/src/chrome/locale/pl/brand.dtd
index 5f8db34..f325478 100644
--- a/src/chrome/locale/pl/brand.dtd
+++ b/src/chrome/locale/pl/brand.dtd
@@ -6,3 +6,9 @@
 <!ENTITY  brandFullName         "PrzeglÄ?darka Tor">
 <!ENTITY  vendorShortName       "Project Tor">
 <!ENTITY  trademarkInfo.part1   "Firefox i jego loga sÄ? znakami towarowymi Mozilla Foundation.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Kliknij, aby zaÅ?adowaÄ? wszystkie zainstalowane wtyczki">
+<!ENTITY plugins.installed.enable "WÅ?Ä?cz wtyczki">
+<!ENTITY plugins.installed.disable "WyÅ?Ä?cz wtyczki">
+<!ENTITY plugins.installed.disable.tip "Kliknij, aby zapobiec wÅ?Ä?czaniu wtyczek systemowych.">
diff --git a/src/chrome/locale/pl/browser.properties b/src/chrome/locale/pl/browser.properties
index 9d1593f..8849b67 100644
--- a/src/chrome/locale/pl/browser.properties
+++ b/src/chrome/locale/pl/browser.properties
@@ -3,11 +3,3 @@ browser.startup.homepage=about:tor
 
 # Spell checker dictionary
 spellchecker.dictionary=en_US
-
-# Default search engine
-browser.search.defaultenginename=Strona startowa
-
-# Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Strona startowa
-browser.search.order.2=DuckDuckGo
-browser.search.order.3=Google
diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd
index 5cfb5ef..0e16322 100644
--- a/src/chrome/locale/pl/torbutton.dtd
+++ b/src/chrome/locale/pl/torbutton.dtd
@@ -24,17 +24,19 @@
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton jest wÅ?Ä?czony. JeÅ?li chcesz zmieniÄ? inne ustawienia proxy musisz wyÅ?Ä?czyÄ? Torbutton i powrÃ³ciÄ? tutaj. JeÅ?li chcesz zmieniÄ? ustawienia proxy Tor, zrÃ³b to tutaj.">
 <!ENTITY torbutton.context_menu.new_identity "Nowa ToÅ¼samoÅ?Ä?">
 <!ENTITY torbutton.context_menu.new_identity_key "o">
+<!ENTITY torbutton.context_menu.new_circuit "Nowy obwÃ³d dla tej strony">
+<!ENTITY torbutton.context_menu.new_circuit_key "c">
 <!ENTITY torbutton.context_menu.toggle "ZmieÅ? status Tora">
 <!ENTITY torbutton.context_menu.toggle.key "Z">
-<!ENTITY torbutton.context_menu.preferences "Ustawienia">
+<!ENTITY torbutton.context_menu.preferences "Ustawienia PrywatnoÅ?ci i BezpieczeÅ?stwa...">
 <!ENTITY torbutton.context_menu.preferences.key "U">
 <!ENTITY torbutton.context_menu.about "O Torbutton">
 <!ENTITY torbutton.context_menu.about.key "T">
-<!ENTITY torbutton.context_menu.networksettings "OtwÃ³rz ustawienia sieci...">
+<!ENTITY torbutton.context_menu.networksettings "Ustawienia Sieci Tor...">
 <!ENTITY torbutton.context_menu.networksettings.key "s">
-<!ENTITY torbutton.context_menu.downloadUpdate "Pobierz aktualizacjÄ? Paczki Tora z PrzeglÄ?darkÄ?">
+<!ENTITY torbutton.context_menu.downloadUpdate "SprawdÅº czy sÄ? aktualizacje Tor Browser...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "u">
-<!ENTITY torbutton.context_menu.cookieProtections "Ochrona Ciasteczek">
+<!ENTITY torbutton.context_menu.cookieProtections "Ochrona plikÃ³w cookie...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "c">
 <!ENTITY torbutton.context_menu.copyTor "Kopiuj URL Tora">
 <!ENTITY torbutton.context_menu.copyTor.key "p">
@@ -155,3 +157,4 @@
 <!ENTITY torbutton.prefs.sec_med_high "Å?redni-Wysoki">
 <!ENTITY torbutton.prefs.sec_high "Wysoki">
 <!ENTITY torbutton.prefs.sec_custom "WartoÅ?ci niestandardowe">
+<!ENTITY torbutton.circuit_display.title "ObwÃ³d Tor dla tej strony">
diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties
index 2b78918..f267dbe 100644
--- a/src/chrome/locale/pl/torbutton.properties
+++ b/src/chrome/locale/pl/torbutton.properties
@@ -1,5 +1,10 @@
 torbutton.button.tooltip.disabled = WÅ?Ä?cz Tora
 torbutton.button.tooltip.enabled = WyÅ?Ä?cz Tora
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = IP nieznany
+torbutton.circuit_display.this_browser = Ta przeglÄ?darka
+torbutton.circuit_display.tor_bridge = Bridge
+torbutton.circuit_display.unknown_country = Nieznane paÅ?stwo
 torbutton.panel.tooltip.disabled = Kliknij tutaj, aby wÅ?Ä?czyÄ? Tora
 torbutton.panel.tooltip.enabled = Kliknij tutaj, aby wyÅ?Ä?czyÄ? Tora
 torbutton.panel.plugins.disabled = Kliknij aby wÅ?Ä?czyÄ? wtyczki
@@ -46,6 +51,7 @@ torbutton.popup.short_torbrowser = WaÅ¼ne informacje o Torbuttonie!\n\nTorbutton
 
 torbutton.popup.confirm_plugins = Wtyczki takie jak Flash mogÄ? szkodziÄ? Twojej prywatnoÅ?ci i anonimowoÅ?ci.\n\nMogÄ? teÅ¼ omijaÄ? Tora, aby odkryÄ? TwojÄ? bieÅ¼Ä?cÄ? lokalizacjÄ? i adres IP.\n\nCzy na pewno chcesz wÅ?Ä?czyÄ? wtyczki?\n\n
 torbutton.popup.never_ask_again = Nie pytaj mnie wiÄ?cej
+torbutton.popup.confirm_newnym = Tor Browser zamknie wszystkie otwarte okna i karty. Wszystkie sesje zostanÄ? utracone.\n\nCzy chcesz zrestartowaÄ? Tor Browser teraz, aby zmieniÄ? toÅ¼samoÅ?Ä??\n\n
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=Ta strona internetowa (%S) prÃ³bowaÅ?a wydobyÄ? HTML5 canvas danych obrazu, ktÃ³re mogÄ? byÄ? wykorzystane w celu identyfikacji Twojego komputera.\n\nCzy chcesz, aby Tor Browser pozwoliÅ? tej stronie na wydobycie danych obrazu HTML5 canvas?
diff --git a/src/chrome/locale/pt/aboutTor.dtd b/src/chrome/locale/pt/aboutTor.dtd
index fd5cea7..3ad709e 100644
--- a/src/chrome/locale/pt/aboutTor.dtd
+++ b/src/chrome/locale/pt/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2015, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -8,7 +8,7 @@
 
 <!ENTITY aboutTor.outOfDateTorOn.label "CONTUDO, este navegador estÃ¡ desatualizado.">
 <!ENTITY aboutTor.outOfDateTorOff.label "TAMBÃ?M, este navegador estÃ¡ desatualizado.">
-<!ENTITY aboutTor.outOfDate2.label "Clique no sÃmbolo da cebola e escolha Download Tor Browser Bundle Update.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update.">
 
 <!ENTITY aboutTor.check.label "Testar as DefiniÃ§Ãµes da Rede Tor">
 
@@ -25,6 +25,7 @@
 
 <!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&amp;location_option=US";>
 
 <!ENTITY aboutTor.torInfo1.label "InformaÃ§Ã£o adicional:">
 <!ENTITY aboutTor.torInfo2.label "PaÃs e endereÃ§o IP:">
diff --git a/src/chrome/locale/pt/brand.dtd b/src/chrome/locale/pt/brand.dtd
index 95bd25c..2969197 100644
--- a/src/chrome/locale/pt/brand.dtd
+++ b/src/chrome/locale/pt/brand.dtd
@@ -6,3 +6,9 @@
 <!ENTITY  brandFullName         "Navegador Tor">
 <!ENTITY  vendorShortName       "Projeto Tor">
 <!ENTITY  trademarkInfo.part1   "O Firefox e os logos 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 "Click to load installed system plugins">
+<!ENTITY plugins.installed.enable "Enable plugins">
+<!ENTITY plugins.installed.disable "Disable plugins">
+<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins">
diff --git a/src/chrome/locale/pt/browser.properties b/src/chrome/locale/pt/browser.properties
index 57324c5..8849b67 100644
--- a/src/chrome/locale/pt/browser.properties
+++ b/src/chrome/locale/pt/browser.properties
@@ -3,11 +3,3 @@ browser.startup.homepage=about:tor
 
 # Spell checker dictionary
 spellchecker.dictionary=en_US
-
-# Default search engine
-browser.search.defaultenginename=PÃ¡gina inicial
-
-# Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=PÃ¡gina inicial
-browser.search.order.2=DuckDuckGo
-browser.search.order.3=Google
diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd
index d2b83a9..b7cc81c 100644
--- a/src/chrome/locale/pt/torbutton.dtd
+++ b/src/chrome/locale/pt/torbutton.dtd
@@ -24,17 +24,19 @@
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton estÃ¡ activo. Se deseja mudar as configuraÃ§Ãµes de Proxy que nÃ£o sejam do Tor, por favor desactive o Torbutton e volte aqui. Se deseja alterar as configuraÃ§Ãµes do Tor, por favor, use a janela de preferÃªncias do Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Identidade Nova">
 <!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_key "C">
 <!ENTITY torbutton.context_menu.toggle "Alterar Status Tor">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "PreferÃªncias...">
+<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settingsâ?¦">
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Sobre o Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
-<!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
+<!ENTITY torbutton.context_menu.networksettings "Tor Network Settingsâ?¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
-<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
-<!ENTITY torbutton.context_menu.cookieProtections "ProteÃ§Ãµes de Cookies">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.context_menu.copyTor "Copiar endereÃ§o do Tor">
 <!ENTITY torbutton.context_menu.copyTor.key "P">
@@ -155,3 +157,4 @@
 <!ENTITY torbutton.prefs.sec_med_high "MÃ©dio-Alto">
 <!ENTITY torbutton.prefs.sec_high "Alto">
 <!ENTITY torbutton.prefs.sec_custom "Valores definidos">
+<!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/src/chrome/locale/pt/torbutton.properties b/src/chrome/locale/pt/torbutton.properties
index 4c920a3..3130115 100644
--- a/src/chrome/locale/pt/torbutton.properties
+++ b/src/chrome/locale/pt/torbutton.properties
@@ -1,5 +1,10 @@
 torbutton.button.tooltip.disabled = Activar Tor
 torbutton.button.tooltip.enabled = Desactivar Tor
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = IP unknown
+torbutton.circuit_display.this_browser = This browser
+torbutton.circuit_display.tor_bridge = Bridge
+torbutton.circuit_display.unknown_country = Unknown country
 torbutton.panel.tooltip.disabled = Clique para activar Tor
 torbutton.panel.tooltip.enabled = Clique para desactivar Tor
 torbutton.panel.plugins.disabled = Clique para activar plugins
@@ -46,6 +51,7 @@ torbutton.popup.short_torbrowser = InformaÃ§Ã£o importante do Torbutton!\nO Torb
 
 torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
 torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n
 
 # 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/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd
index efe3ff1..c1cdf4c 100644
--- a/src/chrome/locale/ru/aboutTor.dtd
+++ b/src/chrome/locale/ru/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2015, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -8,7 +8,7 @@
 
 <!ENTITY aboutTor.outOfDateTorOn.label "Ð¢Ð?Ð? Ð?Ð? Ð?Ð?Ð?Ð?Ð?, Ð´Ð°Ð½Ð½Ñ?Ð¹ Ð±Ñ?Ð°Ñ?Ð·ÐµÑ? Ñ?Ñ?Ñ?Ð°Ñ?ÐµÐ».">
 <!ENTITY aboutTor.outOfDateTorOff.label "Ð?Ð Ð?Ð?Ð? Ð¢Ð?Ð?Ð?, Ð´Ð°Ð½Ð½Ñ?Ð¹ Ð±Ñ?Ð°Ñ?Ð·ÐµÑ? Ñ?Ñ?Ñ?Ð°Ñ?ÐµÐ».">
-<!ENTITY aboutTor.outOfDate2.label "Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð¿Ð¾ Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ? Ð»Ñ?ÐºÐ° Ð¸ Ð²Ñ?Ð±Ð¸Ñ?Ð¸Ñ?Ðµ Ð?Ð°Ð³Ñ?Ñ?Ð·Ð¸Ñ?Ñ? Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð°ÐºÐµÑ?Ð° Tor Ð´Ð»Ñ? Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð°.">
+<!ENTITY aboutTor.outOfDate2.label "Ð?Ð°Ð¶Ð¼Ð¸Ñ?Ðµ Ð½Ð° &quot;Ð»Ñ?Ðº&quot;Ð¸ Ð·Ð°Ñ?ÐµÐ¼ Ð²Ñ?Ð±ÐµÑ?Ð¸Ñ?Ðµ &quot;Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ñ? Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ? Tor Browser&quot;">
 
 <!ENTITY aboutTor.check.label "Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ð½Ð°Ñ?Ñ?Ñ?Ð¾ÐµÐº Tor">
 
@@ -25,6 +25,7 @@
 
 <!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&amp;location_option=US";>
 
 <!ENTITY aboutTor.torInfo1.label "Ð?Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ðµ Ñ?Ð²ÐµÐ´ÐµÐ½Ð¸Ñ?:">
 <!ENTITY aboutTor.torInfo2.label "Ð¡Ñ?Ñ?Ð°Ð½Ð° &amp; IP-Ð°Ð´Ñ?ÐµÑ?">
diff --git a/src/chrome/locale/ru/brand.dtd b/src/chrome/locale/ru/brand.dtd
index 043e478..dff02f0 100644
--- a/src/chrome/locale/ru/brand.dtd
+++ b/src/chrome/locale/ru/brand.dtd
@@ -6,3 +6,9 @@
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Ð?Ñ?Ð¾ÐµÐºÑ? Tor">
 <!ENTITY  trademarkInfo.part1   "Firefox Ð¸ ÐµÐ³Ð¾ Ð»Ð¾Ð³Ð¾Ñ?Ð¸Ð¿Ñ? Ñ?Ñ?Ð¾ Ñ?Ð¾Ñ?Ð³Ð¾Ð²Ñ?Ðµ Ð·Ð½Ð°ÐºÐ¸ Mozilla Foundation.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Click to load installed system plugins">
+<!ENTITY plugins.installed.enable "Enable plugins">
+<!ENTITY plugins.installed.disable "Disable plugins">
+<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins">
diff --git a/src/chrome/locale/ru/browser.properties b/src/chrome/locale/ru/browser.properties
index e34fcba..8849b67 100644
--- a/src/chrome/locale/ru/browser.properties
+++ b/src/chrome/locale/ru/browser.properties
@@ -3,11 +3,3 @@ browser.startup.homepage=about:tor
 
 # Spell checker dictionary
 spellchecker.dictionary=en_US
-
-# Default search engine
-browser.search.defaultenginename=Ð?Ð°Ñ?Ð°Ð»Ñ?Ð½Ð°Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð°
-
-# Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Ð?Ð°Ñ?Ð°Ð»Ñ?Ð½Ð°Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð°
-browser.search.order.2=DuckDuckGo
-browser.search.order.3=Google
diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd
index 3bc9df2..760ce93 100644
--- a/src/chrome/locale/ru/torbutton.dtd
+++ b/src/chrome/locale/ru/torbutton.dtd
@@ -24,17 +24,19 @@
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton Ð²ÐºÐ»Ñ?Ñ?ÐµÐ½.  Ð?Ñ?Ð»Ð¸ Ð±Ñ?Ð´Ñ?Ñ? Ð¸Ð·Ð¼ÐµÐ½Ñ?Ñ?Ñ?Ñ?Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð¿Ñ?Ð¾ÐºÑ?Ð¸, Ð½Ðµ Ñ?Ð²Ð»Ñ?Ñ?Ñ?ÐµÐ³Ð¾Ñ?Ñ? Ñ?Ð°Ñ?Ñ?Ñ?Ñ? Ñ?ÐµÑ?Ð¸ Tor, Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾ Ñ?Ð½Ð°Ñ?Ð°Ð»Ð° Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Torbutton Ð¸ Ð·Ð°Ñ?ÐµÐ¼ Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?Ð´Ð°.  Ð?Ñ?Ð»Ð¸ Ð±Ñ?Ð´Ñ?Ñ? Ð¸Ð·Ð¼ÐµÐ½Ñ?Ñ?Ñ?Ñ?Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Tor, Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾ Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Ð¾ÐºÐ½Ð¾ Ð½Ð°Ñ?Ñ?Ñ?Ð¾ÐµÐº Torbutton.">
 <!ENTITY torbutton.context_menu.new_identity "Ð?Ð¾Ð²Ð°Ñ? Ð»Ð¸Ñ?Ð½Ð¾Ñ?Ñ?Ñ?">
 <!ENTITY torbutton.context_menu.new_identity_key "Ð¯">
+<!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
+<!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 "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸...">
+<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settingsâ?¦">
 <!ENTITY torbutton.context_menu.preferences.key "Ð?">
 <!ENTITY torbutton.context_menu.about "Ð? Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "Ð?">
-<!ENTITY torbutton.context_menu.networksettings "Ð?Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ð¡ÐµÑ?ÐµÐ²Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸...">
+<!ENTITY torbutton.context_menu.networksettings "Tor Network Settingsâ?¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
-<!ENTITY torbutton.context_menu.downloadUpdate "Ð¡ÐºÐ°Ñ?Ð°Ñ?Ñ? Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ? Tor Browser Bundle">
+<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "Ð?Ð°Ñ?Ð¸Ñ?Ð° Cookie">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.context_menu.copyTor "Ð?Ð¾Ð¿Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? URL Tor">
 <!ENTITY torbutton.context_menu.copyTor.key "p">
@@ -155,3 +157,4 @@
 <!ENTITY torbutton.prefs.sec_med_high "Ð¡Ñ?ÐµÐ´Ð½Ðµ-Ð?Ñ?Ñ?Ð¾ÐºÐ¸Ð¹">
 <!ENTITY torbutton.prefs.sec_high "Ð?Ñ?Ñ?Ð¾ÐºÐ¸Ð¹">
 <!ENTITY torbutton.prefs.sec_custom "Ð¡Ð¾Ð±Ñ?Ñ?Ð²ÐµÐ½Ð½Ñ?Ðµ Ð?Ð½Ð°Ñ?ÐµÐ½Ð¸Ñ?">
+<!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties
index ae55102..33ced7f 100644
--- a/src/chrome/locale/ru/torbutton.properties
+++ b/src/chrome/locale/ru/torbutton.properties
@@ -1,5 +1,10 @@
 torbutton.button.tooltip.disabled = Ð?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Tor
 torbutton.button.tooltip.enabled = Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Tor
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = IP unknown
+torbutton.circuit_display.this_browser = This browser
+torbutton.circuit_display.tor_bridge = Bridge
+torbutton.circuit_display.unknown_country = Unknown country
 torbutton.panel.tooltip.disabled = Ð?Ð°Ð¶Ð¼Ð¸Ñ?Ðµ, Ñ?Ñ?Ð¾Ð±Ñ? Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Tor
 torbutton.panel.tooltip.enabled = Ð?Ð°Ð¶Ð¼Ð¸Ñ?Ðµ, Ñ?Ñ?Ð¾Ð±Ñ? Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Tor
 torbutton.panel.plugins.disabled = Ð?Ð°Ð¶Ð¼Ð¸Ñ?Ðµ, Ñ?Ñ?Ð¾Ð±Ñ? Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¿Ð»Ð°Ð³Ð¸Ð½Ñ?
@@ -46,6 +51,7 @@ torbutton.popup.short_torbrowser = Ð?Ð°Ð¶Ð½Ð°Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ? Torbutton!
 
 torbutton.popup.confirm_plugins = Ð?Ð»Ð°Ð³Ð¸Ð½Ñ? Ð²Ñ?Ð¾Ð´Ðµ Flash Ð¼Ð¾Ð³Ñ?Ñ? Ð½Ð°Ð½ÐµÑ?Ñ?Ð¸ Ð²Ñ?ÐµÐ´ Ð²Ð°Ñ?ÐµÐ¹ ÐºÐ¾Ð½Ñ?Ð¸Ð´ÐµÐ½Ñ?Ð¸Ð°Ð»Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Ð¸ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾Ñ?Ñ?Ð¸.\nÐ?Ð½Ð¸ Ñ?Ð°ÐºÐ¶Ðµ Ð¼Ð¾Ð³Ñ?Ñ? Ð¾Ð±Ñ?Ð¾Ð´Ð¸Ñ?Ñ? Tor, Ñ?Ñ?Ð¾Ð±Ñ? Ñ?Ð°Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ð²Ð°Ñ?Ðµ Ñ?ÐµÐºÑ?Ñ?ÐµÐµ Ð¼ÐµÑ?Ñ?Ð¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð¸ IP-Ð°Ð´Ñ?ÐµÑ?.\nÐ?Ñ? Ñ?Ð²ÐµÑ?ÐµÐ½Ñ?, Ñ?Ñ?Ð¾ Ñ?Ð¾Ñ?Ð¸Ñ?Ðµ Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¿Ð»Ð°Ð³Ð¸Ð½Ñ??\n
 torbutton.popup.never_ask_again = Ð?Ð¾Ð»Ñ?Ñ?Ðµ Ð½Ðµ Ñ?Ð¿Ñ?Ð°Ñ?Ð¸Ð²Ð°Ñ?Ñ?
+torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=ÐÑ?Ð¾Ñ? Ð²ÐµÐ±-Ñ?Ð°Ð¹Ñ? (%S) Ð¿Ñ?Ñ?Ð°ÐµÑ?Ñ?Ñ? Ð¸Ð·Ð²Ð»ÐµÑ?Ñ? Ð´Ð°Ð½Ð½Ñ?Ðµ Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ? HTML5 canvas, Ñ?Ñ?Ð¾ Ð¼Ð¾Ð¶ÐµÑ? Ð±Ñ?Ñ?Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¾ Ð´Ð»Ñ? Ð¿Ð¾Ð»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ð¸ Ð¾ Ð²Ð°Ñ?ÐµÐ¼ ÐºÐ¾Ð¼Ð¿Ñ?Ñ?Ñ?ÐµÑ?Ðµ.\n\nÐ?Ð¾Ð»Ð¶ÐµÐ½ Ð»Ð¸ Tor Browser Ñ?Ð°Ð·Ñ?ÐµÑ?Ð¸Ñ?Ñ? Ñ?Ñ?Ð¾Ð¼Ñ? Ñ?Ð°Ð¹Ñ?Ñ? Ð¸Ð·Ð²Ð»ÐµÑ?Ñ? Ð´Ð°Ð½Ð½Ñ?Ðµ Ð¸Ð·Ð¾Ð±Ñ?Ð°Ð¶ÐµÐ½Ð¸Ñ? HTML5 canvas?
diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd
index 7fd6957..5b454fb 100644
--- a/src/chrome/locale/sv/aboutTor.dtd
+++ b/src/chrome/locale/sv/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2015, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -8,7 +8,7 @@
 
 <!ENTITY aboutTor.outOfDateTorOn.label "EMELLERTID, denna webblÃ¤sare Ã¤r ej uppdaterad.">
 <!ENTITY aboutTor.outOfDateTorOff.label "DESSUTOM, denna webblÃ¤sare Ã¤r ej uppdaterad.">
-<!ENTITY aboutTor.outOfDate2.label "Klicka pÃ¥ lÃ¶ken och vÃ¤lj sedan Ladda ner uppdatering fÃ¶r Tor Browser Bundle.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update.">
 
 <!ENTITY aboutTor.check.label "Testa nÃ¤tverksinstÃ¤llningarna fÃ¶r Tor">
 
@@ -25,6 +25,7 @@
 
 <!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&amp;location_option=US";>
 
 <!ENTITY aboutTor.torInfo1.label "Ytterligare information:">
 <!ENTITY aboutTor.torInfo2.label "Land och IP-adress:">
diff --git a/src/chrome/locale/sv/brand.dtd b/src/chrome/locale/sv/brand.dtd
index 312a603..83a75a4 100644
--- a/src/chrome/locale/sv/brand.dtd
+++ b/src/chrome/locale/sv/brand.dtd
@@ -6,3 +6,9 @@
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor-projektet">
 <!ENTITY  trademarkInfo.part1   "Firefox och Firefox-logotypen Ã¤r varumÃ¤rken som tillhÃ¶r Mozilla Foundation.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Click to load installed system plugins">
+<!ENTITY plugins.installed.enable "Enable plugins">
+<!ENTITY plugins.installed.disable "Disable plugins">
+<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins">
diff --git a/src/chrome/locale/sv/browser.properties b/src/chrome/locale/sv/browser.properties
index cade860..6542522 100644
--- a/src/chrome/locale/sv/browser.properties
+++ b/src/chrome/locale/sv/browser.properties
@@ -3,11 +3,3 @@ browser.startup.homepage=about:tor
 
 # Spell checker dictionary
 spellchecker.dictionary=sv_SE
-
-# Default search engine
-browser.search.defaultenginename=Startpage
-
-# Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Startpage
-browser.search.order.2=DuckDuckGo
-browser.search.order.3=Google
diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd
index d88a10c..2285c2a 100644
--- a/src/chrome/locale/sv/torbutton.dtd
+++ b/src/chrome/locale/sv/torbutton.dtd
@@ -24,17 +24,19 @@
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton Ã¤r aktiverad. Om du vill Ã¤ndra instÃ¤llningar fÃ¶r proxy utan Tor, inaktivera Tor och kom tillbaka hit. Om du vill Ã¤ndra instÃ¤llningar fÃ¶r Tor, anvÃ¤nd Torbutton-instÃ¤llningarna.">
 <!ENTITY torbutton.context_menu.new_identity "Ny identitet">
 <!ENTITY torbutton.context_menu.new_identity_key "N">
+<!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site">
+<!ENTITY torbutton.context_menu.new_circuit_key "S">
 <!ENTITY torbutton.context_menu.toggle "SlÃ¥ pÃ¥/av Tor">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "InstÃ¤llningar...">
+<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settingsâ?¦">
 <!ENTITY torbutton.context_menu.preferences.key "I">
 <!ENTITY torbutton.context_menu.about "Om Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "O">
-<!ENTITY torbutton.context_menu.networksettings "Ã?ppna nÃ¤tverksinstÃ¤llningar...">
+<!ENTITY torbutton.context_menu.networksettings "Tor Network Settingsâ?¦">
 <!ENTITY torbutton.context_menu.networksettings.key "Ã?">
-<!ENTITY torbutton.context_menu.downloadUpdate "Ladda ner uppdatering fÃ¶r Tor Browser Bundle...">
+<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "Skyddade kakor">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "S">
 <!ENTITY torbutton.context_menu.copyTor "Kopiera Tor URL">
 <!ENTITY torbutton.context_menu.copyTor.key "p">
@@ -155,3 +157,4 @@
 <!ENTITY torbutton.prefs.sec_med_high "Medium-hÃ¶g">
 <!ENTITY torbutton.prefs.sec_high "HÃ¶g">
 <!ENTITY torbutton.prefs.sec_custom "Anpassad nivÃ¥">
+<!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties
index d55e43a..5289a40 100644
--- a/src/chrome/locale/sv/torbutton.properties
+++ b/src/chrome/locale/sv/torbutton.properties
@@ -1,5 +1,10 @@
 torbutton.button.tooltip.disabled = Aktivera Tor
 torbutton.button.tooltip.enabled = Inaktivera Tor
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = IP unknown
+torbutton.circuit_display.this_browser = This browser
+torbutton.circuit_display.tor_bridge = Bridge
+torbutton.circuit_display.unknown_country = Unknown country
 torbutton.panel.tooltip.disabled = Klicka fÃ¶r att aktivera Tor
 torbutton.panel.tooltip.enabled = Klicka fÃ¶r att inaktivera Tor
 torbutton.panel.plugins.disabled = Klicka fÃ¶r att aktivera plugins
@@ -46,6 +51,7 @@ torbutton.popup.short_torbrowser = Viktig information om Torbutton!\n\nTorbutton
 
 torbutton.popup.confirm_plugins = Insticksmoduler sÃ¥ som Flash kan Ã¤ventyra din anonymitet och personliga integritet.\n\nDe kan ocksÃ¥ kringgÃ¥ Tor fÃ¶r att avslÃ¶ja var du befinner dig och vad din IP-adress Ã¤r.\n\nÃ?r du sÃ¤ker pÃ¥ att du vill aktivera insticksmoduler?\n\n
 torbutton.popup.never_ask_again = FrÃ¥ga aldrig igen
+torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=Denna webbsida (%S) fÃ¶rsÃ¶kte komma Ã¥t HTML5-bilddata pÃ¥ ett kanvas, som skulle kunna anvÃ¤ndas fÃ¶r att identifiera just din dator.\n\nSka Tor Browser tillÃ¥ta den hÃ¤r webbsidan att anvÃ¤nda HTML5-bilddata pÃ¥ kanvas?
diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd
index bdcd023..e14481c 100644
--- a/src/chrome/locale/tr/aboutTor.dtd
+++ b/src/chrome/locale/tr/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2015, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -8,7 +8,7 @@
 
 <!ENTITY aboutTor.outOfDateTorOn.label "AMA, bu tarayÄ±cÄ± gÃ¼ncel deÄ?il.">
 <!ENTITY aboutTor.outOfDateTorOff.label "AYRICA, bu tarayÄ±cÄ± gÃ¼ncel deÄ?il.">
-<!ENTITY aboutTor.outOfDate2.label "SoÄ?ana tÄ±klayÄ±n ve Tor TarayÄ±cÄ± Paketi GÃ¼ncellemesini Ä°ndir'i seÃ§in.">
+<!ENTITY aboutTor.outOfDate2.label "SoÄ?an'a tÄ±klayÄ±n ve ardÄ±ndan Tor TarayÄ±cÄ± GÃ¼ncellemesini Denetle seÃ§in.">
 
 <!ENTITY aboutTor.check.label "Tor AÄ? AyarlarÄ±nÄ± Test Edin">
 
@@ -25,6 +25,7 @@
 
 <!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&amp;location_option=US";>
 
 <!ENTITY aboutTor.torInfo1.label "Ek bilgi:">
 <!ENTITY aboutTor.torInfo2.label "Ã?lke ve IP Adresi:">
diff --git a/src/chrome/locale/tr/brand.dtd b/src/chrome/locale/tr/brand.dtd
index f07182a..45ea406 100644
--- a/src/chrome/locale/tr/brand.dtd
+++ b/src/chrome/locale/tr/brand.dtd
@@ -6,3 +6,9 @@
 <!ENTITY  brandFullName         "Tor TarayÄ±cÄ±">
 <!ENTITY  vendorShortName       "Tor Projesi">
 <!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 "YÃ¼klÃ¼ sistem eklentilerini yÃ¼klemek iÃ§in tÄ±klayÄ±n">
+<!ENTITY plugins.installed.enable "Eklentileri etkinleÅ?tir">
+<!ENTITY plugins.installed.disable "Eklentileri devre dÄ±Å?Ä± bÄ±rak">
+<!ENTITY plugins.installed.disable.tip "Sistem eklentilerinin yÃ¼klenmesini Ã¶nlemek iÃ§in tÄ±klayÄ±n">
diff --git a/src/chrome/locale/tr/browser.properties b/src/chrome/locale/tr/browser.properties
index d788077..7b312a5 100644
--- a/src/chrome/locale/tr/browser.properties
+++ b/src/chrome/locale/tr/browser.properties
@@ -3,11 +3,3 @@ browser.startup.homepage=about:tor
 
 # Spell checker dictionary
 spellchecker.dictionary=tr_TR
-
-# Default search engine
-browser.search.defaultenginename=Startpage
-
-# Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Startpage
-browser.search.order.2=DuckDuckGo
-browser.search.order.3=Google
diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd
index 606928a..a4e7a21 100644
--- a/src/chrome/locale/tr/torbutton.dtd
+++ b/src/chrome/locale/tr/torbutton.dtd
@@ -24,17 +24,19 @@
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton Å?u anda devre dÄ±Å?Ä±. Vekil sunucu ayarlarÄ±nÄ± deÄ?iÅ?tirmek istiyorsanÄ±z, Torbutton'Ä± tekrar devre dÄ±Å?Ä± bÄ±rakÄ±n. Genel ayarlarÄ± deÄ?iÅ?tirecekseniz, ayarlar penceresini kullanÄ±n.">
 <!ENTITY torbutton.context_menu.new_identity "Yeni BaÄ?lantÄ±">
 <!ENTITY torbutton.context_menu.new_identity_key "S">
+<!ENTITY torbutton.context_menu.new_circuit "Bu site iÃ§in yeni Tor devresi">
+<!ENTITY torbutton.context_menu.new_circuit_key "C">
 <!ENTITY torbutton.context_menu.toggle "Durum">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "Ayarlar">
+<!ENTITY torbutton.context_menu.preferences "Gizlilik ve GÃ¼venlik AyarlarÄ±...">
 <!ENTITY torbutton.context_menu.preferences.key "A">
 <!ENTITY torbutton.context_menu.about "HakkÄ±nda">
 <!ENTITY torbutton.context_menu.about.key "H">
-<!ENTITY torbutton.context_menu.networksettings "AÄ? AyarlarÄ±nÄ± AÃ§...">
+<!ENTITY torbutton.context_menu.networksettings "Tor AÄ? AyarlarÄ±...">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
-<!ENTITY torbutton.context_menu.downloadUpdate "Tor TarayÄ±cÄ± Paketi GÃ¼ncelleÅ?tirmesini Ä°ndirin.">
+<!ENTITY torbutton.context_menu.downloadUpdate "Tor TarayÄ±cÄ± GÃ¼ncellemesini Denetle...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "H">
-<!ENTITY torbutton.context_menu.cookieProtections "Ã?erez KorumalarÄ±">
+<!ENTITY torbutton.context_menu.cookieProtections "Ã?erez KorumalarÄ±...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.context_menu.copyTor "Tor URL'sini kopyala">
 <!ENTITY torbutton.context_menu.copyTor.key "p">
@@ -155,3 +157,4 @@
 <!ENTITY torbutton.prefs.sec_med_high "Orta-YÃ¼ksek">
 <!ENTITY torbutton.prefs.sec_high "YÃ¼ksek">
 <!ENTITY torbutton.prefs.sec_custom "Ã?zel DeÄ?erler">
+<!ENTITY torbutton.circuit_display.title "Bu site iÃ§in Tor devresi">
diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties
index 5a39ac2..d5d3276 100644
--- a/src/chrome/locale/tr/torbutton.properties
+++ b/src/chrome/locale/tr/torbutton.properties
@@ -1,5 +1,10 @@
 torbutton.button.tooltip.disabled = Tor'u EtkinleÅ?tir
 torbutton.button.tooltip.enabled = Tor'u Devre DÄ±Å?Ä± BÄ±rak
+torbutton.circuit_display.internet = Ä°nternet
+torbutton.circuit_display.ip_unknown = Bilinmeyen IP
+torbutton.circuit_display.this_browser = Bu tarayÄ±cÄ±
+torbutton.circuit_display.tor_bridge = KÃ¶prÃ¼
+torbutton.circuit_display.unknown_country = Bilinmeyen Ã¼lke
 torbutton.panel.tooltip.disabled = Tor'u etkinleÅ?tirmek iÃ§in tÄ±klayÄ±n
 torbutton.panel.tooltip.enabled = Tor'u devre dÄ±Å?Ä± bÄ±rakmak iÃ§in tÄ±klayÄ±n
 torbutton.panel.plugins.disabled = Eklentileri etkinleÅ?tirmek iÃ§in tÄ±klayÄ±n
@@ -46,6 +51,7 @@ torbutton.popup.short_torbrowser = Ã?nemli Torbutton bilgisi!\nTorbutton Å?imdi
 
 torbutton.popup.confirm_plugins = Flash gibi eklentiler gizliliÄ?inizi ve anonimliÄ?inizi zedeleyebilir.\n\nAynÄ± zaman Tor'u atlatarak geÃ§erli konumunuzu ve IP adresinizi ortaya Ã§Ä±karabilir.\n\nEklentileri aktif etmek istiyor musunuz?\n
 torbutton.popup.never_ask_again = Bir daha sorma
+torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=Bu web sitesi (%S) bilgisayarÄ±nÄ±zÄ± benzersiz olarak tanÄ±mlayabilmek iÃ§in kullanÄ±labilen HTML5 tuvalindeki resim verisine eriÅ?meye Ã§alÄ±Å?tÄ±.\n\nTor TarayÄ±cÄ± bu web sitesine HTML5 tuval resim verisini Ã§Ä±karmasÄ±na izin vermeli mi?
diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd
index afb7da7..c3c8027 100644
--- a/src/chrome/locale/vi/aboutTor.dtd
+++ b/src/chrome/locale/vi/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2015, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -8,7 +8,7 @@
 
 <!ENTITY aboutTor.outOfDateTorOn.label "Tuy nhiÃªn, trÃ¬nh duyá»?t nÃ y Ä?Ã£ lá»?i thá»?i.">
 <!ENTITY aboutTor.outOfDateTorOff.label "NgoÃ i ra, trÃ¬nh duyá»?t nÃ y Ä?Ã£ lá»?i thá»?i.">
-<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
+<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update.">
 
 <!ENTITY aboutTor.check.label "Test Tor Network Settings">
 
@@ -25,6 +25,7 @@
 
 <!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&amp;location_option=US";>
 
 <!ENTITY aboutTor.torInfo1.label "Additional Info:">
 <!ENTITY aboutTor.torInfo2.label "Quá»?c gia &amp; Ä?á»?a chá»? IP:">
diff --git a/src/chrome/locale/vi/brand.dtd b/src/chrome/locale/vi/brand.dtd
index 49ca087..c73eca2 100644
--- a/src/chrome/locale/vi/brand.dtd
+++ b/src/chrome/locale/vi/brand.dtd
@@ -6,3 +6,9 @@
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Dá»± Ã¡n Tor">
 <!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Click to load installed system plugins">
+<!ENTITY plugins.installed.enable "Enable plugins">
+<!ENTITY plugins.installed.disable "Disable plugins">
+<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins">
diff --git a/src/chrome/locale/vi/browser.properties b/src/chrome/locale/vi/browser.properties
index 295a03a..8849b67 100644
--- a/src/chrome/locale/vi/browser.properties
+++ b/src/chrome/locale/vi/browser.properties
@@ -3,11 +3,3 @@ browser.startup.homepage=about:tor
 
 # Spell checker dictionary
 spellchecker.dictionary=en_US
-
-# Default search engine
-browser.search.defaultenginename=Startpage
-
-# Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Startpage
-browser.search.order.2=DuckDuckGo
-browser.search.order.3=Google
diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd
index f33340d..5378f43 100644
--- a/src/chrome/locale/vi/torbutton.dtd
+++ b/src/chrome/locale/vi/torbutton.dtd
@@ -24,17 +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_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 "TÃ¹y chá»?nh...">
+<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settingsâ?¦">
 <!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 "Má»? cÃ¡c Thiáº¿t Ä?áº·t Máº¡ng...">
+<!ENTITY torbutton.context_menu.networksettings "Tor Network Settingsâ?¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
-<!ENTITY torbutton.context_menu.downloadUpdate "Táº£i vá»? Báº£n cáºp nháºt Bá»? trá»£ cho TrÃ¬nh duyá»?t Tor...">
+<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Updateâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "CÆ¡ cháº¿ báº£o vá»? Cookie">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protectionsâ?¦">
 <!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">
@@ -155,3 +157,4 @@
 <!ENTITY torbutton.prefs.sec_med_high "Medium-High">
 <!ENTITY torbutton.prefs.sec_high "High">
 <!ENTITY torbutton.prefs.sec_custom "Custom Values">
+<!ENTITY torbutton.circuit_display.title "Tor circuit for this site">
diff --git a/src/chrome/locale/vi/torbutton.properties b/src/chrome/locale/vi/torbutton.properties
index 20b1f61..9c563d4 100644
--- a/src/chrome/locale/vi/torbutton.properties
+++ b/src/chrome/locale/vi/torbutton.properties
@@ -1,5 +1,10 @@
 torbutton.button.tooltip.disabled = Báºt Tor
 torbutton.button.tooltip.enabled = Táº¯t Tor
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = IP unknown
+torbutton.circuit_display.this_browser = This browser
+torbutton.circuit_display.tor_bridge = Bridge
+torbutton.circuit_display.unknown_country = Unknown country
 torbutton.panel.tooltip.disabled = Nháº¥n Ä?á»? báºt Tor
 torbutton.panel.tooltip.enabled = Nháº¥n Ä?á»? táº¯t Tor
 torbutton.panel.plugins.disabled = Nháº¥n Ä?á»? báºt pháº§n bá»? trá»£
@@ -46,6 +51,7 @@ torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton
 
 torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
 torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd
index 3e2cff4..8237217 100644
--- a/src/chrome/locale/zh-CN/aboutTor.dtd
+++ b/src/chrome/locale/zh-CN/aboutTor.dtd
@@ -1,5 +1,5 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2015, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
@@ -8,7 +8,7 @@
 
 <!ENTITY aboutTor.outOfDateTorOn.label "ä½?æ?¯è¯¥æµ?è§?å?¨å¹¶é??æ??æ?°ç??æ?¬ã??">
 <!ENTITY aboutTor.outOfDateTorOff.label "å?¦å¤?ï¼?è¯¥æµ?è§?å?¨å¹¶é??æ??æ?°ç??æ?¬ã??">
-<!ENTITY aboutTor.outOfDate2.label "è¯·å??å?»æ´?è?±å?¾æ ?ï¼?ç?¶å??é??æ?©â??ä¸?è½½ Tor Browser Bundleâ??æ?´æ?°ã??">
+<!ENTITY aboutTor.outOfDate2.label "ç?¹å?»æ´?è?±ï¼?ç?¶å??é??æ?© Tor Browser æ£?æ?¥æ?´æ?°ã??">
 
 <!ENTITY aboutTor.check.label "æµ?è¯? Tor ç½?ç»?è®¾ç½®">
 
@@ -25,6 +25,7 @@
 
 <!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&amp;location_option=CN";>
 
 <!ENTITY aboutTor.torInfo1.label "æ?´å¤?ä¿¡æ?¯ï¼?">
 <!ENTITY aboutTor.torInfo2.label "å?½å®¶ä¸? IP å?°å??ï¼?">
diff --git a/src/chrome/locale/zh-CN/brand.dtd b/src/chrome/locale/zh-CN/brand.dtd
index 7868d2d..97f75bb 100644
--- a/src/chrome/locale/zh-CN/brand.dtd
+++ b/src/chrome/locale/zh-CN/brand.dtd
@@ -6,3 +6,9 @@
 <!ENTITY  brandFullName         "Tor Browser">
 <!ENTITY  vendorShortName       "Tor Project">
 <!ENTITY  trademarkInfo.part1   "Firefox ä¸? Firefox å?¾æ ?ä¸º Mozilla Foundation ç??å??æ ?ã??">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "ç?¹å?»å? è½½å·²å®?è£?ç??ç³»ç»?æ??ä»¶">
+<!ENTITY plugins.installed.enable "å?¯ç?¨æ??ä»¶">
+<!ENTITY plugins.installed.disable "ç¦?ç?¨æ??ä»¶">
+<!ENTITY plugins.installed.disable.tip "ç?¹å?»é?»æ¢å? è½½ç³»ç»?æ??ä»¶">
diff --git a/src/chrome/locale/zh-CN/browser.properties b/src/chrome/locale/zh-CN/browser.properties
index b3a313b..452496c 100644
--- a/src/chrome/locale/zh-CN/browser.properties
+++ b/src/chrome/locale/zh-CN/browser.properties
@@ -3,11 +3,3 @@ browser.startup.homepage=about:tor
 
 # Spell checker dictionary
 spellchecker.dictionary=zh_CN
-
-# Default search engine
-browser.search.defaultenginename=Startpage
-
-# Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Startpage
-browser.search.order.2=DuckDuckGo
-browser.search.order.3=Google
diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd
index 39b07dc..7da1472 100644
--- a/src/chrome/locale/zh-CN/torbutton.dtd
+++ b/src/chrome/locale/zh-CN/torbutton.dtd
@@ -24,17 +24,19 @@
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton å½?å??å·²å?¯ç?¨ã??å¦?é??å¯¹ Tor ä¹?å¤?ç??ä»£ç??è®¾ç½®è¿?è¡?æ?´æ?¹ï¼?è¯·ç¦?ç?¨ Torbutton å??å??è¿?å??è¿?é??ã??å¦?é??æ?´æ?¹ Tor ç??è®¾ç½®ï¼?è¯·å?¨ Torbutton é¦?é??é¡¹çª?å?£ä¸è¿?è¡?è®¾ç½®ã??">
 <!ENTITY torbutton.context_menu.new_identity "æ?°æ ?è¯?">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
+<!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 "é¦?é??é¡¹...">
+<!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">
-<!ENTITY torbutton.context_menu.networksettings "æ??å¼?ç½?ç»?è®¾ç½®â?¦">
+<!ENTITY torbutton.context_menu.networksettings "Tor ç½?ç»?è®¾ç½®â?¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
-<!ENTITY torbutton.context_menu.downloadUpdate "ä¸?è½½ Tor Browser Bundle æ?´æ?°...">
+<!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser æ£?æ?¥æ?´æ?°â?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie ä¿?æ?¤">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie ä¿?æ?¤â?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.context_menu.copyTor "å¤?å?¶ Tor ç½?å??">
 <!ENTITY torbutton.context_menu.copyTor.key "p">
@@ -155,3 +157,4 @@
 <!ENTITY torbutton.prefs.sec_med_high "ä¸é«?">
 <!ENTITY torbutton.prefs.sec_high "é«?">
 <!ENTITY torbutton.prefs.sec_custom "è?ªå®?ä¹?">
+<!ENTITY torbutton.circuit_display.title "å¯¹æ¤ç½?ç«?ç?? Tor çº¿è·¯">
diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties
index 49bb702..cee64a2 100644
--- a/src/chrome/locale/zh-CN/torbutton.properties
+++ b/src/chrome/locale/zh-CN/torbutton.properties
@@ -1,5 +1,10 @@
 torbutton.button.tooltip.disabled = å?¯ç?¨ Tor
 torbutton.button.tooltip.enabled = ç¦?ç?¨ Tor
+torbutton.circuit_display.internet = äº?è??ç½?
+torbutton.circuit_display.ip_unknown = IP æ?ªç?¥
+torbutton.circuit_display.this_browser = æ?¬æµ?è§?å?¨
+torbutton.circuit_display.tor_bridge = ç½?æ¡¥
+torbutton.circuit_display.unknown_country = æ?ªç?¥å?½å®¶
 torbutton.panel.tooltip.disabled = ç?¹å?»å?¯ç?¨ Tor
 torbutton.panel.tooltip.enabled = ç?¹å?»ç¦?ç?¨ Tor
 torbutton.panel.plugins.disabled = ç?¹å?»å?¯ç?¨æ??ä»¶
@@ -46,6 +51,7 @@ torbutton.popup.short_torbrowser = Torbuttonç??é??è¦?ä¿¡æ?¯ï¼?\n\nTorbutton ç?®
 
 torbutton.popup.confirm_plugins = Flash ä¹?ç±»ç??æ??ä»¶å?¯å¯¹ç?¨æ?·ç??é??ç§?ä¸?å?¿å??æ?§é? æ??å?±å®³ã??\n\nå®?ä»¬è¿?å?¯è?½ç»?è¿? Tor è??æ³?æ¼?ç?¨æ?·ç??å½?å??ä½?ç½®å?? IP å?°å??ã??\n\næ?¯å?¦ç¡®å®?å?¯ç?¨æ??ä»¶ï¼?\n\n
 torbutton.popup.never_ask_again = ä¸?å??è¯¢é?®
+torbutton.popup.confirm_newnym = Tor Browser å°?å?³é?æ??æ??çª?å?£å??æ ?ç¾é¡µã??æ??æ??ç½?ç«?ç?»å½?ç?¶æ??é?½å°?ä¸¢å¤±ã??\n\né??æ?°å?¯å?¨ Tor Browser ä»¥é??ç½®æ?¨ç??èº«ä»½ï¼?\n\n
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=æ¤ç½?ç«? (%S) è¯?å?¾è?·å?? HTML5 Canva å?¾å??æ?°æ?®ï¼?è¯¥æ?°æ?®å?¯ç?¨ä½?ä½ æ??ç?¨è®¡ç®?æ?ºç??å?¯ä¸?æ ?è¯?ã??\n\nTor Browser æ?¯å?¦åº?å??è®¸æ¤ç½?ç«?è?·å?? HTML5 Canva å?¾å??æ?°æ?®ï¼?

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

Prev by Author: [tor-commits] [meek/master] Fix gitweb links.
Next by Author: [tor-commits] [tor-browser-bundle/master] Bug 13169: Don't use /dev/random on Windows.
Previous by thread: [tor-commits] [webwml/master] fix my contact info
Next by thread: [tor-commits] [translation/torbutton-brandproperties_completed] Update translations for torbutton-brandproperties_completed
Index(es):
- Author
- Thread