- tbb-commits - lists.torproject.org

[torbutton/master] Bug 20244.5: Remove obsolete Privacy Settings group
by gk＠torproject.org 17 Oct '16

17 Oct '16

commit ea0d6dc4ebc59c594162202e142549356075a981 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 4 23:42:00 2016 +0000 Bug 20244.5: Remove obsolete Privacy Settings group --- src/chrome/content/preferences.js | 3 --- src/chrome/content/preferences.xul | 8 +++----- src/chrome/locale/af/torbutton.dtd | 3 --- src/chrome/locale/ak/torbutton.dtd | 3 --- src/chrome/locale/am/torbutton.dtd | 3 --- src/chrome/locale/ar/torbutton.dtd | 5 ----- src/chrome/locale/arn/torbutton.dtd | 3 --- src/chrome/locale/ast/torbutton.dtd | 3 --- src/chrome/locale/az/torbutton.dtd | 3 --- src/chrome/locale/be/torbutton.dtd | 3 --- src/chrome/locale/bg/torbutton.dtd | 3 --- src/chrome/locale/bms/torbutton.dtd | 2 -- src/chrome/locale/bn-IN/torbutton.dtd | 3 --- src/chrome/locale/bn/torbutton.dtd | 3 --- src/chrome/locale/bo/torbutton.dtd | 3 --- src/chrome/locale/br/torbutton.dtd | 3 --- src/chrome/locale/bs/torbutton.dtd | 3 --- src/chrome/locale/ca/torbutton.dtd | 3 --- src/chrome/locale/cs/torbutton.dtd | 3 --- src/chrome/locale/csb/torbutton.dtd | 3 --- src/chrome/locale/cy/torbutton.dtd | 3 --- src/chrome/locale/da/torbutton.dtd | 3 --- src/chrome/locale/de/torbutton.dtd | 5 ----- src/chrome/locale/dz/torbutton.dtd | 3 --- src/chrome/locale/el/torbutton.dtd | 3 --- src/chrome/locale/en/torbutton.dtd | 10 ++++------ src/chrome/locale/eo/torbutton.dtd | 3 --- src/chrome/locale/es/torbutton.dtd | 5 ----- src/chrome/locale/et/torbutton.dtd | 3 --- src/chrome/locale/eu/torbutton.dtd | 5 ----- src/chrome/locale/fa/torbutton.dtd | 5 ----- src/chrome/locale/fi/torbutton.dtd | 3 --- src/chrome/locale/fil/torbutton.dtd | 3 --- src/chrome/locale/fo/torbutton.dtd | 3 --- src/chrome/locale/fr/torbutton.dtd | 5 ----- src/chrome/locale/fur/torbutton.dtd | 3 --- src/chrome/locale/fy/torbutton.dtd | 3 --- src/chrome/locale/ga/torbutton.dtd | 3 --- src/chrome/locale/gl/torbutton.dtd | 3 --- src/chrome/locale/gu/torbutton.dtd | 3 --- src/chrome/locale/gun/torbutton.dtd | 3 --- src/chrome/locale/ha/torbutton.dtd | 3 --- src/chrome/locale/he/torbutton.dtd | 3 --- src/chrome/locale/hi/torbutton.dtd | 3 --- src/chrome/locale/hr/torbutton.dtd | 3 --- src/chrome/locale/ht/torbutton.dtd | 3 --- src/chrome/locale/hu/torbutton.dtd | 3 --- src/chrome/locale/hy/torbutton.dtd | 3 --- src/chrome/locale/id/torbutton.dtd | 3 --- src/chrome/locale/is/torbutton.dtd | 3 --- src/chrome/locale/it/torbutton.dtd | 5 ----- src/chrome/locale/ja/torbutton.dtd | 5 ----- src/chrome/locale/jv/torbutton.dtd | 3 --- src/chrome/locale/ka/torbutton.dtd | 3 --- src/chrome/locale/km/torbutton.dtd | 3 --- src/chrome/locale/kn/torbutton.dtd | 3 --- src/chrome/locale/ko/torbutton.dtd | 5 ----- src/chrome/locale/ku/torbutton.dtd | 3 --- src/chrome/locale/kw/torbutton.dtd | 3 --- src/chrome/locale/ky/torbutton.dtd | 3 --- src/chrome/locale/lb/torbutton.dtd | 3 --- src/chrome/locale/lg/torbutton.dtd | 2 -- src/chrome/locale/ln/torbutton.dtd | 3 --- src/chrome/locale/lo/torbutton.dtd | 3 --- src/chrome/locale/lt/torbutton.dtd | 3 --- src/chrome/locale/lv/torbutton.dtd | 3 --- src/chrome/locale/mg/torbutton.dtd | 3 --- src/chrome/locale/mi/torbutton.dtd | 3 --- src/chrome/locale/mk/torbutton.dtd | 3 --- src/chrome/locale/ml/torbutton.dtd | 3 --- src/chrome/locale/mn/torbutton.dtd | 3 --- src/chrome/locale/mr/torbutton.dtd | 3 --- src/chrome/locale/ms/torbutton.dtd | 3 --- src/chrome/locale/mt/torbutton.dtd | 3 --- src/chrome/locale/my/torbutton.dtd | 3 --- src/chrome/locale/nah/torbutton.dtd | 3 --- src/chrome/locale/nap/torbutton.dtd | 3 --- src/chrome/locale/nb/torbutton.dtd | 3 --- src/chrome/locale/ne/torbutton.dtd | 3 --- src/chrome/locale/nl/torbutton.dtd | 5 ----- src/chrome/locale/nn/torbutton.dtd | 3 --- src/chrome/locale/nso/torbutton.dtd | 3 --- src/chrome/locale/oc/torbutton.dtd | 3 --- src/chrome/locale/or/torbutton.dtd | 3 --- src/chrome/locale/pa/torbutton.dtd | 3 --- src/chrome/locale/pap/torbutton.dtd | 3 --- src/chrome/locale/pl/torbutton.dtd | 5 ----- src/chrome/locale/pms/torbutton.dtd | 3 --- src/chrome/locale/ps/torbutton.dtd | 3 --- src/chrome/locale/pt-BR/torbutton.dtd | 3 --- src/chrome/locale/pt/torbutton.dtd | 5 ----- src/chrome/locale/ro/torbutton.dtd | 3 --- src/chrome/locale/ru/torbutton.dtd | 5 ----- src/chrome/locale/sco/torbutton.dtd | 3 --- src/chrome/locale/sk/torbutton.dtd | 3 --- src/chrome/locale/sl/torbutton.dtd | 3 --- src/chrome/locale/so/torbutton.dtd | 3 --- src/chrome/locale/son/torbutton.dtd | 3 --- src/chrome/locale/sq/torbutton.dtd | 3 --- src/chrome/locale/sr/torbutton.dtd | 3 --- src/chrome/locale/st/torbutton.dtd | 3 --- src/chrome/locale/su/torbutton.dtd | 3 --- src/chrome/locale/sv/torbutton.dtd | 5 ----- src/chrome/locale/sw/torbutton.dtd | 3 --- src/chrome/locale/ta/torbutton.dtd | 3 --- src/chrome/locale/te/torbutton.dtd | 3 --- src/chrome/locale/tg/torbutton.dtd | 3 --- src/chrome/locale/th/torbutton.dtd | 3 --- src/chrome/locale/ti/torbutton.dtd | 3 --- src/chrome/locale/tk/torbutton.dtd | 3 --- src/chrome/locale/tr/torbutton.dtd | 5 ----- src/chrome/locale/uk/torbutton.dtd | 3 --- src/chrome/locale/ur/torbutton.dtd | 3 --- src/chrome/locale/ve/torbutton.dtd | 3 --- src/chrome/locale/vi/torbutton.dtd | 5 ----- src/chrome/locale/wa/torbutton.dtd | 3 --- src/chrome/locale/wo/torbutton.dtd | 3 --- src/chrome/locale/zh-CN/torbutton.dtd | 5 ----- src/chrome/locale/zh-HK/torbutton.dtd | 3 --- src/chrome/locale/zh-TW/torbutton.dtd | 3 --- src/chrome/locale/zu/torbutton.dtd | 3 --- 121 files changed, 7 insertions(+), 400 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index eb71019..28f5955 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -12,7 +12,6 @@ function torbutton_prefs_init(doc) { var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.'); - // Privacy and security settings let sec_slider = doc.getElementById('torbutton_sec_slider'); let sec_custom = doc.getElementById('torbutton_sec_custom'); let custom_values = o_torprefs.getBoolPref('security_custom'); @@ -41,8 +40,6 @@ function torbutton_prefs_save(doc) { torbutton_log(2, "called prefs_save()"); var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.'); - // Privacy and Security Settings - o_torprefs.setBoolPref('security_custom', doc.getElementById('torbutton_sec_custom').checked); o_torprefs.setIntPref('security_slider', diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 3a54635..62f649f 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -7,7 +7,7 @@ <dialog id="torbutton-prefs" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" - title="&torbutton.prefs.privacy_security_settings;" + title="&torbutton.prefs.security_settings;" buttons="accept,cancel,extra1" buttonlabelextra1="&torbutton.prefs.restore_defaults;" ondialogextra1="torbutton_prefs_reset_defaults();" @@ -15,15 +15,13 @@ onload="torbutton_prefs_init(document)" align="stretch" pack="center" + maxheight="350" + maxwidth="400" ondialogaccept="torbutton_prefs_save(document)" > <script type="application/x-javascript" src="torbutton_util.js"/> <script type="application/x-javascript" src="preferences.js"/> <vbox flex="1" align="stretch"> - <groupbox> - <caption label="&torbutton.prefs.priv_caption;" - tooltiptext="&torbutton.prefs.priv_caption_tooltip;"/> - </groupbox> <groupbox align="stretch" flex="1">  <caption label="&torbutton.prefs.sec_caption;"/> <hbox flex="1" align="stretch"> diff --git a/src/chrome/locale/af/torbutton.dtd b/src/chrome/locale/af/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/af/torbutton.dtd +++ b/src/chrome/locale/af/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ak/torbutton.dtd b/src/chrome/locale/ak/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ak/torbutton.dtd +++ b/src/chrome/locale/ak/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/am/torbutton.dtd b/src/chrome/locale/am/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/am/torbutton.dtd +++ b/src/chrome/locale/am/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index 67e510c..e86ca90 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "دائرة تور جديدة لهذا الموقع"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "إعدادات الخصوصية والأمان..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "إعدادات شبكة تور..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "تحقق من تحديثات متصفح تور..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "إعدادات أمان ملفات تعريف الارتباط..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "انقر لبدء زر تور"> -<!ENTITY torbutton.prefs.privacy_security_settings "إعدادات الأمان والخصوصيّة"> <!ENTITY torbutton.prefs.restore_defaults "استعادة الافتراضيات"> <!ENTITY torbutton.cookiedialog.title "إدارة إعدادت الحماية لملفات تعريف الارتباط"> <!ENTITY torbutton.cookiedialog.lockCol "محمية"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "إزالة الكل لكن استمر في الحماية"> <!ENTITY torbutton.cookiedialog.saveAllCookies "احم ملفات تعريف الارتباط الجديدة"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "لا تحم ملفات تعريف الارتباط الجديدة"> -<!ENTITY torbutton.prefs.priv_caption "إعدادات الخصوصية"> <!ENTITY torbutton.prefs.restrict_thirdparty "تقييد الـCookies الخاصة بالطرف الثالث و بيانات التتبع الأخري."> <!ENTITY torbutton.prefs.resist_fingerprinting "تغيير التفاصيل التي تميزك عن المستخدمين الآخرين لمتصفح تور"> <!ENTITY torbutton.prefs.sec_caption "مستوى الأمان"> diff --git a/src/chrome/locale/arn/torbutton.dtd b/src/chrome/locale/arn/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/arn/torbutton.dtd +++ b/src/chrome/locale/arn/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ast/torbutton.dtd b/src/chrome/locale/ast/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ast/torbutton.dtd +++ b/src/chrome/locale/ast/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/az/torbutton.dtd b/src/chrome/locale/az/torbutton.dtd index d583418..85999d7 100644 --- a/src/chrome/locale/az/torbutton.dtd +++ b/src/chrome/locale/az/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Seçimlər..."> -<!ENTITY torbutton.context_menu.preferences.key "A"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/be/torbutton.dtd b/src/chrome/locale/be/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/be/torbutton.dtd +++ b/src/chrome/locale/be/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/bg/torbutton.dtd b/src/chrome/locale/bg/torbutton.dtd index be87171..d95c6d5 100644 --- a/src/chrome/locale/bg/torbutton.dtd +++ b/src/chrome/locale/bg/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Нова самоличност"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/bms/torbutton.dtd b/src/chrome/locale/bms/torbutton.dtd index 110938d..8a7c825 100644 --- a/src/chrome/locale/bms/torbutton.dtd +++ b/src/chrome/locale/bms/torbutton.dtd @@ -1,5 +1,3 @@ -<!ENTITY torbutton.context_menu.preferences "ဦးစားေပး ညႊန္ျပမႈမ်ား"> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Torbutton စတင္ရန္ ကလစ္လုပ္ပါ"> diff --git a/src/chrome/locale/bn-IN/torbutton.dtd b/src/chrome/locale/bn-IN/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/bn-IN/torbutton.dtd +++ b/src/chrome/locale/bn-IN/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/bn/torbutton.dtd b/src/chrome/locale/bn/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/bn/torbutton.dtd +++ b/src/chrome/locale/bn/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/bo/torbutton.dtd b/src/chrome/locale/bo/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/bo/torbutton.dtd +++ b/src/chrome/locale/bo/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/br/torbutton.dtd b/src/chrome/locale/br/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/br/torbutton.dtd +++ b/src/chrome/locale/br/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/bs/torbutton.dtd b/src/chrome/locale/bs/torbutton.dtd index 27f1723..0933934 100644 --- a/src/chrome/locale/bs/torbutton.dtd +++ b/src/chrome/locale/bs/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Prioriteti..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Zaštita kolačića"> diff --git a/src/chrome/locale/ca/torbutton.dtd b/src/chrome/locale/ca/torbutton.dtd index ad2cc9f..1ee6378 100644 --- a/src/chrome/locale/ca/torbutton.dtd +++ b/src/chrome/locale/ca/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Nova identitat"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferències..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Protecció de les galetes"> diff --git a/src/chrome/locale/cs/torbutton.dtd b/src/chrome/locale/cs/torbutton.dtd index 93f1124..60b96de 100644 --- a/src/chrome/locale/cs/torbutton.dtd +++ b/src/chrome/locale/cs/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Nova identita"> <!ENTITY torbutton.context_menu.new_identity_key "S"> -<!ENTITY torbutton.context_menu.preferences "Nastavení..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Ochrana před cookies"> diff --git a/src/chrome/locale/csb/torbutton.dtd b/src/chrome/locale/csb/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/csb/torbutton.dtd +++ b/src/chrome/locale/csb/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/cy/torbutton.dtd b/src/chrome/locale/cy/torbutton.dtd index 9251931..e3a3500 100644 --- a/src/chrome/locale/cy/torbutton.dtd +++ b/src/chrome/locale/cy/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Dewisiadau"> -<!ENTITY torbutton.context_menu.preferences.key "p"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd index 22b4726..78f4a8e 100644 --- a/src/chrome/locale/da/torbutton.dtd +++ b/src/chrome/locale/da/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Ny identitet"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Indstillinger..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Hent bundt-opdatering Tor Browser Bundle ..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "O"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie-beskyttelser"> diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index 3544642..aff98bf 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -2,16 +2,12 @@ <!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.preferences "Privatssphäre- und Sicherheits-Einstellungen..."> -<!ENTITY torbutton.context_menu.preferences.key "E"> <!ENTITY torbutton.context_menu.networksettings "Tor-Netzwerk-Einstellungen..."> -<!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Suche nach Tor-Browser-Aktualisierungen..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie-Schutz..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Klicken, um Torbutton zu aktivieren"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privatsphäre- und Sicherheits-Einstellungen"> <!ENTITY torbutton.prefs.restore_defaults "Vorgabeeinstellungen wiederherstellen"> <!ENTITY torbutton.cookiedialog.title "Cookie-Schutz verwalten"> <!ENTITY torbutton.cookiedialog.lockCol "Geschützt"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Alle, außer die geschützten Cookies entfernen"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Neue Cookies schützen"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Neue Cookies nicht schützen"> -<!ENTITY torbutton.prefs.priv_caption "Privatsphären-Einstellungen"> <!ENTITY torbutton.prefs.restrict_thirdparty "Profildateien (Cookies) von Drittanbietern und andere Überwachungsdaten einschränken"> <!ENTITY torbutton.prefs.resist_fingerprinting "Details ändern, die Sie von anderen Tor-Browser-Benutzern unterscheiden"> <!ENTITY torbutton.prefs.sec_caption "Sicherheitslevel"> diff --git a/src/chrome/locale/dz/torbutton.dtd b/src/chrome/locale/dz/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/dz/torbutton.dtd +++ b/src/chrome/locale/dz/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/el/torbutton.dtd b/src/chrome/locale/el/torbutton.dtd index 69366e2..4b1bb43 100644 --- a/src/chrome/locale/el/torbutton.dtd +++ b/src/chrome/locale/el/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Νέα Ταυτότητα"> <!ENTITY torbutton.context_menu.new_identity_key "Τ"> -<!ENTITY torbutton.context_menu.preferences "Επιλογές..."> -<!ENTITY torbutton.context_menu.preferences.key "Ε"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Λυψη του Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Προστασία Cookies"> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 908c375..9fd9dae 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -2,16 +2,16 @@ <!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.preferences "Privacy and Security Settings…"> -<!ENTITY torbutton.context_menu.preferences.key "P"> +<!ENTITY torbutton.context_menu.preferences "Security Settings…"> +<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Tor Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> +<!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections…"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.security_settings "Security Settings"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> @@ -24,8 +24,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.priv_caption "Privacy Settings"> -<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use."> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets."> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/eo/torbutton.dtd b/src/chrome/locale/eo/torbutton.dtd index 9790100..e10afbb 100644 --- a/src/chrome/locale/eo/torbutton.dtd +++ b/src/chrome/locale/eo/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Nova idento"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Agordoj…"> -<!ENTITY torbutton.context_menu.preferences.key "A"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "P"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd index 95a6d5c..a945042 100644 --- a/src/chrome/locale/es/torbutton.dtd +++ b/src/chrome/locale/es/torbutton.dtd @@ -2,16 +2,12 @@ <!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.preferences "Configuración de privacidad y seguridad..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Configuración de red Tor..."> -<!ENTITY torbutton.context_menu.networksettings.key "G"> <!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.key "C"> <!ENTITY torbutton.button.tooltip "Haga clic para inicializar Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Preferencias de Privacidad y Seguridad"> <!ENTITY torbutton.prefs.restore_defaults "Restablecer valores predeterminados "> <!ENTITY torbutton.cookiedialog.title "Administrar protecciones de cookie"> <!ENTITY torbutton.cookiedialog.lockCol "Protegidas"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Eliminar todas excepto las protegidas"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger las nuevas cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No proteger las nuevas cookies"> -<!ENTITY torbutton.prefs.priv_caption "Parámetros de privacidad"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir cookies de terceros y otros datos de seguimiento"> <!ENTITY torbutton.prefs.resist_fingerprinting "Cambiar los detalles que le distinguen de otros usuarios del Navegador Tor"> <!ENTITY torbutton.prefs.sec_caption "Nivel de Seguridad"> diff --git a/src/chrome/locale/et/torbutton.dtd b/src/chrome/locale/et/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/et/torbutton.dtd +++ b/src/chrome/locale/et/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd index 97a7d33..9d745a5 100644 --- a/src/chrome/locale/eu/torbutton.dtd +++ b/src/chrome/locale/eu/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Tor zirkuitu berria gune honetarako"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Pribatutasun eta segurtasun ezarpenak..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Tor Sarearen Ezarpenak..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser eguneraketa egiaztatu"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie babesak..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Sakatu Torbutton abiarazteko"> -<!ENTITY torbutton.prefs.privacy_security_settings "Pribatutasun eta segurtasun ezarpenak"> <!ENTITY torbutton.prefs.restore_defaults "Lehenetsiak berrezarri"> <!ENTITY torbutton.cookiedialog.title "Cookie Babesak kudeatu"> <!ENTITY torbutton.cookiedialog.lockCol "Babestuta"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Denak kendu babestutakoak izan ezik"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Cookie berriak babestu"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ez babestu cookie berririk"> -<!ENTITY torbutton.prefs.priv_caption "Pribatutasun ezarpenak"> <!ENTITY torbutton.prefs.restrict_thirdparty "Hirugarrenen cookie-ak eta beste jarraipen datuak murriztu"> <!ENTITY torbutton.prefs.resist_fingerprinting "Zu beste Tor Browser erabiltzaileengandik nabarmentzen zaituzten xehetasunak aldatu"> <!ENTITY torbutton.prefs.sec_caption "Segurtasun maila"> diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd index 28ae8ce..cfe1f66 100644 --- a/src/chrome/locale/fa/torbutton.dtd +++ b/src/chrome/locale/fa/torbutton.dtd @@ -2,16 +2,12 @@ <!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.preferences "حفظ حریم خصوصی و تنظیمات امنیتی"> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "تنظیمات شبکه تور"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "بررسی بروز رسانی Tor Browser ..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "حفاظت کوکی ها..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "جهت شروع دكمه تُرکليک کنيد"> -<!ENTITY torbutton.prefs.privacy_security_settings "حفظ حریم خصوصی و تنظیمات امنیتی"> <!ENTITY torbutton.prefs.restore_defaults "بازگرداندن تنظیمات به حالت پیش‌فرض"> <!ENTITY torbutton.cookiedialog.title "مديريت حفاظت کلوچک‌ها"> <!ENTITY torbutton.cookiedialog.lockCol "حفاظت شده"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "حذف تمام کلوچک‌های حفاظت نشده"> <!ENTITY torbutton.cookiedialog.saveAllCookies "حفاظت از کلوچک‌های جديد"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "عدم حفاظت از کلوچک‌های جديد"> -<!ENTITY torbutton.prefs.priv_caption "تنظیمات حریم خصوصی"> <!ENTITY torbutton.prefs.restrict_thirdparty "محدود‌كردن كوكى‌هاى طرف سوم و داده‌هاى پيگردى ديگر"> <!ENTITY torbutton.prefs.resist_fingerprinting "تغييردادن جزئياتى كه شمارا از كاربران ديگر تُر تميزمى‌كند"> <!ENTITY torbutton.prefs.sec_caption "سطح امنیت"> diff --git a/src/chrome/locale/fi/torbutton.dtd b/src/chrome/locale/fi/torbutton.dtd index aa6d2b7..40475ae 100644 --- a/src/chrome/locale/fi/torbutton.dtd +++ b/src/chrome/locale/fi/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Uusi identiteetti"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Asetukset..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Lataa Tor Browser Bundle -päivitys..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "L"> <!ENTITY torbutton.context_menu.cookieProtections "Evästeiden suojaukset"> diff --git a/src/chrome/locale/fil/torbutton.dtd b/src/chrome/locale/fil/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/fil/torbutton.dtd +++ b/src/chrome/locale/fil/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/fo/torbutton.dtd b/src/chrome/locale/fo/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/fo/torbutton.dtd +++ b/src/chrome/locale/fo/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index 1b34290..184a9a6 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Nouveau circuit Tor pour ce site"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Paramètres de confidentialité et de sécurité"> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Paramètres du réseau Tor"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Vérifier les mises à jour du Navigateur Tor"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Protections contre les cookies"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Cliquez pour lancer Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Paramètres de confidentialité et de sécurité"> <!ENTITY torbutton.prefs.restore_defaults "Valeurs par défaut"> <!ENTITY torbutton.cookiedialog.title "Gérer les protections de cookies"> <!ENTITY torbutton.cookiedialog.lockCol "Protégé"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Supprimer tous les cookies non protégés"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protéger les nouveaux cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne pas protéger les nouveaux cookies"> -<!ENTITY torbutton.prefs.priv_caption "Paramètres de vie privée"> <!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les cookies tiers ainsi que les autres données de traçage"> <!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les détails qui vous distinguent des autres utilisateurs du Navigateur Tor"> <!ENTITY torbutton.prefs.sec_caption "Niveau de sécurité"> diff --git a/src/chrome/locale/fur/torbutton.dtd b/src/chrome/locale/fur/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/fur/torbutton.dtd +++ b/src/chrome/locale/fur/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/fy/torbutton.dtd b/src/chrome/locale/fy/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/fy/torbutton.dtd +++ b/src/chrome/locale/fy/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ga/torbutton.dtd b/src/chrome/locale/ga/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ga/torbutton.dtd +++ b/src/chrome/locale/ga/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/gl/torbutton.dtd b/src/chrome/locale/gl/torbutton.dtd index f9d0387..a01b1b0 100644 --- a/src/chrome/locale/gl/torbutton.dtd +++ b/src/chrome/locale/gl/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Nova identidade"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/gu/torbutton.dtd b/src/chrome/locale/gu/torbutton.dtd index cd91200..c228516 100644 --- a/src/chrome/locale/gu/torbutton.dtd +++ b/src/chrome/locale/gu/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "પ્રાથમિકતાઓ..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/gun/torbutton.dtd b/src/chrome/locale/gun/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/gun/torbutton.dtd +++ b/src/chrome/locale/gun/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ha/torbutton.dtd b/src/chrome/locale/ha/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ha/torbutton.dtd +++ b/src/chrome/locale/ha/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/he/torbutton.dtd b/src/chrome/locale/he/torbutton.dtd index 713efad..4b1edc4 100644 --- a/src/chrome/locale/he/torbutton.dtd +++ b/src/chrome/locale/he/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "זהות חדשה"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "הגדרות"> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "הגנות קוקיז"> diff --git a/src/chrome/locale/hi/torbutton.dtd b/src/chrome/locale/hi/torbutton.dtd index 9076425..924a6e2 100644 --- a/src/chrome/locale/hi/torbutton.dtd +++ b/src/chrome/locale/hi/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "प्रिफ़रेन्सस ..."> -<!ENTITY torbutton.context_menu.preferences.key "P/प"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A/अ"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/hr/torbutton.dtd b/src/chrome/locale/hr/torbutton.dtd index a878ecb..2cea64c 100644 --- a/src/chrome/locale/hr/torbutton.dtd +++ b/src/chrome/locale/hr/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Postavke..."> -<!ENTITY torbutton.context_menu.preferences.key "p"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "O"> <!ENTITY torbutton.context_menu.cookieProtections "Zaštite kolačića"> diff --git a/src/chrome/locale/ht/torbutton.dtd b/src/chrome/locale/ht/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ht/torbutton.dtd +++ b/src/chrome/locale/ht/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/hu/torbutton.dtd b/src/chrome/locale/hu/torbutton.dtd index 5cf204b..f0fa66e 100644 --- a/src/chrome/locale/hu/torbutton.dtd +++ b/src/chrome/locale/hu/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Új személyazonosság"> <!ENTITY torbutton.context_menu.new_identity_key "S"> -<!ENTITY torbutton.context_menu.preferences "Beállítások..."> -<!ENTITY torbutton.context_menu.preferences.key "B"> <!ENTITY torbutton.context_menu.networksettings "Hálózati beállítások megnyitása"> -<!ENTITY torbutton.context_menu.networksettings.key "M"> <!ENTITY torbutton.context_menu.downloadUpdate "Tor Böngésző csomag frissítésének letöltése"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Süti védelem"> diff --git a/src/chrome/locale/hy/torbutton.dtd b/src/chrome/locale/hy/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/hy/torbutton.dtd +++ b/src/chrome/locale/hy/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/id/torbutton.dtd b/src/chrome/locale/id/torbutton.dtd index c8a9cc2..73c4ed7 100644 --- a/src/chrome/locale/id/torbutton.dtd +++ b/src/chrome/locale/id/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Identitas Baru"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferensi..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd index f5c88ae..629ea24 100644 --- a/src/chrome/locale/is/torbutton.dtd +++ b/src/chrome/locale/is/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Nýtt auðkenni"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index 97df051..307f6a7 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Nuovo Circuito Tor per questo Sito"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Impostazioni sicurezza e privacy..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Impostazioni di rete di Tor..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Controllo per aggiornamento Tor Browser..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Protezioni dei Cookie..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Fai clic per inizializzare Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Impostazioni di Privacy e Sicurezza"> <!ENTITY torbutton.prefs.restore_defaults "Reimposta i valori di default"> <!ENTITY torbutton.cookiedialog.title "Gestisci protezione Cookies"> <!ENTITY torbutton.cookiedialog.lockCol "Protetto"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Rimuovi tutti tranne quelli protetti"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteggi i nuovi cookie"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Non proteggere i nuovi cookie"> -<!ENTITY torbutton.prefs.priv_caption "Impostazioni Privacy"> <!ENTITY torbutton.prefs.restrict_thirdparty "Limita i cookie di terze parti e altri dati di tracciamento"> <!ENTITY torbutton.prefs.resist_fingerprinting "Cambia i dettagli che ti distinguono dagli altri utenti di Tor Browser"> <!ENTITY torbutton.prefs.sec_caption "Livello di Sicurezza"> diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index ed84140..37c4c68 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -2,16 +2,12 @@ <!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.preferences "プライバシーとセキュリティー設定"> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Torネットワークの設定..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "TorBrowserのアップデートを確認"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie の防御"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Torbuttonを初期状態に戻す"> -<!ENTITY torbutton.prefs.privacy_security_settings "プライバシーとセキュリティーの設定"> <!ENTITY torbutton.prefs.restore_defaults "デフォルト設定に戻す"> <!ENTITY torbutton.cookiedialog.title "Cookie保護を管理"> <!ENTITY torbutton.cookiedialog.lockCol "保護済み"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "保護されているもの以外削除"> <!ENTITY torbutton.cookiedialog.saveAllCookies "新しいCookieを保護"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "新しいCookieを保護しない"> -<!ENTITY torbutton.prefs.priv_caption "プライバシー設定"> <!ENTITY torbutton.prefs.restrict_thirdparty "サードパーティーのCookieやその他のトラッキングデータを制限"> <!ENTITY torbutton.prefs.resist_fingerprinting "あなたとほかのTorブラウザのユーザーを区別する詳細を変更"> <!ENTITY torbutton.prefs.sec_caption "セキュリティレベル"> diff --git a/src/chrome/locale/jv/torbutton.dtd b/src/chrome/locale/jv/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/jv/torbutton.dtd +++ b/src/chrome/locale/jv/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ka/torbutton.dtd b/src/chrome/locale/ka/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ka/torbutton.dtd +++ b/src/chrome/locale/ka/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/km/torbutton.dtd b/src/chrome/locale/km/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/km/torbutton.dtd +++ b/src/chrome/locale/km/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/kn/torbutton.dtd b/src/chrome/locale/kn/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/kn/torbutton.dtd +++ b/src/chrome/locale/kn/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index 77e5f1f..61b4d53 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -2,16 +2,12 @@ <!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.preferences "개인정보 및 보안 관련 설정..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "토르 네트워크 설정..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "토르 브라우저 업데이트 체크하기..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "쿠키 보호...."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Torbutton 설정 초기화"> -<!ENTITY torbutton.prefs.privacy_security_settings "개인 정보와 보안 설정"> <!ENTITY torbutton.prefs.restore_defaults "설정 초기화"> <!ENTITY torbutton.cookiedialog.title "쿠키 보호 관리"> <!ENTITY torbutton.cookiedialog.lockCol "보호됨"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "보호된 것 빼고 모두 지우기"> <!ENTITY torbutton.cookiedialog.saveAllCookies "새로운 쿠키 보호"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "새로운 쿠키를 보호하지 않음"> -<!ENTITY torbutton.prefs.priv_caption "개인 정보 설정"> <!ENTITY torbutton.prefs.restrict_thirdparty "제 3자 쿠키와 다른 추적 데이터 제한"> <!ENTITY torbutton.prefs.resist_fingerprinting "다른 Tor browser 사용자로부터 구별되는 세부 사항 변경"> <!ENTITY torbutton.prefs.sec_caption "보안 등급"> diff --git a/src/chrome/locale/ku/torbutton.dtd b/src/chrome/locale/ku/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ku/torbutton.dtd +++ b/src/chrome/locale/ku/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/kw/torbutton.dtd b/src/chrome/locale/kw/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/kw/torbutton.dtd +++ b/src/chrome/locale/kw/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ky/torbutton.dtd b/src/chrome/locale/ky/torbutton.dtd index a77fab2..815e56d 100644 --- a/src/chrome/locale/ky/torbutton.dtd +++ b/src/chrome/locale/ky/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Жаңы инсан"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/lb/torbutton.dtd b/src/chrome/locale/lb/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/lb/torbutton.dtd +++ b/src/chrome/locale/lb/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/lg/torbutton.dtd b/src/chrome/locale/lg/torbutton.dtd index b3d1146..ee8c0d2 100644 --- a/src/chrome/locale/lg/torbutton.dtd +++ b/src/chrome/locale/lg/torbutton.dtd @@ -1,5 +1,3 @@ -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> diff --git a/src/chrome/locale/ln/torbutton.dtd b/src/chrome/locale/ln/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ln/torbutton.dtd +++ b/src/chrome/locale/ln/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/lo/torbutton.dtd b/src/chrome/locale/lo/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/lo/torbutton.dtd +++ b/src/chrome/locale/lo/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/lt/torbutton.dtd b/src/chrome/locale/lt/torbutton.dtd index 527eadb..247820d 100644 --- a/src/chrome/locale/lt/torbutton.dtd +++ b/src/chrome/locale/lt/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Nauja tapatybė"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Nustatymai..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Slapukų apsaugos"> diff --git a/src/chrome/locale/lv/torbutton.dtd b/src/chrome/locale/lv/torbutton.dtd index 1d4ea05..aed81db 100644 --- a/src/chrome/locale/lv/torbutton.dtd +++ b/src/chrome/locale/lv/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Jauna identitāte"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Atvērt tīkla iestatījumus..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Lejuplādēt Pārlūka Tor pakotnes jauninājumu..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Aizsardzība no sīkdatnēm"> diff --git a/src/chrome/locale/mg/torbutton.dtd b/src/chrome/locale/mg/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/mg/torbutton.dtd +++ b/src/chrome/locale/mg/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/mi/torbutton.dtd b/src/chrome/locale/mi/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/mi/torbutton.dtd +++ b/src/chrome/locale/mi/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/mk/torbutton.dtd b/src/chrome/locale/mk/torbutton.dtd index 6d522d2..ba2b2cb 100644 --- a/src/chrome/locale/mk/torbutton.dtd +++ b/src/chrome/locale/mk/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Подесувања..."> -<!ENTITY torbutton.context_menu.preferences.key "Z"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "Z"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ml/torbutton.dtd b/src/chrome/locale/ml/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ml/torbutton.dtd +++ b/src/chrome/locale/ml/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/mn/torbutton.dtd b/src/chrome/locale/mn/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/mn/torbutton.dtd +++ b/src/chrome/locale/mn/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/mr/torbutton.dtd b/src/chrome/locale/mr/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/mr/torbutton.dtd +++ b/src/chrome/locale/mr/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ms/torbutton.dtd b/src/chrome/locale/ms/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ms/torbutton.dtd +++ b/src/chrome/locale/ms/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/mt/torbutton.dtd b/src/chrome/locale/mt/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/mt/torbutton.dtd +++ b/src/chrome/locale/mt/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/my/torbutton.dtd b/src/chrome/locale/my/torbutton.dtd index 18d2ef8..5bd7e2f 100644 --- a/src/chrome/locale/my/torbutton.dtd +++ b/src/chrome/locale/my/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "အထောက်အထား အသစ်"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "ဦးစားပေးချက်များ..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "ကွတ်ကီး ကာကွယ်မှုများ"> diff --git a/src/chrome/locale/nah/torbutton.dtd b/src/chrome/locale/nah/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/nah/torbutton.dtd +++ b/src/chrome/locale/nah/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/nap/torbutton.dtd b/src/chrome/locale/nap/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/nap/torbutton.dtd +++ b/src/chrome/locale/nap/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/nb/torbutton.dtd b/src/chrome/locale/nb/torbutton.dtd index 4ded8d7..7e5150f 100644 --- a/src/chrome/locale/nb/torbutton.dtd +++ b/src/chrome/locale/nb/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Ny Identitet"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Innstillinger..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Åpne nettverksinnstillinger..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Last ned Tor Browser Bundle oppdatering..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Informasjonskapsel Beskyttelser"> diff --git a/src/chrome/locale/ne/torbutton.dtd b/src/chrome/locale/ne/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ne/torbutton.dtd +++ b/src/chrome/locale/ne/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index cc99538..710a24b 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -2,16 +2,12 @@ <!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.preferences "Privacy- en beveiligingsinstellingen..."> -<!ENTITY torbutton.context_menu.preferences.key "V"> <!ENTITY torbutton.context_menu.networksettings "Tor netwerk instellingen"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!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.key "C"> <!ENTITY torbutton.button.tooltip "Klik hier om Torbutton te initialiseren"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy- en beveiligingsinstellingen"> <!ENTITY torbutton.prefs.restore_defaults "Terugzetten op begintoestand"> <!ENTITY torbutton.cookiedialog.title "Beheer Cookie Beveiligingen"> <!ENTITY torbutton.cookiedialog.lockCol "Beveiligd"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Verwijder alle behalve beveiligde"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Beveilig nieuwe Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Beveilig nieuwe Cookies niet"> -<!ENTITY torbutton.prefs.priv_caption "Privacyinstellingen"> <!ENTITY torbutton.prefs.restrict_thirdparty "Beperk cookies en andere tracking-gegevens van derden"> <!ENTITY torbutton.prefs.resist_fingerprinting "Verander details die je onderscheiden van andere Tor Browser gebruikers"> <!ENTITY torbutton.prefs.sec_caption "Beveiligingsniveau"> diff --git a/src/chrome/locale/nn/torbutton.dtd b/src/chrome/locale/nn/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/nn/torbutton.dtd +++ b/src/chrome/locale/nn/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/nso/torbutton.dtd b/src/chrome/locale/nso/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/nso/torbutton.dtd +++ b/src/chrome/locale/nso/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/oc/torbutton.dtd b/src/chrome/locale/oc/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/oc/torbutton.dtd +++ b/src/chrome/locale/oc/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/or/torbutton.dtd b/src/chrome/locale/or/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/or/torbutton.dtd +++ b/src/chrome/locale/or/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/pa/torbutton.dtd b/src/chrome/locale/pa/torbutton.dtd index a81a741..f198b7c 100644 --- a/src/chrome/locale/pa/torbutton.dtd +++ b/src/chrome/locale/pa/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "S"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "p"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/pap/torbutton.dtd b/src/chrome/locale/pap/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/pap/torbutton.dtd +++ b/src/chrome/locale/pap/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd index 6eacd3e..6a42d11 100644 --- a/src/chrome/locale/pl/torbutton.dtd +++ b/src/chrome/locale/pl/torbutton.dtd @@ -2,16 +2,12 @@ <!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.preferences "Ustawienia Prywatności i Bezpieczeństwa..."> -<!ENTITY torbutton.context_menu.preferences.key "U"> <!ENTITY torbutton.context_menu.networksettings "Ustawienia Sieci Tor..."> -<!ENTITY torbutton.context_menu.networksettings.key "s"> <!ENTITY torbutton.context_menu.downloadUpdate "Sprawdź czy są aktualizacje Tor Browser..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "u"> <!ENTITY torbutton.context_menu.cookieProtections "Ochrona plików cookie..."> <!ENTITY torbutton.context_menu.cookieProtections.key "c"> <!ENTITY torbutton.button.tooltip "Kliknij tutaj, aby uruchomić Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Ustawienia prywatności i bezpieczeństwa"> <!ENTITY torbutton.prefs.restore_defaults "Ustawienia domyślne"> <!ENTITY torbutton.cookiedialog.title "Zarządzaj ochroną ciasteczek"> <!ENTITY torbutton.cookiedialog.lockCol "Chronione"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Usuń wszystkie oprócz chronionych"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Chroń nowe ciasteczka"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Nie chroń nowych ciasteczek"> -<!ENTITY torbutton.prefs.priv_caption "Ustawienia Prywatności"> <!ENTITY torbutton.prefs.restrict_thirdparty "Ograniczaj ciasteczka firm trzecich i inne dane służące do śledzenia"> <!ENTITY torbutton.prefs.resist_fingerprinting "Zmień szczegóły odróżniające Cię od innych użytkowników Przeglądarki Tora"> <!ENTITY torbutton.prefs.sec_caption "Poziom bezpieczeństwa"> diff --git a/src/chrome/locale/pms/torbutton.dtd b/src/chrome/locale/pms/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/pms/torbutton.dtd +++ b/src/chrome/locale/pms/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ps/torbutton.dtd b/src/chrome/locale/ps/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ps/torbutton.dtd +++ b/src/chrome/locale/ps/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd index 0da50f9..d7de048 100644 --- a/src/chrome/locale/pt-BR/torbutton.dtd +++ b/src/chrome/locale/pt-BR/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Nova Identidade"> <!ENTITY torbutton.context_menu.new_identity_key "Eu"> -<!ENTITY torbutton.context_menu.preferences "Configurações..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Abrir Configurações de Rede"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Baixar atualização do pacote Tor para navegadores..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Proteções para Cookies"> diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd index d262db8..e0247b5 100644 --- a/src/chrome/locale/pt/torbutton.dtd +++ b/src/chrome/locale/pt/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Novo Circuito Tor para este Site"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Configurações de Segurança e Privacidade..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Configurações da Rede Tor..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Procurar por atualizações do Navegador Tor..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Proteções de Cookies..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Clique para inicializar o Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Configurações de Privacidade e Segurança"> <!ENTITY torbutton.prefs.restore_defaults "Restaurar Predefinições"> <!ENTITY torbutton.cookiedialog.title "Gerir Proteções dos Cookies"> <!ENTITY torbutton.cookiedialog.lockCol "Protegido"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remover Tudo Exceto Protegidos"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger Novos Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Não Proteger Novos Cookies"> -<!ENTITY torbutton.prefs.priv_caption "Configurações de Privacidade"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de rastreamento"> <!ENTITY torbutton.prefs.resist_fingerprinting "Alterar os detalhes que o diferencia dos outros utilizadores do Navegador Tor"> <!ENTITY torbutton.prefs.sec_caption "Nível de Segurança"> diff --git a/src/chrome/locale/ro/torbutton.dtd b/src/chrome/locale/ro/torbutton.dtd index 03bdb6e..a367d00 100644 --- a/src/chrome/locale/ro/torbutton.dtd +++ b/src/chrome/locale/ro/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Identitate noua"> <!ENTITY torbutton.context_menu.new_identity_key "l"> -<!ENTITY torbutton.context_menu.preferences "Preferințe..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Protectii Cookie-uri."> diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index c2df4fc..d13ff00 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "Я"> <!ENTITY torbutton.context_menu.new_circuit "Новая цепочка Tor для этого cайта"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Настройки конфиденциальности и безопасности"> -<!ENTITY torbutton.context_menu.preferences.key "Н"> <!ENTITY torbutton.context_menu.networksettings "Настройки сети Tor"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Проверить на наличие обновлений Tor Browser"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Защита куки-файла"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Нажмите, чтобы инициализировать Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Настройки конфиденциальности и безопасности"> <!ENTITY torbutton.prefs.restore_defaults "Восстановить значения по умолчанию"> <!ENTITY torbutton.cookiedialog.title "Управление защитой куки-файлов"> <!ENTITY torbutton.cookiedialog.lockCol "Защищено"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Удалить все, кроме защищённых"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Защищать новые куки-файлы"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Не защищать новые куки-файлы"> -<!ENTITY torbutton.prefs.priv_caption "Настройки конфиденциальности"> <!ENTITY torbutton.prefs.restrict_thirdparty "Блокировать сторонние куки-файлы и другие данные слежения"> <!ENTITY torbutton.prefs.resist_fingerprinting "Изменить сведения, отличающие вас от других пользователей Tor Browser"> <!ENTITY torbutton.prefs.sec_caption "Уровень безопасности"> diff --git a/src/chrome/locale/sco/torbutton.dtd b/src/chrome/locale/sco/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/sco/torbutton.dtd +++ b/src/chrome/locale/sco/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/sk/torbutton.dtd b/src/chrome/locale/sk/torbutton.dtd index ef9e28c..4478825 100644 --- a/src/chrome/locale/sk/torbutton.dtd +++ b/src/chrome/locale/sk/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Nová identita"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/sl/torbutton.dtd b/src/chrome/locale/sl/torbutton.dtd index b0ce2ac..40828c9 100644 --- a/src/chrome/locale/sl/torbutton.dtd +++ b/src/chrome/locale/sl/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "nova indetiteta"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Nastavitve..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "piškotkina zaščita"> diff --git a/src/chrome/locale/so/torbutton.dtd b/src/chrome/locale/so/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/so/torbutton.dtd +++ b/src/chrome/locale/so/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/son/torbutton.dtd b/src/chrome/locale/son/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/son/torbutton.dtd +++ b/src/chrome/locale/son/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/sq/torbutton.dtd b/src/chrome/locale/sq/torbutton.dtd index 7e3df0b..8daad7b 100644 --- a/src/chrome/locale/sq/torbutton.dtd +++ b/src/chrome/locale/sq/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Identitet i Ri"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/sr/torbutton.dtd b/src/chrome/locale/sr/torbutton.dtd index 71ee79f..200e911 100644 --- a/src/chrome/locale/sr/torbutton.dtd +++ b/src/chrome/locale/sr/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Нов идентитет"> <!ENTITY torbutton.context_menu.new_identity_key "И"> -<!ENTITY torbutton.context_menu.preferences "Поставке..."> -<!ENTITY torbutton.context_menu.preferences.key "П"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Preuzmite Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Дозволе за колачиће"> diff --git a/src/chrome/locale/st/torbutton.dtd b/src/chrome/locale/st/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/st/torbutton.dtd +++ b/src/chrome/locale/st/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/su/torbutton.dtd b/src/chrome/locale/su/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/su/torbutton.dtd +++ b/src/chrome/locale/su/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index f8c0e67..e9d9a27 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "N"> <!ENTITY torbutton.context_menu.new_circuit "Ny Tor-krets för den här webbsidan"> <!ENTITY torbutton.context_menu.new_circuit_key "S"> -<!ENTITY torbutton.context_menu.preferences "Inställningar för privatliv och säkerhet..."> -<!ENTITY torbutton.context_menu.preferences.key "I"> <!ENTITY torbutton.context_menu.networksettings "Tor nätverksinställningar..."> -<!ENTITY torbutton.context_menu.networksettings.key "Ö"> <!ENTITY torbutton.context_menu.downloadUpdate "Sök efter uppdateringar för Tor webbläsare..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Skydd mot Cookies..."> <!ENTITY torbutton.context_menu.cookieProtections.key "S"> <!ENTITY torbutton.button.tooltip "Klicka för att installera Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Integritet- och säkerhetsinställningar"> <!ENTITY torbutton.prefs.restore_defaults "Återställ till standard"> <!ENTITY torbutton.cookiedialog.title "Hantera skyddade kakor"> <!ENTITY torbutton.cookiedialog.lockCol "Skyddad"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Ta bort alla icke-skyddade"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Skydda nya kakor"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Skydda inte nya kakor"> -<!ENTITY torbutton.prefs.priv_caption "Sekretessinställningar"> <!ENTITY torbutton.prefs.restrict_thirdparty "Begränsa tredjepartskakor och annan tracking data"> <!ENTITY torbutton.prefs.resist_fingerprinting "Ändra detailjer som utmärker dig ifrån andra Tor Browser användare"> <!ENTITY torbutton.prefs.sec_caption "Säkerhetsnivå"> diff --git a/src/chrome/locale/sw/torbutton.dtd b/src/chrome/locale/sw/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/sw/torbutton.dtd +++ b/src/chrome/locale/sw/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ta/torbutton.dtd b/src/chrome/locale/ta/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ta/torbutton.dtd +++ b/src/chrome/locale/ta/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/te/torbutton.dtd b/src/chrome/locale/te/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/te/torbutton.dtd +++ b/src/chrome/locale/te/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/tg/torbutton.dtd b/src/chrome/locale/tg/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/tg/torbutton.dtd +++ b/src/chrome/locale/tg/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/th/torbutton.dtd b/src/chrome/locale/th/torbutton.dtd index 3336433..70d1df2 100644 --- a/src/chrome/locale/th/torbutton.dtd +++ b/src/chrome/locale/th/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "สร้างตัวตนใหม่"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "A"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ti/torbutton.dtd b/src/chrome/locale/ti/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ti/torbutton.dtd +++ b/src/chrome/locale/ti/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/tk/torbutton.dtd b/src/chrome/locale/tk/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/tk/torbutton.dtd +++ b/src/chrome/locale/tk/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index b67fd14..d6c87d1 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Bu site için Tor devresini yenile"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Gizlilik ve Güvenlik Ayarları..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Tor Ağ Ayarları..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser Güncelleme Denetimi..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Çerez Koruması..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Torbutton uygulamasını başlatmak için tıklayın"> -<!ENTITY torbutton.prefs.privacy_security_settings "Gizlilik ve Güvenlik Ayarları"> <!ENTITY torbutton.prefs.restore_defaults "Varsayılanları Yükle"> <!ENTITY torbutton.cookiedialog.title "Çerez Koruması Yönetimi"> <!ENTITY torbutton.cookiedialog.lockCol "Korunmuş"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Korunanlar Dışında Tümünü Sil"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Yeni Çerezleri Koru"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Yeni Çerezleri Koruma"> -<!ENTITY torbutton.prefs.priv_caption "Gizlilik Ayarları"> <!ENTITY torbutton.prefs.restrict_thirdparty "3. taraf çerez ve diğer iz sürücü bilgiler engellensin"> <!ENTITY torbutton.prefs.resist_fingerprinting "Diğer Tor Browser kullanıcılarından sizi ayıran ayrıntılar değiştirilsin"> <!ENTITY torbutton.prefs.sec_caption "Güvenlik Düzeyi"> diff --git a/src/chrome/locale/uk/torbutton.dtd b/src/chrome/locale/uk/torbutton.dtd index 7df0268..d551178 100644 --- a/src/chrome/locale/uk/torbutton.dtd +++ b/src/chrome/locale/uk/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Нова особистість"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Налаштування..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Відкрити Налаштування Мережі..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Завантажити пакет оновлень переглядача Tor..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Захист куки"> diff --git a/src/chrome/locale/ur/torbutton.dtd b/src/chrome/locale/ur/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ur/torbutton.dtd +++ b/src/chrome/locale/ur/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ve/torbutton.dtd b/src/chrome/locale/ve/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ve/torbutton.dtd +++ b/src/chrome/locale/ve/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd index 4cfa289..25fbcec 100644 --- a/src/chrome/locale/vi/torbutton.dtd +++ b/src/chrome/locale/vi/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Vòng Tor mới cho trang này"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Cài đặt Riêng tư và Bảo mật..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Cài đặt Mạng Tor..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Kiểm tra việc cập nhật trình duyệt Tor"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Bảo vệ Cookie..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Nhấp để nhận diện Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Cài đặt Riêng tư và Bảo mật"> <!ENTITY torbutton.prefs.restore_defaults "Khôi phục Mặc định"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.priv_caption "Cài đặt Riêng tư"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> <!ENTITY torbutton.prefs.sec_caption "Mức độ Bảo mật"> diff --git a/src/chrome/locale/wa/torbutton.dtd b/src/chrome/locale/wa/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/wa/torbutton.dtd +++ b/src/chrome/locale/wa/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/wo/torbutton.dtd b/src/chrome/locale/wo/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/wo/torbutton.dtd +++ b/src/chrome/locale/wo/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 347deeb..a73d4dd 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -2,16 +2,12 @@ <!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.preferences "隐私与安全设置…"> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Tor 网络设置…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!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.key "C"> <!ENTITY torbutton.button.tooltip "点此初始化 Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "隐私与安全设置"> <!ENTITY torbutton.prefs.restore_defaults "恢复默认设置"> <!ENTITY torbutton.cookiedialog.title "管理受保护的 Cookie"> <!ENTITY torbutton.cookiedialog.lockCol "受保护"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "全部移除仅保留受保护的 Cookie"> <!ENTITY torbutton.cookiedialog.saveAllCookies "保护新的 Cookie"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "不保护新的 Cookie"> -<!ENTITY torbutton.prefs.priv_caption "隐私设置"> <!ENTITY torbutton.prefs.restrict_thirdparty "限制第三方 cookie 和其他数据跟踪程序"> <!ENTITY torbutton.prefs.resist_fingerprinting "修改 Tor 浏览器中可区分你与其他 Tor 用户的细节信息"> <!ENTITY torbutton.prefs.sec_caption "安全等级"> diff --git a/src/chrome/locale/zh-HK/torbutton.dtd b/src/chrome/locale/zh-HK/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/zh-HK/torbutton.dtd +++ b/src/chrome/locale/zh-HK/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd index ebc2dda..0f98a7a 100644 --- a/src/chrome/locale/zh-TW/torbutton.dtd +++ b/src/chrome/locale/zh-TW/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "更換身份"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "設置...(P)"> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/zu/torbutton.dtd b/src/chrome/locale/zu/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/zu/torbutton.dtd +++ b/src/chrome/locale/zu/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">

