[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r15073: Update babelzilla diff... (torbutton/trunk/trans_tools)
Author: mikeperry
Date: 2008-06-09 01:12:04 -0400 (Mon, 09 Jun 2008)
New Revision: 15073
Modified:
torbutton/trunk/trans_tools/no-english.diff
Log:
Update babelzilla diff...
Modified: torbutton/trunk/trans_tools/no-english.diff
===================================================================
--- torbutton/trunk/trans_tools/no-english.diff 2008-06-09 05:08:49 UTC (rev 15072)
+++ torbutton/trunk/trans_tools/no-english.diff 2008-06-09 05:12:04 UTC (rev 15073)
@@ -1,8 +1,8 @@
Index: src/chrome/locale/zh-CN/torbutton.dtd
===================================================================
---- src/chrome/locale/zh-CN/torbutton.dtd (revision 15068)
+--- src/chrome/locale/zh-CN/torbutton.dtd (revision 15072)
+++ src/chrome/locale/zh-CN/torbutton.dtd (working copy)
-@@ -27,52 +27,3 @@
+@@ -27,53 +27,3 @@
<!ENTITY torbutton.context_menu.about.key "A">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "点击初始化 Torbutton">
@@ -55,9 +55,10 @@
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+-<!ENTITY torbutton.prefs.startup "Startup">
Index: src/chrome/locale/zh-CN/torbutton.properties
===================================================================
---- src/chrome/locale/zh-CN/torbutton.properties (revision 15040)
+--- src/chrome/locale/zh-CN/torbutton.properties (revision 15071)
+++ src/chrome/locale/zh-CN/torbutton.properties (working copy)
@@ -5,6 +5,3 @@
torbutton.panel.label.disabled=Tor 被禁用
@@ -66,14 +67,14 @@
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
-Index: src/chrome/locale/nl-NL/torbutton.dtd
+Index: src/chrome/locale/de-CH/torbutton.dtd
===================================================================
---- src/chrome/locale/nl-NL/torbutton.dtd (revision 15068)
-+++ src/chrome/locale/nl-NL/torbutton.dtd (working copy)
-@@ -27,52 +27,3 @@
- <!ENTITY torbutton.context_menu.about.key "O">
+--- src/chrome/locale/de-CH/torbutton.dtd (revision 15072)
++++ src/chrome/locale/de-CH/torbutton.dtd (working copy)
+@@ -27,53 +27,3 @@
+ <!ENTITY torbutton.context_menu.about.key "A">
<!ENTITY torbutton.button.label "Torbutton">
- <!ENTITY torbutton.button.tooltip "Klik hier om Torbutton te initialiseren">
+ <!ENTITY torbutton.button.tooltip "Hier klicken, um Torbutton einzurichten">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
@@ -123,22 +124,23 @@
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-Index: src/chrome/locale/nl-NL/torbutton.properties
+-<!ENTITY torbutton.prefs.startup "Startup">
+Index: src/chrome/locale/de-CH/torbutton.properties
===================================================================
---- src/chrome/locale/nl-NL/torbutton.properties (revision 15040)
-+++ src/chrome/locale/nl-NL/torbutton.properties (working copy)
+--- src/chrome/locale/de-CH/torbutton.properties (revision 15071)
++++ src/chrome/locale/de-CH/torbutton.properties (working copy)
@@ -5,6 +5,3 @@
- torbutton.panel.label.disabled=Tor uitgeschakeld
- torbutton.panel.label.enabled=Tor ingeschakeld
- extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Torbutton voorziet in een knop om eenvoudig de Tor proxy in- of uit te schakelen
+ torbutton.panel.label.disabled=Tor deaktiviert
+ torbutton.panel.label.enabled=Tor aktiviert
+ extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Dank Torbutton können Sie den Tor-Proxy mit einem Klick ein- und ausschalten
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
Index: src/chrome/locale/hr-HR/torbutton.dtd
===================================================================
---- src/chrome/locale/hr-HR/torbutton.dtd (revision 15068)
+--- src/chrome/locale/hr-HR/torbutton.dtd (revision 15072)
+++ src/chrome/locale/hr-HR/torbutton.dtd (working copy)
-@@ -27,52 +27,3 @@
+@@ -27,53 +27,3 @@
<!ENTITY torbutton.context_menu.about.key "O">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "Kliknite da biste pokrenuli Torbutton">
@@ -191,9 +193,10 @@
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+-<!ENTITY torbutton.prefs.startup "Startup">
Index: src/chrome/locale/hr-HR/torbutton.properties
===================================================================
---- src/chrome/locale/hr-HR/torbutton.properties (revision 15040)
+--- src/chrome/locale/hr-HR/torbutton.properties (revision 15071)
+++ src/chrome/locale/hr-HR/torbutton.properties (working copy)
@@ -5,6 +5,3 @@
torbutton.panel.label.disabled= Tor onemogućen
@@ -202,14 +205,14 @@
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
-Index: src/chrome/locale/de-CH/torbutton.dtd
+Index: src/chrome/locale/nl-NL/torbutton.dtd
===================================================================
---- src/chrome/locale/de-CH/torbutton.dtd (revision 15068)
-+++ src/chrome/locale/de-CH/torbutton.dtd (working copy)
-@@ -27,52 +27,3 @@
- <!ENTITY torbutton.context_menu.about.key "A">
+--- src/chrome/locale/nl-NL/torbutton.dtd (revision 15072)
++++ src/chrome/locale/nl-NL/torbutton.dtd (working copy)
+@@ -27,53 +27,3 @@
+ <!ENTITY torbutton.context_menu.about.key "O">
<!ENTITY torbutton.button.label "Torbutton">
- <!ENTITY torbutton.button.tooltip "Hier klicken, um Torbutton einzurichten">
+ <!ENTITY torbutton.button.tooltip "Klik hier om Torbutton te initialiseren">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
@@ -259,25 +262,26 @@
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-Index: src/chrome/locale/de-CH/torbutton.properties
+-<!ENTITY torbutton.prefs.startup "Startup">
+Index: src/chrome/locale/nl-NL/torbutton.properties
===================================================================
---- src/chrome/locale/de-CH/torbutton.properties (revision 15040)
-+++ src/chrome/locale/de-CH/torbutton.properties (working copy)
+--- src/chrome/locale/nl-NL/torbutton.properties (revision 15071)
++++ src/chrome/locale/nl-NL/torbutton.properties (working copy)
@@ -5,6 +5,3 @@
- torbutton.panel.label.disabled=Tor deaktiviert
- torbutton.panel.label.enabled=Tor aktiviert
- extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Dank Torbutton können Sie den Tor-Proxy mit einem Klick ein- und ausschalten
+ torbutton.panel.label.disabled=Tor uitgeschakeld
+ torbutton.panel.label.enabled=Tor ingeschakeld
+ extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Torbutton voorziet in een knop om eenvoudig de Tor proxy in- of uit te schakelen
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
-Index: src/chrome/locale/pt-BR/torbutton.dtd
+Index: src/chrome/locale/pl-PL/torbutton.dtd
===================================================================
---- src/chrome/locale/pt-BR/torbutton.dtd (revision 15068)
-+++ src/chrome/locale/pt-BR/torbutton.dtd (working copy)
-@@ -27,52 +27,3 @@
- <!ENTITY torbutton.context_menu.about.key "A">
+--- src/chrome/locale/pl-PL/torbutton.dtd (revision 15072)
++++ src/chrome/locale/pl-PL/torbutton.dtd (working copy)
+@@ -27,53 +27,3 @@
+ <!ENTITY torbutton.context_menu.about.key "T">
<!ENTITY torbutton.button.label "Torbutton">
- <!ENTITY torbutton.button.tooltip "Clique para iniciar Torbutton">
+ <!ENTITY torbutton.button.tooltip "Kliknij tutaj, aby uruchomić Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
@@ -327,25 +331,26 @@
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-Index: src/chrome/locale/pt-BR/torbutton.properties
+-<!ENTITY torbutton.prefs.startup "Startup">
+Index: src/chrome/locale/pl-PL/torbutton.properties
===================================================================
---- src/chrome/locale/pt-BR/torbutton.properties (revision 15040)
-+++ src/chrome/locale/pt-BR/torbutton.properties (working copy)
+--- src/chrome/locale/pl-PL/torbutton.properties (revision 15071)
++++ src/chrome/locale/pl-PL/torbutton.properties (working copy)
@@ -5,6 +5,3 @@
- torbutton.panel.label.disabled=Tor desabilitado
- torbutton.panel.label.enabled=Tor habilitado
- extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Torbutton provê um ícone para habilitar ou desabilitar rapidamente o proxy Tor
+ torbutton.panel.label.disabled= Tor wyłączony
+ torbutton.panel.label.enabled= Tor włączony
+ extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description= Rozszerzenia dostarcza przycisk do łatwego włącznia/wyłączania proxy Tor
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
-Index: src/chrome/locale/pl-PL/torbutton.dtd
+Index: src/chrome/locale/pt-BR/torbutton.dtd
===================================================================
---- src/chrome/locale/pl-PL/torbutton.dtd (revision 15068)
-+++ src/chrome/locale/pl-PL/torbutton.dtd (working copy)
-@@ -27,52 +27,3 @@
- <!ENTITY torbutton.context_menu.about.key "T">
+--- src/chrome/locale/pt-BR/torbutton.dtd (revision 15072)
++++ src/chrome/locale/pt-BR/torbutton.dtd (working copy)
+@@ -27,53 +27,3 @@
+ <!ENTITY torbutton.context_menu.about.key "A">
<!ENTITY torbutton.button.label "Torbutton">
- <!ENTITY torbutton.button.tooltip "Kliknij tutaj, aby uruchomić Torbutton">
+ <!ENTITY torbutton.button.tooltip "Clique para iniciar Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
@@ -395,31 +400,33 @@
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-Index: src/chrome/locale/pl-PL/torbutton.properties
+-<!ENTITY torbutton.prefs.startup "Startup">
+Index: src/chrome/locale/pt-BR/torbutton.properties
===================================================================
---- src/chrome/locale/pl-PL/torbutton.properties (revision 15040)
-+++ src/chrome/locale/pl-PL/torbutton.properties (working copy)
+--- src/chrome/locale/pt-BR/torbutton.properties (revision 15071)
++++ src/chrome/locale/pt-BR/torbutton.properties (working copy)
@@ -5,6 +5,3 @@
- torbutton.panel.label.disabled= Tor wyłączony
- torbutton.panel.label.enabled= Tor włączony
- extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description= Rozszerzenia dostarcza przycisk do łatwego włącznia/wyłączania proxy Tor
+ torbutton.panel.label.disabled=Tor desabilitado
+ torbutton.panel.label.enabled=Tor habilitado
+ extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Torbutton provê um ícone para habilitar ou desabilitar rapidamente o proxy Tor
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
Index: src/chrome/locale/ru/torbutton.dtd
===================================================================
---- src/chrome/locale/ru/torbutton.dtd (revision 15068)
+--- src/chrome/locale/ru/torbutton.dtd (revision 15072)
+++ src/chrome/locale/ru/torbutton.dtd (working copy)
-@@ -73,6 +73,3 @@
+@@ -73,7 +73,3 @@
<!ENTITY torbutton.prefs.close_nontor "Закрывать все окна и вкладки не-Tor при переключении режимов (необяз.)">
<!ENTITY torbutton.prefs.block_file_net "Блокировать доступ к сети по адресам типа file:// (желательно)">
<!ENTITY torbutton.prefs.block_links "Блокировать щелчки по ссылкам и перезагрузку страниц из разных режимов Tor (необяз.)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+-<!ENTITY torbutton.prefs.startup "Startup">
Index: src/chrome/locale/ru/torbutton.properties
===================================================================
---- src/chrome/locale/ru/torbutton.properties (revision 15040)
+--- src/chrome/locale/ru/torbutton.properties (revision 15071)
+++ src/chrome/locale/ru/torbutton.properties (working copy)
@@ -7,4 +7,3 @@
extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Кнопка включения/отключения доступа к Интернет через сеть Tor
@@ -428,20 +435,21 @@
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
Index: src/chrome/locale/it-IT/torbutton.dtd
===================================================================
---- src/chrome/locale/it-IT/torbutton.dtd (revision 15068)
+--- src/chrome/locale/it-IT/torbutton.dtd (revision 15072)
+++ src/chrome/locale/it-IT/torbutton.dtd (working copy)
-@@ -75,6 +75,3 @@
+@@ -75,7 +75,3 @@
<!ENTITY torbutton.prefs.block_links "Blocca i clic sui link e la ricarica delle pagine da stati Tor differenti (facoltativo)">
<!ENTITY torbutton.prefs.jar_certs "Conserva i certificati SSL in depositi separati per Tor/Non-Tor (consigliato)">
<!ENTITY torbutton.prefs.jar_ca_certs "Conserva i certificati delle CA in depositi separati per Tor/Non-Tor (consigliato)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+-<!ENTITY torbutton.prefs.startup "Startup">
Index: src/chrome/locale/sl-SI/torbutton.dtd
===================================================================
---- src/chrome/locale/sl-SI/torbutton.dtd (revision 15068)
+--- src/chrome/locale/sl-SI/torbutton.dtd (revision 15072)
+++ src/chrome/locale/sl-SI/torbutton.dtd (working copy)
-@@ -27,52 +27,3 @@
+@@ -27,53 +27,3 @@
<!ENTITY torbutton.context_menu.about.key "A">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "Klikni za inicializiranje razširitve Torbutton">
@@ -494,9 +502,10 @@
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+-<!ENTITY torbutton.prefs.startup "Startup">
Index: src/chrome/locale/sl-SI/torbutton.properties
===================================================================
---- src/chrome/locale/sl-SI/torbutton.properties (revision 15040)
+--- src/chrome/locale/sl-SI/torbutton.properties (revision 15071)
+++ src/chrome/locale/sl-SI/torbutton.properties (working copy)
@@ -5,6 +5,3 @@
torbutton.panel.label.disabled=Anonimizacija izključena
@@ -507,9 +516,9 @@
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
Index: src/chrome/locale/de-AT/torbutton.dtd
===================================================================
---- src/chrome/locale/de-AT/torbutton.dtd (revision 15068)
+--- src/chrome/locale/de-AT/torbutton.dtd (revision 15072)
+++ src/chrome/locale/de-AT/torbutton.dtd (working copy)
-@@ -27,52 +27,3 @@
+@@ -27,53 +27,3 @@
<!ENTITY torbutton.context_menu.about.key "A">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "Hier klicken, um Torbutton einzurichten">
@@ -562,9 +571,10 @@
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+-<!ENTITY torbutton.prefs.startup "Startup">
Index: src/chrome/locale/de-AT/torbutton.properties
===================================================================
---- src/chrome/locale/de-AT/torbutton.properties (revision 15040)
+--- src/chrome/locale/de-AT/torbutton.properties (revision 15071)
+++ src/chrome/locale/de-AT/torbutton.properties (working copy)
@@ -5,6 +5,3 @@
torbutton.panel.label.disabled=Tor deaktiviert
@@ -575,18 +585,19 @@
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
Index: src/chrome/locale/fa-IR/torbutton.dtd
===================================================================
---- src/chrome/locale/fa-IR/torbutton.dtd (revision 15068)
+--- src/chrome/locale/fa-IR/torbutton.dtd (revision 15072)
+++ src/chrome/locale/fa-IR/torbutton.dtd (working copy)
-@@ -73,6 +73,3 @@
+@@ -73,7 +73,3 @@
<!ENTITY torbutton.prefs.close_nontor "بستن همه پنجره های غیرتُر در ضامن (اختیاری)">
<!ENTITY torbutton.prefs.block_file_net "بازداشتن دسترسی به شبکه از file:// نشانی های وب (توصیه شده)">
<!ENTITY torbutton.prefs.block_links "بازداشتن فشاردادن پیوند و بازگذاری مجدد برگه از وضعیت های مختلف تُر (اختیاری)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+-<!ENTITY torbutton.prefs.startup "Startup">
Index: src/chrome/locale/fa-IR/torbutton.properties
===================================================================
---- src/chrome/locale/fa-IR/torbutton.properties (revision 15040)
+--- src/chrome/locale/fa-IR/torbutton.properties (revision 15071)
+++ src/chrome/locale/fa-IR/torbutton.properties (working copy)
@@ -5,5 +5,3 @@
torbutton.panel.label.disabled = تُر غیرفعال شد
@@ -596,18 +607,19 @@
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
Index: src/chrome/locale/ar/torbutton.dtd
===================================================================
---- src/chrome/locale/ar/torbutton.dtd (revision 15068)
+--- src/chrome/locale/ar/torbutton.dtd (revision 15072)
+++ src/chrome/locale/ar/torbutton.dtd (working copy)
-@@ -73,6 +73,3 @@
+@@ -73,7 +73,3 @@
<!ENTITY torbutton.prefs.close_nontor "أغلق كل نوافذ و ألسنة غير تور عند اغير الحالة (اختياري)">
<!ENTITY torbutton.prefs.block_file_net "امنع النفاذ إلى الشبكة من مسارات file:// (محبّذ)">
<!ENTITY torbutton.prefs.block_links "امنع نقر الروابط و إعادة تحميل الصفحات بين حالات تور المختلفة (اختياري)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+-<!ENTITY torbutton.prefs.startup "Startup">
Index: src/chrome/locale/ar/torbutton.properties
===================================================================
---- src/chrome/locale/ar/torbutton.properties (revision 15040)
+--- src/chrome/locale/ar/torbutton.properties (revision 15071)
+++ src/chrome/locale/ar/torbutton.properties (working copy)
@@ -10,4 +10,3 @@
torbutton.popup.history.warning = منع توربتن تعديل الحالة-المتغيرة للتأريخ.\n\nطالع تضبيطات التأريخ لتسمح بهذا.\n\n
@@ -616,9 +628,9 @@
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
Index: src/chrome/locale/el-GR/torbutton.dtd
===================================================================
---- src/chrome/locale/el-GR/torbutton.dtd (revision 15068)
+--- src/chrome/locale/el-GR/torbutton.dtd (revision 15072)
+++ src/chrome/locale/el-GR/torbutton.dtd (working copy)
-@@ -27,52 +27,3 @@
+@@ -27,53 +27,3 @@
<!ENTITY torbutton.context_menu.about.key "Π">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "Κάντε κλικ για να εκκίνηση του Torbutton">
@@ -671,9 +683,10 @@
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+-<!ENTITY torbutton.prefs.startup "Startup">
Index: src/chrome/locale/el-GR/torbutton.properties
===================================================================
---- src/chrome/locale/el-GR/torbutton.properties (revision 15040)
+--- src/chrome/locale/el-GR/torbutton.properties (revision 15071)
+++ src/chrome/locale/el-GR/torbutton.properties (working copy)
@@ -5,6 +5,3 @@
torbutton.panel.label.disabled=Το Tor είναι απενεργοποιημένο
@@ -684,18 +697,19 @@
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
Index: src/chrome/locale/es/torbutton.dtd
===================================================================
---- src/chrome/locale/es/torbutton.dtd (revision 15068)
+--- src/chrome/locale/es/torbutton.dtd (revision 15072)
+++ src/chrome/locale/es/torbutton.dtd (working copy)
-@@ -73,6 +73,3 @@
+@@ -73,7 +73,3 @@
<!ENTITY torbutton.prefs.close_nontor "Cerrar las ventanas y pestañas que no sean de Tor al cambiar el estado (opcional)">
<!ENTITY torbutton.prefs.block_file_net "Bloquear el acceso a la red desde archivos en direcciones file:// (recomendado)">
<!ENTITY torbutton.prefs.block_links "Bloquear clicks en vínculos y recargas de páginas desde distintos estados de Tor (opcional)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+-<!ENTITY torbutton.prefs.startup "Startup">
Index: src/chrome/locale/es/torbutton.properties
===================================================================
---- src/chrome/locale/es/torbutton.properties (revision 15040)
+--- src/chrome/locale/es/torbutton.properties (revision 15071)
+++ src/chrome/locale/es/torbutton.properties (working copy)
@@ -7,4 +7,3 @@
extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description= Torbutton provee un botón para activar y desactivar el proxy Tor de manera fácil.
@@ -704,9 +718,9 @@
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
Index: src/chrome/locale/zh-TW/torbutton.dtd
===================================================================
---- src/chrome/locale/zh-TW/torbutton.dtd (revision 15068)
+--- src/chrome/locale/zh-TW/torbutton.dtd (revision 15072)
+++ src/chrome/locale/zh-TW/torbutton.dtd (working copy)
-@@ -27,52 +27,3 @@
+@@ -27,53 +27,3 @@
<!ENTITY torbutton.context_menu.about.key "A">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "點擊以初始 Torbutton">
@@ -759,9 +773,10 @@
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+-<!ENTITY torbutton.prefs.startup "Startup">
Index: src/chrome/locale/zh-TW/torbutton.properties
===================================================================
---- src/chrome/locale/zh-TW/torbutton.properties (revision 15040)
+--- src/chrome/locale/zh-TW/torbutton.properties (revision 15071)
+++ src/chrome/locale/zh-TW/torbutton.properties (working copy)
@@ -5,6 +5,3 @@
torbutton.panel.label.disabled=Tor 已停用
@@ -772,18 +787,19 @@
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
Index: src/chrome/locale/fr-FR/torbutton.dtd
===================================================================
---- src/chrome/locale/fr-FR/torbutton.dtd (revision 15068)
+--- src/chrome/locale/fr-FR/torbutton.dtd (revision 15072)
+++ src/chrome/locale/fr-FR/torbutton.dtd (working copy)
-@@ -73,6 +73,3 @@
+@@ -73,7 +73,3 @@
<!ENTITY torbutton.prefs.close_nontor "Fermer toutes les fenêtres et onglets Non-Tor à l'activation/désactivation (optionnel)">
<!ENTITY torbutton.prefs.block_file_net "Bloquer l'accès au réseau des urls de type file:// (recommendé)">
<!ENTITY torbutton.prefs.block_links "Bloquer les liens cliquables et le rechargement des pages depuis différents états Tor (optionnel)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+-<!ENTITY torbutton.prefs.startup "Startup">
Index: src/chrome/locale/fr-FR/torbutton.properties
===================================================================
---- src/chrome/locale/fr-FR/torbutton.properties (revision 15040)
+--- src/chrome/locale/fr-FR/torbutton.properties (revision 15071)
+++ src/chrome/locale/fr-FR/torbutton.properties (working copy)
@@ -9,4 +9,3 @@
extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton comporte un bouton qui permet d'activer et de désactiver rapidement le pointage de Firefox vers le proxy de Tor.
@@ -792,9 +808,9 @@
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
Index: src/chrome/locale/de-DE/torbutton.dtd
===================================================================
---- src/chrome/locale/de-DE/torbutton.dtd (revision 15068)
+--- src/chrome/locale/de-DE/torbutton.dtd (revision 15072)
+++ src/chrome/locale/de-DE/torbutton.dtd (working copy)
-@@ -27,52 +27,3 @@
+@@ -27,53 +27,3 @@
<!ENTITY torbutton.context_menu.about.key "A">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "Hier klicken, um Torbutton einzurichten">
@@ -847,9 +863,10 @@
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+-<!ENTITY torbutton.prefs.startup "Startup">
Index: src/chrome/locale/de-DE/torbutton.properties
===================================================================
---- src/chrome/locale/de-DE/torbutton.properties (revision 15040)
+--- src/chrome/locale/de-DE/torbutton.properties (revision 15071)
+++ src/chrome/locale/de-DE/torbutton.properties (working copy)
@@ -5,6 +5,3 @@
torbutton.panel.label.disabled=Tor deaktiviert