1 0

[tor-browser-bundle/maint-6.0] Bug 20342: Add tor-gencert.exe to expert bundle
by gk＠torproject.org 13 Oct '16

13 Oct '16

commit 43cf1a1ce71a143a29819d149fa0da44cf7c8dc7 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 13 07:35:59 2016 +0000 Bug 20342: Add tor-gencert.exe to expert bundle --- gitian/descriptors/windows/gitian-tor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 63b527a..49d86dd 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -75,6 +75,10 @@ script: | make install cd ../.. install -s $INSTDIR/bin/tor.exe $INSTDIR/Tor/ + if [ "$BUILD" == "expert" ] + then + install -s $INSTDIR/bin/tor-gencert.exe $INSTDIR/Tor/ + fi cp $INSTDIR/share/tor/geoip $INSTDIR/Data/Tor/ cp $INSTDIR/share/tor/geoip6 $INSTDIR/Data/Tor/

1 0

[tor-browser-bundle/master] Bug 20342: Add tor-gencert.exe to expert bundle
by gk＠torproject.org 13 Oct '16

13 Oct '16

commit 9d1f518b29b254bbfcd15fc69f7d149687eb49c8 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 13 07:35:59 2016 +0000 Bug 20342: Add tor-gencert.exe to expert bundle --- gitian/descriptors/windows/gitian-tor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 63b527a..49d86dd 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -75,6 +75,10 @@ script: | make install cd ../.. install -s $INSTDIR/bin/tor.exe $INSTDIR/Tor/ + if [ "$BUILD" == "expert" ] + then + install -s $INSTDIR/bin/tor-gencert.exe $INSTDIR/Tor/ + fi cp $INSTDIR/share/tor/geoip $INSTDIR/Data/Tor/ cp $INSTDIR/share/tor/geoip6 $INSTDIR/Data/Tor/

1 0

[tor-browser-bundle/master] Bug 20217: check that OSX incremental MARs are made with code signing
by gk＠torproject.org 11 Oct '16

11 Oct '16

commit 9836227e4ae27123a3eb27167dc6dca13b5d1027 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 10 19:44:10 2016 +0200 Bug 20217: check that OSX incremental MARs are made with code signing When updating the OSX incremental MAR files after running dmg2mar, we check that both the old and the new mar files contain code signing. We don't check this while creating the incremental MAR files during the build. --- gitian/Makefile | 4 ++-- tools/update-responses/update_responses | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index f008834..a4a757f 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -48,12 +48,12 @@ signmars-nightly: dmg2mars: cd $(shell ../tools/update-responses/get_channel_version release) && ../../tools/dmg2mar $(TORSOCKS) ../tools/update-responses/download_missing_versions release - MAR_SKIP_EXISTING=1 ../tools/update-responses/gen_incrementals release + CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 ../tools/update-responses/gen_incrementals release dmg2mars-alpha: cd $(shell ../tools/update-responses/get_channel_version alpha) && ../../tools/dmg2mar $(TORSOCKS) ../tools/update-responses/download_missing_versions alpha - MAR_SKIP_EXISTING=1 ../tools/update-responses/gen_incrementals alpha + CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 ../tools/update-responses/gen_incrementals alpha update_responses: ../tools/update-responses/update_responses release diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 7962f69..ceba144 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -197,6 +197,12 @@ sub create_incremental_mar { my $tmpdir = File::Temp->newdir(); extract_mar(mar_filename($from_version, $os, $lang), "$tmpdir/A"); extract_mar(mar_filename($new_version, $os, $lang), "$tmpdir/B"); + if ($ENV{CHECK_CODESIGNATURE_EXISTS}) { + unless (-f "$tmpdir/A/TorBrowser.app/Contents/_CodeSignature/CodeResources" + && -f "$tmpdir/B/TorBrowser.app/Contents/_CodeSignature/CodeResources") { + exit_error "Missing code signature while creating $mar_file"; + } + } my ($out, $err, $success) = capture_exec('make_incremental_update.sh', $mar_file_path, "$tmpdir/A", "$tmpdir/B"); if (!$success) {

1 0

[tor-browser-bundle/maint-6.0] Bump OpenSSL to 1.0.1u
by gk＠torproject.org 06 Oct '16

06 Oct '16

commit 531a442020e99d600386903aec0256e060842ace Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 6 08:59:39 2016 +0000 Bump OpenSSL to 1.0.1u --- gitian/versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions b/gitian/versions index 170e6df..85b2a7a 100755 --- a/gitian/versions +++ b/gitian/versions @@ -44,7 +44,7 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-4-1 -OPENSSL_VER=1.0.1t +OPENSSL_VER=1.0.1u GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -94,7 +94,7 @@ NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=4a6ee491a2fdb22e519c76fdc2a628bb3cec12762cd456861d207996c8a07088 +OPENSSL_HASH=4312b4ca1215b6f2c97007503d80db80d5157f76f8f7d3febbe6b4c56ff26739 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] Work around Mozilla's 1305396
by gk＠torproject.org 06 Oct '16

06 Oct '16

commit 08136fae2fb1fb6b6713b0821c8cf6ea5666d192 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 27 08:26:07 2016 +0000 Work around Mozilla's 1305396 --- security/pkix/lib/pkixnames.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/security/pkix/lib/pkixnames.cpp b/security/pkix/lib/pkixnames.cpp index 37c6c79..2cec4f0 100644 --- a/security/pkix/lib/pkixnames.cpp +++ b/security/pkix/lib/pkixnames.cpp @@ -37,6 +37,8 @@ #include "pkixcheck.h" #include "pkixutil.h" +#include <cstring> + namespace mozilla { namespace pkix { namespace {

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 1245076 - Don't include mozalloc.h from the cstdlib wrapper. r=froydnj
by gk＠torproject.org 06 Oct '16

06 Oct '16

commit ef6b1ceff3996006497ebbdbd02104031eaf64f5 Author: Mike Hommey <mh+mozilla(a)glandium.org> Date: Thu Mar 10 16:54:05 2016 +0900 Bug 1245076 - Don't include mozalloc.h from the cstdlib wrapper. r=froydnj Our STL wrappers do various different things, one of which is including mozalloc.h for infallible operator new. mozalloc.h includes stdlib.h, which, in libstdc++ >= 6 is now itself a wrapper around cstdlib, which circles back to our STL wrapper. But of the things our STL wrappers do, including mozalloc.h is not one that is necessary for cstdlib. So skip including mozalloc.h in our cstdlib wrapper. Additionally, some C++ sources (in media/mtransport) are including headers in an extern "C" block, which end up including stdlib.h, which ends up including cstdlib because really, this is all C++, and our wrapper pre-includes <new> for mozalloc.h, which fails because templates don't work inside extern "C". So, don't pre-include <new> when we're not including mozalloc.h. --- config/gcc-stl-wrapper.template.h | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/config/gcc-stl-wrapper.template.h b/config/gcc-stl-wrapper.template.h index 75bbe75..b5ebeec 100644 --- a/config/gcc-stl-wrapper.template.h +++ b/config/gcc-stl-wrapper.template.h @@ -17,6 +17,11 @@ // Silence "warning: #include_next is a GCC extension" #pragma GCC system_header +// Don't include mozalloc for cstdlib. See bug 1245076. +#ifndef moz_dont_include_mozalloc_for_cstdlib +# define moz_dont_include_mozalloc_for_cstdlib +#endif +#ifndef moz_dont_include_mozalloc_for_${HEADER} // mozalloc.h wants <new>; break the cycle by always explicitly // including <new> here. NB: this is a tad sneaky. Sez the gcc docs: // @@ -25,15 +30,17 @@ // same name as the current file. It simply looks for the file // named, starting with the directory in the search path after the // one where the current file was found. -#include_next <new> +# include_next <new> // See if we're in code that can use mozalloc. NB: this duplicates // code in nscore.h because nscore.h pulls in prtypes.h, and chromium // can't build with that being included before base/basictypes.h. -#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) -# include "mozilla/mozalloc.h" -#else -# error "STL code can only be used with infallible ::operator new()" +# if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) +# include "mozilla/mozalloc.h" +# else +# error "STL code can only be used with infallible ::operator new()" +# endif + #endif #if defined(DEBUG) && !defined(_GLIBCXX_DEBUG)

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 1272647 - Exclude NameTable.cpp from unified compilation because #include <cmath> in other source files causes gcc6 compilation failure. r=bas
by gk＠torproject.org 06 Oct '16

06 Oct '16

commit e2e11538f13e7eb4aa8bd9daf8f3d89c1434c1ef Author: Jonathan Kew <jkew(a)mozilla.com> Date: Wed May 18 15:22:54 2016 +0100 Bug 1272647 - Exclude NameTable.cpp from unified compilation because #include <cmath> in other source files causes gcc6 compilation failure. r=bas --- gfx/graphite2/src/moz.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gfx/graphite2/src/moz.build b/gfx/graphite2/src/moz.build index 4008b77..c18c6f4 100644 --- a/gfx/graphite2/src/moz.build +++ b/gfx/graphite2/src/moz.build @@ -45,7 +45,6 @@ UNIFIED_SOURCES += [ 'Intervals.cpp', 'json.cpp', 'Justifier.cpp', - 'NameTable.cpp', 'Pass.cpp', 'Position.cpp', 'SegCache.cpp', @@ -59,6 +58,12 @@ UNIFIED_SOURCES += [ 'UtfCodec.cpp', ] +# Excluded from UNIFIED_SOURCES because <cmath> from other files breaks it, +# see bug 1272647. +SOURCES += [ + 'NameTable.cpp', +] + # tell graphite2 not to export symbols, we'll be linking it directly with # thebes DEFINES['GRAPHITE2_STATIC'] = True

1 0

[tor-browser-bundle/master] Bug 13893: Make Tor Browser compatible with EMET
by gk＠torproject.org 06 Oct '16

06 Oct '16

commit 0348263efd1cb8a9eca8737f3dc7734ef75e0966 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 29 09:31:55 2016 +0000 Bug 13893: Make Tor Browser compatible with EMET Bumping GCC to 6.2.0 is fixing our EMET incompatibilities. The exact change on GCC's side causing this remains unclear, though. We need to backout GCC changes that are causing a mingw-w64 build to fail. For details see the bug report in GCC's bugtracker: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77459 --- gitian/descriptors/windows/gitian-utils.yml | 7 + gitian/patches/gcc_62_1.patch | 23 + gitian/patches/gcc_62_2.patch | 1198 +++++++++++++++++++++++++++ gitian/versions.alpha | 6 +- gitian/versions.nightly | 6 +- 5 files changed, 1234 insertions(+), 6 deletions(-) diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 9c31834..d3598e2 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -35,6 +35,8 @@ files: - "nsis.tar.bz2" - "nsis-debian.tar.xz" - "nsis-missing-unistd-include.patch" +- "gcc_62_1.patch" +- "gcc_62_2.patch" script: | INSTDIR="$HOME/install" source versions @@ -79,6 +81,11 @@ script: | mkdir gcc cd gcc tar -xjvf ../gcc.tar.bz2 + cd gcc-* + # Workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77459. + patch -p1 < ~/build/gcc_62_1.patch + patch -p1 < ~/build/gcc_62_2.patch + cd .. # We don't want to link against msvcrt.dll due to bug 9084. i686-w64-mingw32-g++ -dumpspecs > ~/build/msvcr100.spec sed 's/msvcrt/msvcr100/' -i ~/build/msvcr100.spec diff --git a/gitian/patches/gcc_62_1.patch b/gitian/patches/gcc_62_1.patch new file mode 100644 index 0000000..7ca36d8 --- /dev/null +++ b/gitian/patches/gcc_62_1.patch @@ -0,0 +1,23 @@ +From 1ec6206ea80ceb5df843ea0bc4ef04d9ab17257e Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Wed, 14 Sep 2016 12:53:19 +0000 +Subject: [PATCH 1/2] Revert "2015-09-17 Catherine Moore + <clm(a)codesourcery.com>" + +This reverts commit a63a17505346bb3a91ce3de6fe238264c4d849ac. + +diff --git a/libstdc++-v3/src/c++11/debug.cc b/libstdc++-v3/src/c++11/debug.cc +index f25304c..308802e 100644 +--- a/libstdc++-v3/src/c++11/debug.cc ++++ b/libstdc++-v3/src/c++11/debug.cc +@@ -32,7 +32,6 @@ + #include <debug/safe_local_iterator.h> + + #include <cassert> +-#include <cstdio> + + #include <algorithm> // for std::min + #include <functional> // for _Hash_impl +-- +2.9.3 + diff --git a/gitian/patches/gcc_62_2.patch b/gitian/patches/gcc_62_2.patch new file mode 100644 index 0000000..7dbd826 --- /dev/null +++ b/gitian/patches/gcc_62_2.patch @@ -0,0 +1,1198 @@ +From 0fbc32fdb5e0119877b0fd608d8855af0e4e376e Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Wed, 14 Sep 2016 12:54:30 +0000 +Subject: [PATCH 2/2] =?UTF-8?q?Revert=20"2015-09-17=20=20Fran=C3=A7ois=20D?= + =?UTF-8?q?umont=20=20<fdumont(a)gcc.gnu.org>"?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit 426075db14da88357dd104345b5edea369f1d5c6. + +diff --git a/libstdc++-v3/include/debug/formatter.h b/libstdc++-v3/include/debug/formatter.h +index 72db612..7d4f027 100644 +--- a/libstdc++-v3/include/debug/formatter.h ++++ b/libstdc++-v3/include/debug/formatter.h +@@ -132,13 +132,6 @@ namespace __gnu_debug + + class _Error_formatter + { +- // Tags denoting the type of parameter for construction +- struct _Is_iterator { }; +- struct _Is_iterator_value_type { }; +- struct _Is_sequence { }; +- struct _Is_instance { }; +- +- public: + /// Whether an iterator is constant, mutable, or unknown + enum _Constness + { +@@ -160,6 +153,13 @@ namespace __gnu_debug + __last_state + }; + ++ // Tags denoting the type of parameter for construction ++ struct _Is_iterator { }; ++ struct _Is_iterator_value_type { }; ++ struct _Is_sequence { }; ++ struct _Is_instance { }; ++ ++ public: + // A parameter that may be referenced by an error message + struct _Parameter + { +@@ -375,16 +375,15 @@ namespace __gnu_debug + + void + _M_print_field(const _Error_formatter* __formatter, +- const char* __name) const _GLIBCXX_DEPRECATED; ++ const char* __name) const; + + void +- _M_print_description(const _Error_formatter* __formatter) +- const _GLIBCXX_DEPRECATED; ++ _M_print_description(const _Error_formatter* __formatter) const; + }; + + template<typename _Iterator> +- _Error_formatter& +- _M_iterator(const _Iterator& __it, const char* __name = 0) ++ const _Error_formatter& ++ _M_iterator(const _Iterator& __it, const char* __name = 0) const + { + if (_M_num_parameters < std::size_t(__max_parameters)) + _M_parameters[_M_num_parameters++] = _Parameter(__it, __name, +@@ -393,59 +392,57 @@ namespace __gnu_debug + } + + template<typename _Iterator> +- _Error_formatter& ++ const _Error_formatter& + _M_iterator_value_type(const _Iterator& __it, +- const char* __name = 0) ++ const char* __name = 0) const + { +- if (_M_num_parameters < __max_parameters) ++ if (_M_num_parameters < std::size_t(__max_parameters)) + _M_parameters[_M_num_parameters++] = + _Parameter(__it, __name, _Is_iterator_value_type()); + return *this; + } + +- _Error_formatter& +- _M_integer(long __value, const char* __name = 0) ++ const _Error_formatter& ++ _M_integer(long __value, const char* __name = 0) const + { +- if (_M_num_parameters < __max_parameters) ++ if (_M_num_parameters < std::size_t(__max_parameters)) + _M_parameters[_M_num_parameters++] = _Parameter(__value, __name); + return *this; + } + +- _Error_formatter& +- _M_string(const char* __value, const char* __name = 0) ++ const _Error_formatter& ++ _M_string(const char* __value, const char* __name = 0) const + { +- if (_M_num_parameters < __max_parameters) ++ if (_M_num_parameters < std::size_t(__max_parameters)) + _M_parameters[_M_num_parameters++] = _Parameter(__value, __name); + return *this; + } + + template<typename _Sequence> +- _Error_formatter& +- _M_sequence(const _Sequence& __seq, const char* __name = 0) ++ const _Error_formatter& ++ _M_sequence(const _Sequence& __seq, const char* __name = 0) const + { +- if (_M_num_parameters < __max_parameters) ++ if (_M_num_parameters < std::size_t(__max_parameters)) + _M_parameters[_M_num_parameters++] = _Parameter(__seq, __name, + _Is_sequence()); + return *this; + } + + template<typename _Type> +- _Error_formatter& +- _M_instance(const _Type& __inst, const char* __name = 0) ++ const _Error_formatter& ++ _M_instance(const _Type& __inst, const char* __name = 0) const + { +- if (_M_num_parameters < __max_parameters) ++ if (_M_num_parameters < std::size_t(__max_parameters)) + _M_parameters[_M_num_parameters++] = _Parameter(__inst, __name, + _Is_instance()); + return *this; + } + +- _Error_formatter& +- _M_message(const char* __text) ++ const _Error_formatter& ++ _M_message(const char* __text) const + { _M_text = __text; return *this; } + +- // Kept const qualifier for backward compatibility, to keep the same +- // exported symbol. +- _Error_formatter& ++ const _Error_formatter& + _M_message(_Debug_msg_id __id) const throw (); + + _GLIBCXX_NORETURN void +@@ -453,38 +450,40 @@ namespace __gnu_debug + + template<typename _Tp> + void +- _M_format_word(char*, int, const char*, _Tp) +- const throw () _GLIBCXX_DEPRECATED; ++ _M_format_word(char*, int, const char*, _Tp) const throw (); + + void +- _M_print_word(const char* __word) const _GLIBCXX_DEPRECATED; ++ _M_print_word(const char* __word) const; + + void +- _M_print_string(const char* __string) const _GLIBCXX_DEPRECATED; ++ _M_print_string(const char* __string) const; + + private: +- _Error_formatter(const char* __file, unsigned int __line) +- : _M_file(__file), _M_line(__line), _M_num_parameters(0), _M_text(0) +- { } ++ _Error_formatter(const char* __file, std::size_t __line) ++ : _M_file(__file), _M_line(__line), _M_num_parameters(0), _M_text(0), ++ _M_max_length(78), _M_column(1), _M_first_line(true), _M_wordwrap(false) ++ { _M_get_max_length(); } + + void +- _M_get_max_length() const throw () _GLIBCXX_DEPRECATED; ++ _M_get_max_length() const throw (); + + enum { __max_parameters = 9 }; + + const char* _M_file; +- unsigned int _M_line; +- _Parameter _M_parameters[__max_parameters]; +- unsigned int _M_num_parameters; +- const char* _M_text; ++ std::size_t _M_line; ++ mutable _Parameter _M_parameters[__max_parameters]; ++ mutable std::size_t _M_num_parameters; ++ mutable const char* _M_text; ++ mutable std::size_t _M_max_length; ++ enum { _M_indent = 4 } ; ++ mutable std::size_t _M_column; ++ mutable bool _M_first_line; ++ mutable bool _M_wordwrap; + + public: +- static _Error_formatter& +- _M_at(const char* __file, unsigned int __line) +- { +- static _Error_formatter __formatter(__file, __line); +- return __formatter; +- } ++ static _Error_formatter ++ _M_at(const char* __file, std::size_t __line) ++ { return _Error_formatter(__file, __line); } + }; + } // namespace __gnu_debug + +diff --git a/libstdc++-v3/src/c++11/debug.cc b/libstdc++-v3/src/c++11/debug.cc +index 308802e..8f7eaa3 100644 +--- a/libstdc++-v3/src/c++11/debug.cc ++++ b/libstdc++-v3/src/c++11/debug.cc +@@ -22,19 +22,18 @@ + // see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + // <http://www.gnu.org/licenses/>. + +-#include <bits/move.h> +-#include <bits/stl_iterator_base_types.h> +- +-#include <debug/formatter.h> ++#include <debug/debug.h> + #include <debug/safe_base.h> + #include <debug/safe_unordered_base.h> + #include <debug/safe_iterator.h> + #include <debug/safe_local_iterator.h> +- ++#include <algorithm> + #include <cassert> +- +-#include <algorithm> // for std::min +-#include <functional> // for _Hash_impl ++#include <cstring> ++#include <cctype> ++#include <cstdio> ++#include <cstdlib> ++#include <functional> + + #include <cxxabi.h> // for __cxa_demangle + +@@ -525,123 +524,37 @@ namespace __gnu_debug + + namespace + { +- using _Error_formatter = __gnu_debug::_Error_formatter; +- using _Parameter = __gnu_debug::_Error_formatter::_Parameter; +- +- template<typename _Tp> +- int +- format_word(char* buf, int n, const char* fmt, _Tp s) +- { return std::min(__builtin_snprintf(buf, n, fmt, s), n - 1); } +- +- void +- get_max_length(std::size_t& max_length) +- { +- const char* nptr = std::getenv("GLIBCXX_DEBUG_MESSAGE_LENGTH"); +- if (nptr) +- { +- char* endptr; +- const unsigned long ret = std::strtoul(nptr, &endptr, 0); +- if (*nptr != '\0' && *endptr == '\0') +- max_length = ret; +- } +- } +- +- struct PrintContext +- { +- PrintContext() +- : _M_max_length(78), _M_column(1), _M_first_line(true), _M_wordwrap(false) +- { get_max_length(_M_max_length); } +- +- std::size_t _M_max_length; +- enum { _M_indent = 4 } ; +- std::size_t _M_column; +- bool _M_first_line; +- bool _M_wordwrap; +- }; +- +- void +- print_word(PrintContext& ctx, const char* word, +- std::ptrdiff_t count = -1) +- { +- size_t length = count >= 0 ? count : __builtin_strlen(word); +- if (length == 0) +- return; +- +- // Consider first '\n' at begining cause it impacts column. +- if (word[0] == '\n') +- { +- fprintf(stderr, "\n"); +- ctx._M_column = 1; +- ++word; +- --length; +- +- if (length == 0) +- return; +- } +- +- size_t visual_length +- = isspace(word[length - 1]) ? length - 1 : length; +- if (visual_length == 0 +- || !ctx._M_wordwrap +- || (ctx._M_column + visual_length < ctx._M_max_length) +- || (visual_length >= ctx._M_max_length && ctx._M_column == 1)) +- { +- // If this isn't the first line, indent +- if (ctx._M_column == 1 && !ctx._M_first_line) +- { +- char spacing[ctx._M_indent + 1]; +- for (int i = 0; i < ctx._M_indent; ++i) +- spacing[i] = ' '; +- spacing[ctx._M_indent] = '\0'; +- fprintf(stderr, "%s", spacing); +- ctx._M_column += ctx._M_indent; +- } +- +- int written = fprintf(stderr, "%s", word); +- +- if (word[length - 1] == '\n') +- { +- ctx._M_first_line = false; +- ctx._M_column = 1; +- } +- else +- ctx._M_column += written; +- } +- else +- { +- print_word(ctx, "\n", 1); +- print_word(ctx, word, count); +- } +- } +- + void +- print_type(PrintContext& ctx, +- const type_info* info, +- const char* unknown_name) ++ print_type(const __gnu_debug::_Error_formatter* __formatter, ++ const type_info* __info, ++ const char* __unknown_name) + { +- if (!info) +- print_word(ctx, unknown_name); ++ if (!__info) ++ __formatter->_M_print_word(__unknown_name); + else + { +- int status; +- char* demangled_name = +- __cxxabiv1::__cxa_demangle(info->name(), NULL, NULL, &status); +- print_word(ctx, status == 0 ? demangled_name : info->name()); +- free(demangled_name); ++ int __status; ++ char* __demangled_name = ++ __cxxabiv1::__cxa_demangle(__info->name(), NULL, NULL, &__status); ++ __formatter->_M_print_word(__status == 0 ++ ? __demangled_name : __info->name()); ++ free(__demangled_name); + } + } + + bool +- print_field(PrintContext& ctx, +- const char* name, const _Parameter::_Type& type) ++ print_field( ++ const __gnu_debug::_Error_formatter* __formatter, ++ const char* __name, ++ const __gnu_debug::_Error_formatter::_Parameter::_Type& __variant) + { +- if (__builtin_strcmp(name, "name") == 0) ++ if (strcmp(__name, "name") == 0) + { +- assert(type._M_name); +- print_word(ctx, type._M_name); ++ assert(__variant._M_name); ++ __formatter->_M_print_word(__variant._M_name); + } +- else if (__builtin_strcmp(name, "type") == 0) +- print_type(ctx, type._M_type, "<unknown type>"); ++ else if (strcmp(__name, "type") == 0) ++ print_type(__formatter, __variant._M_type, "<unknown type>"); + else + return false; + +@@ -649,17 +562,21 @@ namespace + } + + bool +- print_field(PrintContext& ctx, +- const char* name, const _Parameter::_Instance& inst) ++ print_field( ++ const __gnu_debug::_Error_formatter* __formatter, ++ const char* __name, ++ const __gnu_debug::_Error_formatter::_Parameter::_Instance& __variant) + { +- const _Parameter::_Type& type = inst; +- if (print_field(ctx, name, type)) ++ const __gnu_debug::_Error_formatter::_Parameter::_Type& __type = __variant; ++ if (print_field(__formatter, __name, __type)) + { } +- else if (__builtin_strcmp(name, "address") == 0) ++ else if (strcmp(__name, "address") == 0) + { +- char buf[64]; +- int ret = __builtin_sprintf(buf, "%p", inst._M_address); +- print_word(ctx, buf, ret); ++ const int __bufsize = 64; ++ char __buf[__bufsize]; ++ __formatter->_M_format_word(__buf, __bufsize, "%p", ++ __variant._M_address); ++ __formatter->_M_print_word(__buf); + } + else + return false; +@@ -668,390 +585,278 @@ namespace + } + + void +- print_field(PrintContext& ctx, const _Parameter& param, const char* name) +- { +- assert(param._M_kind != _Parameter::__unused_param); +- const int bufsize = 64; +- char buf[bufsize]; +- +- const auto& variant = param._M_variant; +- switch (param._M_kind) +- { +- case _Parameter::__iterator: +- { +- const auto& iterator = variant._M_iterator; +- if (print_field(ctx, name, iterator)) +- { } +- else if (__builtin_strcmp(name, "constness") == 0) +- { +- static const char* +- constness_names[_Error_formatter::__last_constness] = +- { +- "<unknown>", +- "constant", +- "mutable" +- }; +- print_word(ctx, constness_names[iterator._M_constness]); +- } +- else if (__builtin_strcmp(name, "state") == 0) +- { +- static const char* +- state_names[_Error_formatter::__last_state] = +- { +- "<unknown>", +- "singular", +- "dereferenceable (start-of-sequence)", +- "dereferenceable", +- "past-the-end", +- "before-begin" +- }; +- print_word(ctx, state_names[iterator._M_state]); +- } +- else if (__builtin_strcmp(name, "sequence") == 0) +- { +- assert(iterator._M_sequence); +- int written = __builtin_sprintf(buf, "%p", iterator._M_sequence); +- print_word(ctx, buf, written); +- } +- else if (__builtin_strcmp(name, "seq_type") == 0) +- print_type(ctx, iterator._M_seq_type, "<unknown seq_type>"); +- else +- assert(false); +- } +- break; +- +- case _Parameter::__sequence: +- if (!print_field(ctx, name, variant._M_sequence)) +- assert(false); +- break; +- +- case _Parameter::__integer: +- if (__builtin_strcmp(name, "name") == 0) +- { +- assert(variant._M_integer._M_name); +- print_word(ctx, variant._M_integer._M_name); +- } +- else +- assert(false); +- break; +- +- case _Parameter::__string: +- if (__builtin_strcmp(name, "name") == 0) +- { +- assert(variant._M_string._M_name); +- print_word(ctx, variant._M_string._M_name); +- } +- else +- assert(false); +- break; +- +- case _Parameter::__instance: +- if (!print_field(ctx, name, variant._M_instance)) +- assert(false); +- break; +- +- case _Parameter::__iterator_value_type: +- if (!print_field(ctx, name, variant._M_iterator_value_type)) +- assert(false); +- break; +- +- default: +- assert(false); +- break; +- } +- } +- +- void +- print_description(PrintContext& ctx, const _Parameter::_Type& type) ++ print_description( ++ const __gnu_debug::_Error_formatter* __formatter, ++ const __gnu_debug::_Error_formatter::_Parameter::_Type& __variant) + { +- if (type._M_name) ++ if (__variant._M_name) + { +- const int bufsize = 64; +- char buf[bufsize]; +- int written +- = format_word(buf, bufsize, "\"%s\"", type._M_name); +- print_word(ctx, buf, written); ++ const int __bufsize = 64; ++ char __buf[__bufsize]; ++ __formatter->_M_format_word(__buf, __bufsize, "\"%s\"", ++ __variant._M_name); ++ __formatter->_M_print_word(__buf); + } + +- print_word(ctx, " {\n"); ++ __formatter->_M_print_word(" {\n"); + +- if (type._M_type) ++ if (__variant._M_type) + { +- print_word(ctx, " type = "); +- print_type(ctx, type._M_type, "<unknown type>"); +- print_word(ctx, ";\n"); ++ __formatter->_M_print_word(" type = "); ++ print_type(__formatter, __variant._M_type, "<unknown type>"); ++ __formatter->_M_print_word(";\n"); + } + } + ++ + void +- print_description(PrintContext& ctx, const _Parameter::_Instance& inst) ++ print_description( ++ const __gnu_debug::_Error_formatter* __formatter, ++ const __gnu_debug::_Error_formatter::_Parameter::_Instance& __variant) + { +- const int bufsize = 64; +- char buf[bufsize]; ++ const int __bufsize = 64; ++ char __buf[__bufsize]; + +- if (inst._M_name) ++ if (__variant._M_name) + { +- int written +- = format_word(buf, bufsize, "\"%s\" ", inst._M_name); +- print_word(ctx, buf, written); ++ __formatter->_M_format_word(__buf, __bufsize, "\"%s\" ", ++ __variant._M_name); ++ __formatter->_M_print_word(__buf); + } + +- int written +- = __builtin_sprintf(buf, "@ 0x%p {\n", inst._M_address); +- print_word(ctx, buf, written); ++ __formatter->_M_format_word(__buf, __bufsize, "@ 0x%p {\n", ++ __variant._M_address); ++ __formatter->_M_print_word(__buf); + +- if (inst._M_type) ++ if (__variant._M_type) + { +- print_word(ctx, " type = "); +- print_type(ctx, inst._M_type, "<unknown type>"); ++ __formatter->_M_print_word(" type = "); ++ print_type(__formatter, __variant._M_type, "<unknown type>"); + } + } ++} + ++namespace __gnu_debug ++{ + void +- print_description(PrintContext& ctx, const _Parameter& param) ++ _Error_formatter::_Parameter:: ++ _M_print_field(const _Error_formatter* __formatter, const char* __name) const + { +- const int bufsize = 128; +- char buf[bufsize]; ++ assert(this->_M_kind != _Parameter::__unused_param); ++ const int __bufsize = 64; ++ char __buf[__bufsize]; + +- const auto& variant = param._M_variant; +- switch (param._M_kind) +- { +- case _Parameter::__iterator: ++ switch (_M_kind) ++ { ++ case __iterator: ++ if (print_field(__formatter, __name, _M_variant._M_iterator)) ++ { } ++ else if (strcmp(__name, "constness") == 0) + { +- const auto& ite = variant._M_iterator; +- +- print_word(ctx, "iterator "); +- print_description(ctx, ite); +- +- if (ite._M_type) +- { +- if (ite._M_constness != _Error_formatter::__unknown_constness) +- { +- print_word(ctx, " ("); +- print_field(ctx, param, "constness"); +- print_word(ctx, " iterator)"); +- } +- +- print_word(ctx, ";\n"); +- } +- +- if (ite._M_state != _Error_formatter::__unknown_state) ++ static const char* __constness_names[__last_constness] = + { +- print_word(ctx, " state = "); +- print_field(ctx, param, "state"); +- print_word(ctx, ";\n"); +- } +- +- if (ite._M_sequence) ++ "<unknown>", ++ "constant", ++ "mutable" ++ }; ++ __formatter->_M_print_word(__constness_names[_M_variant. ++ _M_iterator. ++ _M_constness]); ++ } ++ else if (strcmp(__name, "state") == 0) ++ { ++ static const char* __state_names[__last_state] = + { +- print_word(ctx, " references sequence "); +- if (ite._M_seq_type) +- { +- print_word(ctx, "with type '"); +- print_field(ctx, param, "seq_type"); +- print_word(ctx, "' "); +- } +- +- int written +- = __builtin_sprintf(buf, "@ 0x%p\n", ite._M_sequence); +- print_word(ctx, buf, written); +- } +- +- print_word(ctx, "}\n", 2); ++ "<unknown>", ++ "singular", ++ "dereferenceable (start-of-sequence)", ++ "dereferenceable", ++ "past-the-end", ++ "before-begin" ++ }; ++ __formatter->_M_print_word(__state_names[_M_variant. ++ _M_iterator._M_state]); + } +- break; +- +- case _Parameter::__sequence: +- print_word(ctx, "sequence "); +- print_description(ctx, variant._M_sequence); +- +- if (variant._M_sequence._M_type) +- print_word(ctx, ";\n", 2); +- +- print_word(ctx, "}\n", 2); +- break; +- +- case _Parameter::__instance: +- print_word(ctx, "instance "); +- print_description(ctx, variant._M_instance); +- +- if (variant._M_instance._M_type) +- print_word(ctx, ";\n", 2); +- +- print_word(ctx, "}\n", 2); +- break; +- +- case _Parameter::__iterator_value_type: +- print_word(ctx, "iterator::value_type "); +- print_description(ctx, variant._M_iterator_value_type); +- print_word(ctx, "}\n", 2); +- break; +- +- default: +- break; +- } ++ else if (strcmp(__name, "sequence") == 0) ++ { ++ assert(_M_variant._M_iterator._M_sequence); ++ __formatter->_M_format_word(__buf, __bufsize, "%p", ++ _M_variant._M_iterator._M_sequence); ++ __formatter->_M_print_word(__buf); ++ } ++ else if (strcmp(__name, "seq_type") == 0) ++ print_type(__formatter, _M_variant._M_iterator._M_seq_type, ++ "<unknown seq_type>"); ++ else ++ assert(false); ++ break; ++ case __sequence: ++ if (!print_field(__formatter, __name, _M_variant._M_sequence)) ++ assert(false); ++ break; ++ case __integer: ++ if (strcmp(__name, "name") == 0) ++ { ++ assert(_M_variant._M_integer._M_name); ++ __formatter->_M_print_word(_M_variant._M_integer._M_name); ++ } ++ else ++ assert(false); ++ break; ++ case __string: ++ if (strcmp(__name, "name") == 0) ++ { ++ assert(_M_variant._M_string._M_name); ++ __formatter->_M_print_word(_M_variant._M_string._M_name); ++ } ++ else ++ assert(false); ++ break; ++ case __instance: ++ if (!print_field(__formatter, __name, _M_variant._M_instance)) ++ assert(false); ++ break; ++ case __iterator_value_type: ++ if (!print_field(__formatter, __name, _M_variant._M_iterator_value_type)) ++ assert(false); ++ break; ++ default: ++ assert(false); ++ break; ++ } + } + + void +- print_string(PrintContext& ctx, const char* string, +- const _Parameter* parameters, std::size_t num_parameters) ++ _Error_formatter::_Parameter:: ++ _M_print_description(const _Error_formatter* __formatter) const + { +- const char* start = string; +- const int bufsize = 128; +- char buf[bufsize]; +- int bufindex = 0; ++ const int __bufsize = 128; ++ char __buf[__bufsize]; + +- while (*start) ++ switch (_M_kind) + { +- if (isspace(*start)) +- { +- buf[bufindex++] = *start++; +- buf[bufindex] = '\0'; +- print_word(ctx, buf, bufindex); +- bufindex = 0; +- continue; +- } ++ case __iterator: ++ __formatter->_M_print_word("iterator "); ++ print_description(__formatter, _M_variant._M_iterator); + +- if (*start != '%') ++ if (_M_variant._M_iterator._M_type) + { +- // Normal char. +- buf[bufindex++] = *start++; +- continue; +- } +- +- if (*++start == '%') +- { +- // Escaped '%' +- buf[bufindex++] = *start++; +- continue; ++ if (_M_variant._M_iterator._M_constness != __unknown_constness) ++ { ++ __formatter->_M_print_word(" ("); ++ _M_print_field(__formatter, "constness"); ++ __formatter->_M_print_word(" iterator)"); ++ } ++ __formatter->_M_print_word(";\n"); + } + +- // We are on a parameter property reference, we need to flush buffer +- // first. +- if (bufindex != 0) ++ if (_M_variant._M_iterator._M_state != __unknown_state) + { +- buf[bufindex] = '\0'; +- print_word(ctx, buf, bufindex); +- bufindex = 0; ++ __formatter->_M_print_word(" state = "); ++ _M_print_field(__formatter, "state"); ++ __formatter->_M_print_word(";\n"); + } + +- // Get the parameter number +- assert(*start >= '1' && *start <= '9'); +- size_t param_index = *start - '0' - 1; +- assert(param_index < num_parameters); +- const auto& param = parameters[param_index]; +- +- // '.' separates the parameter number from the field +- // name, if there is one. +- ++start; +- if (*start != '.') ++ if (_M_variant._M_iterator._M_sequence) + { +- assert(*start == ';'); +- ++start; +- if (param._M_kind == _Parameter::__integer) ++ __formatter->_M_print_word(" references sequence "); ++ if (_M_variant._M_iterator._M_seq_type) + { +- int written +- = __builtin_sprintf(buf, "%ld", +- param._M_variant._M_integer._M_value); +- print_word(ctx, buf, written); ++ __formatter->_M_print_word("with type `"); ++ _M_print_field(__formatter, "seq_type"); ++ __formatter->_M_print_word("' "); + } +- else if (param._M_kind == _Parameter::__string) +- print_string(ctx, param._M_variant._M_string._M_value, +- parameters, num_parameters); +- continue; +- } + +- // Extract the field name we want +- const int max_field_len = 16; +- char field[max_field_len]; +- int field_idx = 0; +- ++start; +- while (*start != ';') +- { +- assert(*start); +- assert(field_idx < max_field_len - 1); +- field[field_idx++] = *start++; ++ __formatter->_M_format_word(__buf, __bufsize, "@ 0x%p\n", ++ _M_variant._M_iterator._M_sequence); ++ __formatter->_M_print_word(__buf); + } +- ++start; +- field[field_idx] = '\0'; + +- print_field(ctx, param, field); +- } ++ __formatter->_M_print_word("}\n"); ++ break; ++ case __sequence: ++ __formatter->_M_print_word("sequence "); ++ print_description(__formatter, _M_variant._M_sequence); + +- // Might need to flush. +- if (bufindex) +- { +- buf[bufindex] = '\0'; +- print_word(ctx, buf, bufindex); ++ if (_M_variant._M_sequence._M_type) ++ __formatter->_M_print_word(";\n"); ++ ++ __formatter->_M_print_word("}\n"); ++ break; ++ case __instance: ++ __formatter->_M_print_word("instance "); ++ print_description(__formatter, _M_variant._M_instance); ++ ++ if (_M_variant._M_instance._M_type) ++ __formatter->_M_print_word(";\n"); ++ ++ __formatter->_M_print_word("}\n"); ++ break; ++ case __iterator_value_type: ++ __formatter->_M_print_word("iterator::value_type "); ++ print_description(__formatter, _M_variant._M_iterator_value_type); ++ __formatter->_M_print_word("}\n"); ++ break; ++ default: ++ break; + } + } +-} + +-namespace __gnu_debug +-{ +- _Error_formatter& ++ const _Error_formatter& + _Error_formatter::_M_message(_Debug_msg_id __id) const throw () +- { +- return const_cast<_Error_formatter*>(this) +- ->_M_message(_S_debug_messages[__id]); +- } ++ { return this->_M_message(_S_debug_messages[__id]); } + + void + _Error_formatter::_M_error() const + { +- const int bufsize = 128; +- char buf[bufsize]; ++ const int __bufsize = 128; ++ char __buf[__bufsize]; + + // Emit file & line number information +- bool go_to_next_line = false; +- PrintContext ctx; ++ _M_column = 1; ++ _M_wordwrap = false; + if (_M_file) + { +- int written = format_word(buf, bufsize, "%s:", _M_file); +- print_word(ctx, buf, written); +- go_to_next_line = true; ++ _M_format_word(__buf, __bufsize, "%s:", _M_file); ++ _M_print_word(__buf); ++ _M_column += strlen(__buf); + } + + if (_M_line > 0) + { +- int written = __builtin_sprintf(buf, "%u:", _M_line); +- print_word(ctx, buf, written); +- go_to_next_line = true; ++ _M_format_word(__buf, __bufsize, "%u:", _M_line); ++ _M_print_word(__buf); ++ _M_column += strlen(__buf); + } + +- if (go_to_next_line) +- print_word(ctx, "\n", 1); +- +- if (ctx._M_max_length) +- ctx._M_wordwrap = true; +- +- print_word(ctx, "Error: "); ++ if (_M_max_length) ++ _M_wordwrap = true; ++ _M_print_word("error: "); + + // Print the error message + assert(_M_text); +- print_string(ctx, _M_text, _M_parameters, _M_num_parameters); +- print_word(ctx, ".\n", 2); ++ _M_print_string(_M_text); ++ _M_print_word(".\n"); + + // Emit descriptions of the objects involved in the operation +- ctx._M_first_line = true; +- ctx._M_wordwrap = false; +- bool has_header = false; +- for (unsigned int i = 0; i < _M_num_parameters; ++i) ++ _M_wordwrap = false; ++ bool __has_noninteger_parameters = false; ++ for (unsigned int __i = 0; __i < _M_num_parameters; ++__i) + { +- switch (_M_parameters[i]._M_kind) ++ switch (_M_parameters[__i]._M_kind) + { + case _Parameter::__iterator: + case _Parameter::__sequence: + case _Parameter::__instance: + case _Parameter::__iterator_value_type: +- if (!has_header) ++ if (!__has_noninteger_parameters) + { +- print_word(ctx, "\nObjects involved in the operation:\n"); +- has_header = true; ++ _M_first_line = true; ++ _M_print_word("\nObjects involved in the operation:\n"); ++ __has_noninteger_parameters = true; + } +- print_description(ctx, _M_parameters[i]); ++ _M_parameters[__i]._M_print_description(this); + break; +- + default: + break; + } +@@ -1060,39 +865,172 @@ namespace __gnu_debug + abort(); + } + +- // Deprecated methods kept for backward compatibility. +- void +- _Error_formatter::_Parameter::_M_print_field( +- const _Error_formatter*, const char*) const +- { } +- +- void +- _Error_formatter::_Parameter::_M_print_description(const _Error_formatter*) const +- { } +- + template<typename _Tp> + void +- _Error_formatter::_M_format_word(char*, int, const char*, _Tp) +- const throw () +- { } ++ _Error_formatter::_M_format_word(char* __buf, ++ int __n __attribute__ ((__unused__)), ++ const char* __fmt, _Tp __s) const throw () ++ { ++#ifdef _GLIBCXX_USE_C99 ++ std::snprintf(__buf, __n, __fmt, __s); ++#else ++ std::sprintf(__buf, __fmt, __s); ++#endif ++ } + + void +- _Error_formatter::_M_print_word(const char*) const +- { } ++ _Error_formatter::_M_print_word(const char* __word) const ++ { ++ if (!_M_wordwrap) ++ { ++ fprintf(stderr, "%s", __word); ++ return; ++ } ++ ++ size_t __length = strlen(__word); ++ if (__length == 0) ++ return; ++ ++ size_t __visual_length ++ = __word[__length - 1] == '\n' ? __length - 1 : __length; ++ if (__visual_length == 0 ++ || (_M_column + __visual_length < _M_max_length) ++ || (__visual_length >= _M_max_length && _M_column == 1)) ++ { ++ // If this isn't the first line, indent ++ if (_M_column == 1 && !_M_first_line) ++ { ++ char __spacing[_M_indent + 1]; ++ for (int i = 0; i < _M_indent; ++i) ++ __spacing[i] = ' '; ++ __spacing[_M_indent] = '\0'; ++ fprintf(stderr, "%s", __spacing); ++ _M_column += _M_indent; ++ } ++ ++ fprintf(stderr, "%s", __word); ++ ++ if (__word[__length - 1] == '\n') ++ { ++ _M_first_line = false; ++ _M_column = 1; ++ } ++ else ++ _M_column += __length; ++ } ++ else ++ { ++ _M_print_word("\n"); ++ _M_print_word(__word); ++ } ++ } + + void +- _Error_formatter::_M_print_string(const char*) const +- { } ++ _Error_formatter:: ++ _M_print_string(const char* __string) const ++ { ++ const char* __start = __string; ++ const char* __finish = __start; ++ const int __bufsize = 128; ++ char __buf[__bufsize]; ++ ++ while (*__start) ++ { ++ if (*__start != '%') ++ { ++ // [__start, __finish) denotes the next word ++ __finish = __start; ++ while (isalnum(*__finish)) ++ ++__finish; ++ if (__start == __finish) ++ ++__finish; ++ if (isspace(*__finish)) ++ ++__finish; ++ ++ const ptrdiff_t __len = __finish - __start; ++ assert(__len < __bufsize); ++ memcpy(__buf, __start, __len); ++ __buf[__len] = '\0'; ++ _M_print_word(__buf); ++ __start = __finish; ++ ++ // Skip extra whitespace ++ while (*__start == ' ') ++ ++__start; ++ ++ continue; ++ } ++ ++ ++__start; ++ assert(*__start); ++ if (*__start == '%') ++ { ++ _M_print_word("%"); ++ ++__start; ++ continue; ++ } ++ ++ // Get the parameter number ++ assert(*__start >= '1' && *__start <= '9'); ++ size_t __param_index = *__start - '0' - 1; ++ assert(__param_index < _M_num_parameters); ++ const auto& __param = _M_parameters[__param_index]; ++ ++ // '.' separates the parameter number from the field ++ // name, if there is one. ++ ++__start; ++ if (*__start != '.') ++ { ++ assert(*__start == ';'); ++ ++__start; ++ __buf[0] = '\0'; ++ if (__param._M_kind == _Parameter::__integer) ++ { ++ _M_format_word(__buf, __bufsize, "%ld", ++ __param._M_variant._M_integer._M_value); ++ _M_print_word(__buf); ++ } ++ else if (__param._M_kind == _Parameter::__string) ++ _M_print_string(__param._M_variant._M_string._M_value); ++ continue; ++ } ++ ++ // Extract the field name we want ++ enum { __max_field_len = 16 }; ++ char __field[__max_field_len]; ++ int __field_idx = 0; ++ ++__start; ++ while (*__start != ';') ++ { ++ assert(*__start); ++ assert(__field_idx < __max_field_len-1); ++ __field[__field_idx++] = *__start++; ++ } ++ ++__start; ++ __field[__field_idx] = 0; ++ ++ __param._M_print_field(this, __field); ++ } ++ } + + void + _Error_formatter::_M_get_max_length() const throw () +- { } ++ { ++ const char* __nptr = std::getenv("GLIBCXX_DEBUG_MESSAGE_LENGTH"); ++ if (__nptr) ++ { ++ char* __endptr; ++ const unsigned long __ret = std::strtoul(__nptr, &__endptr, 0); ++ if (*__nptr != '\0' && *__endptr == '\0') ++ _M_max_length = __ret; ++ } ++ } + + // Instantiations. + template + void + _Error_formatter::_M_format_word(char*, int, const char*, +- const void*) const; ++ const void*) const; + + template + void +@@ -1101,10 +1039,10 @@ namespace __gnu_debug + template + void + _Error_formatter::_M_format_word(char*, int, const char*, +- std::size_t) const; ++ std::size_t) const; + + template + void + _Error_formatter::_M_format_word(char*, int, const char*, +- const char*) const; ++ const char*) const; + } // namespace __gnu_debug +-- +2.9.3 + diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 898e781..f0b32d9 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,7 +25,7 @@ LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 -MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 +MINGW_TAG=4e270fefffda8f8123c0d64b77a6855dc3c732b1 # fix Fx compilation PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix @@ -49,7 +49,7 @@ GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 -GCC_VER=5.1.0 +GCC_VER=6.2.0 CLANG_VER=r247539 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 @@ -117,7 +117,7 @@ GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a -GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad +GCC_HASH=9944589fc722d3e66308c0ce5257788ebd7872982a718aa2516123940671b7c5 STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da diff --git a/gitian/versions.nightly b/gitian/versions.nightly index f6dbb68..20c4ae4 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -32,7 +32,7 @@ LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 -MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 +MINGW_TAG=4e270fefffda8f8123c0d64b77a6855dc3c732b1 # fix Fx compilation PYPTLIB_TAG=master OBFSPROXY_TAG=master LIBFTE_TAG=master @@ -56,7 +56,7 @@ GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 -GCC_VER=5.1.0 +GCC_VER=6.2.0 CLANG_VER=r247539 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 @@ -124,7 +124,7 @@ GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a -GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad +GCC_HASH=9944589fc722d3e66308c0ce5257788ebd7872982a718aa2516123940671b7c5 STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da

1 0

[tor-browser-bundle/hardened-builds] Bug 20296: Rotate ports again for default obfs4 bridges
by gk＠torproject.org 06 Oct '16

06 Oct '16

commit 76ab07a1dbf78a1445d76bac4e1498136361641a Author: Lynn Tsai <lynntsai(a)gmail.com> Date: Wed Oct 5 14:22:51 2016 -0700 Bug 20296: Rotate ports again for default obfs4 bridges LeifEricson (blocked): Port 50000 --> 50001 Greenbelt (unblocked): Port 5881 --> 7013 Mosaddegh (blocked): Port 2934 --> 9332 MaBishomarim (blocked): Port 2413 --> 7920 JonbesheSabz (blocked): Port 1894 --> 4148 Azadi (unblocked): Port 4319 --> 6041 --- Bundle-Data/PTConfigs/bridge_prefs.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 2537625..c4752c1 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -15,24 +15,24 @@ pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.163:8080 A1 pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); -pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:2934 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:9332 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:50000 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:50001 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.11:2413 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.11:7920 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:5881 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:7013 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.12:1894 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:4319 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.12:4148 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:6041 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 445AAA9309486821673F1BAD2F5DA31D57BA14A1 cert=G2f9hXO446LRm6zZo6i5ayMwk7q9PzcGu5ZNCbx+rYsoyJvWLl/RenYJeOZfsNc4m+KcSw iat-mode=0"); // Not used yet // pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0");

1 0