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

[tor-commits] [tor-launcher/master] Bug #10604: Tor status & error messages not translated.

commit 988a3ae20d00e930d161ed926b05d7c56d5b7e51
Author: Kathy Brade <brade@xxxxxxxxxxxxxxxxx>
Date:   Wed Feb 12 14:28:13 2014 -0500

    Bug #10604: Tor status & error messages not translated.
    
    Include summary information in bootstrap failure alerts.  Translation of
    the word "failed" was pulled in from Vidalia.
---
 src/chrome/locale/ar/torlauncher.properties    |    3 ++-
 src/chrome/locale/bg/torlauncher.properties    |    2 ++
 src/chrome/locale/ca/torlauncher.properties    |    2 ++
 src/chrome/locale/cs/torlauncher.properties    |    2 ++
 src/chrome/locale/da/torlauncher.properties    |    2 ++
 src/chrome/locale/de/torlauncher.properties    |    3 ++-
 src/chrome/locale/el/torlauncher.properties    |    2 ++
 src/chrome/locale/en/torlauncher.properties    |    3 ++-
 src/chrome/locale/eo/torlauncher.properties    |    2 ++
 src/chrome/locale/es/torlauncher.properties    |    3 ++-
 src/chrome/locale/eu/torlauncher.properties    |    2 ++
 src/chrome/locale/fa/torlauncher.properties    |    3 ++-
 src/chrome/locale/fi/torlauncher.properties    |    2 ++
 src/chrome/locale/fr/torlauncher.properties    |    3 ++-
 src/chrome/locale/he/torlauncher.properties    |    2 ++
 src/chrome/locale/hr-HR/torlauncher.properties |    2 ++
 src/chrome/locale/hu/torlauncher.properties    |    2 ++
 src/chrome/locale/id/torlauncher.properties    |    2 ++
 src/chrome/locale/it/torlauncher.properties    |    3 ++-
 src/chrome/locale/ja/torlauncher.properties    |    3 ++-
 src/chrome/locale/ko/torlauncher.properties    |    3 ++-
 src/chrome/locale/lt/torlauncher.properties    |    2 ++
 src/chrome/locale/lv/torlauncher.properties    |    2 ++
 src/chrome/locale/my/torlauncher.properties    |    2 ++
 src/chrome/locale/nb/torlauncher.properties    |    2 ++
 src/chrome/locale/nl/torlauncher.properties    |    3 ++-
 src/chrome/locale/pl/torlauncher.properties    |    3 ++-
 src/chrome/locale/pt-BR/torlauncher.properties |    2 ++
 src/chrome/locale/pt/torlauncher.properties    |    3 ++-
 src/chrome/locale/ro/torlauncher.properties    |    2 ++
 src/chrome/locale/ru/torlauncher.properties    |    3 ++-
 src/chrome/locale/sk/torlauncher.properties    |    2 ++
 src/chrome/locale/sr/torlauncher.properties    |    2 ++
 src/chrome/locale/sv/torlauncher.properties    |    2 ++
 src/chrome/locale/th/torlauncher.properties    |    2 ++
 src/chrome/locale/tr/torlauncher.properties    |    2 ++
 src/chrome/locale/vi/torlauncher.properties    |    3 ++-
 src/chrome/locale/zh-CN/torlauncher.properties |    3 ++-
 src/chrome/locale/zh-TW/torlauncher.properties |    2 ++
 src/components/tl-process.js                   |   13 ++++++++-----
 40 files changed, 86 insertions(+), 20 deletions(-)

diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties
index 19d407c..5a94b58 100644
--- a/src/chrome/locale/ar/torlauncher.properties
+++ b/src/chrome/locale/ar/torlauncher.properties
@@ -7,7 +7,8 @@ torlauncher.tor_exited=تÙ?Ù?Ù? تÙ?ر عÙ? اÙ?عÙ?Ù? بشÙ?Ù? غÙ?ر Ù?تÙ?Ù?
 torlauncher.please_restart_app=Ù?رجÙ? إعادة تشغÙ?Ù? Ù?ذا اÙ?برÙ?اÙ?ج.
 torlauncher.tor_controlconn_failed=تعذر اÙ?اتصاÙ? بÙ?Ù?Ù?Ø° اÙ?تحÙ?Ù? اÙ?خاص بتÙ?ر.
 torlauncher.tor_failed_to_start=تÙ?ر Ù?Ø´Ù? Ù?Ù? بدء اÙ?تشغÙ?Ù?.
-torlauncher.tor_bootstrap_failed=Ù?Ø´Ù? تÙ?ر Ù?Ù? Ø¥Ù?شاء اتصاÙ? بشبÙ?Ø© تÙ?ر (%S).
+torlauncher.tor_bootstrap_failed=Ù?Ø´Ù? تÙ?ر Ù?Ù? Ø¥Ù?شاء اتصاÙ? بشبÙ?Ø© تÙ?ر.
+torlauncher.tor_bootstrap_failed_details=%1$S Ù?Ø´Ù? (%2$S).
 
 torlauncher.unable_to_start_tor=غÙ?ر Ù?ادر عÙ?Ù? بدء تشغÙ?Ù? تÙ?ر.\n\n%S
 torlauncher.tor_missing=اÙ?Ù?Ù?Ù? اÙ?تÙ?Ù?Ù?Ø°Ù? Ù?تÙ?ر Ù?Ù?Ù?Ù?د.
diff --git a/src/chrome/locale/bg/torlauncher.properties b/src/chrome/locale/bg/torlauncher.properties
index dc317fd..6cdeb42 100644
--- a/src/chrome/locale/bg/torlauncher.properties
+++ b/src/chrome/locale/bg/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S пÑ?опаднал (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=СвÑ?Ñ?зване Ñ? пÑ?епÑ?едаваÑ?аÑ?а диÑ?екÑ?оÑ?иÑ?
 torlauncher.bootstrapStatus.handshake_dir=Ð?Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?ване на вÑ?Ñ?зка Ñ? кÑ?ипÑ?иÑ?анаÑ?а диÑ?екÑ?оÑ?иÑ?
 torlauncher.bootstrapStatus.requesting_status=Ð?олÑ?Ñ?аване на инÑ?оÑ?маÑ?иÑ? за Ñ?Ñ?аÑ?Ñ?Ñ?а на мÑ?ежаÑ?а
diff --git a/src/chrome/locale/ca/torlauncher.properties b/src/chrome/locale/ca/torlauncher.properties
index b7e19f8..dffad95 100644
--- a/src/chrome/locale/ca/torlauncher.properties
+++ b/src/chrome/locale/ca/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S fallit (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=S'està establint una connexió a un directori xifrat
 torlauncher.bootstrapStatus.requesting_status=S'està rebent l'estat de la xarxa
diff --git a/src/chrome/locale/cs/torlauncher.properties b/src/chrome/locale/cs/torlauncher.properties
index 211e7f1..f944dd2 100644
--- a/src/chrome/locale/cs/torlauncher.properties
+++ b/src/chrome/locale/cs/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S Selhání (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=PÅ?ipojování do adresáÅ?e uzlu
 torlauncher.bootstrapStatus.handshake_dir=Navazuji spojení s Å¡ifrovaným adresáÅ?em
 torlauncher.bootstrapStatus.requesting_status=ZjiÅ¡Å¥uji stav sítÄ?
diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties
index 89b0222..b796d0c 100644
--- a/src/chrome/locale/da/torlauncher.properties
+++ b/src/chrome/locale/da/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S mislykkedes (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=Tilslutter til relæ mappe
 torlauncher.bootstrapStatus.handshake_dir=Opretter en krypteret mappe forbindelse
 torlauncher.bootstrapStatus.requesting_status=Henter netværk status
diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties
index f8f7a64..e976c8e 100644
--- a/src/chrome/locale/de/torlauncher.properties
+++ b/src/chrome/locale/de/torlauncher.properties
@@ -7,7 +7,8 @@ torlauncher.tor_exited=Tor wurde unerwartet geschlossen.
 torlauncher.please_restart_app=Bitte starten Sie die Anwendung neu.
 torlauncher.tor_controlconn_failed=Zum Tor-Kontrollanschluss konnte keine Verbindung hergestellt werden.
 torlauncher.tor_failed_to_start=Der Start von Tor ist fehlgeschlagen.
-torlauncher.tor_bootstrap_failed=Tor konnte keine Verbindung zum Tor-Netzwerk herstellen (%S).
+torlauncher.tor_bootstrap_failed=Tor konnte keine Verbindung zum Tor-Netzwerk herstellen.
+torlauncher.tor_bootstrap_failed_details=%1$S fehlgeschlagen (%2$S).
 
 torlauncher.unable_to_start_tor=Tor kann nicht gestartet werden.\n\n%S
 torlauncher.tor_missing=Die Tor-Programmdatei ist nicht vorhanden.
diff --git a/src/chrome/locale/el/torlauncher.properties b/src/chrome/locale/el/torlauncher.properties
index f89acfe..0175011 100644
--- a/src/chrome/locale/el/torlauncher.properties
+++ b/src/chrome/locale/el/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S αÏ?έÏ?Ï?Ï?ε (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=ΣÏ?νδεÏ?η Ï?ε ενδιάμεÏ?ο (relay) καÏ?άλογο
 torlauncher.bootstrapStatus.handshake_dir=ΠÏ?αγμαÏ?οÏ?οιήθηκε Ï?Ï?νδεÏ?η Ï?ε κÏ?Ï?Ï?Ï?ογÏ?αÏ?ημένο καÏ?άλογο
 torlauncher.bootstrapStatus.requesting_status=Î?νάκÏ?ηÏ?η Ï?ηÏ? καÏ?άÏ?Ï?αÏ?ηÏ? Ï?οÏ? δικÏ?Ï?οÏ?
diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties
index f167375..bd8646e 100644
--- a/src/chrome/locale/en/torlauncher.properties
+++ b/src/chrome/locale/en/torlauncher.properties
@@ -7,7 +7,8 @@ torlauncher.tor_exited=Tor unexpectedly exited.
 torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
-torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection (%S).
+torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
+torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
diff --git a/src/chrome/locale/eo/torlauncher.properties b/src/chrome/locale/eo/torlauncher.properties
index d76cef7..9b07625 100644
--- a/src/chrome/locale/eo/torlauncher.properties
+++ b/src/chrome/locale/eo/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S fiaskis (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=Konektante al relajsa dosierujo
 torlauncher.bootstrapStatus.handshake_dir=Starigante Ä?ifritan dosierujan konekton
 torlauncher.bootstrapStatus.requesting_status=Ricevante retan staton
diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties
index e9d8049..c58c94f 100644
--- a/src/chrome/locale/es/torlauncher.properties
+++ b/src/chrome/locale/es/torlauncher.properties
@@ -7,7 +7,8 @@ torlauncher.tor_exited=Tor se cerró inesperadamente.
 torlauncher.please_restart_app=Por favor reinicie esta aplicación.
 torlauncher.tor_controlconn_failed=No se pudo conectar al puerto de control de Tor
 torlauncher.tor_failed_to_start=Tor no pudo iniciarse.
-torlauncher.tor_bootstrap_failed=Tor no pudo establecer una conexión de red Tor (%S).
+torlauncher.tor_bootstrap_failed=Tor no pudo establecer una conexión de red Tor.
+torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S).
 
 torlauncher.unable_to_start_tor=No fue posible iniciar Tor.\n\n%S
 torlauncher.tor_missing=No se encuentra el fichero ejecutable de Tor.
diff --git a/src/chrome/locale/eu/torlauncher.properties b/src/chrome/locale/eu/torlauncher.properties
index b9abc63..0f9d081 100644
--- a/src/chrome/locale/eu/torlauncher.properties
+++ b/src/chrome/locale/eu/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S huts egin du (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=Errele direktorio batera konektatzen
 torlauncher.bootstrapStatus.handshake_dir=Enkriptatutako direktorio batera konexioa ezartzen
 torlauncher.bootstrapStatus.requesting_status=Sarearen egoera eskuratzen
diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties
index de3669f..ebee697 100644
--- a/src/chrome/locale/fa/torlauncher.properties
+++ b/src/chrome/locale/fa/torlauncher.properties
@@ -7,7 +7,8 @@ torlauncher.tor_exited=تÙ?ر بدÙ?Û?Ù?Û? Ù?اÙ?شخص خارج شد.
 torlauncher.please_restart_app=Ù?Ø·Ù?ا Ù?رÙ? اÙ?زار را Ù?جددا راÙ? اÙ?دازÛ? Ù?Ù?اÛ?Û?د.
 torlauncher.tor_controlconn_failed=اتصاÙ? بÙ? Ù¾Ù?رت Ú©Ù?ترÙ? تÙ?ر اÙ?کاÙ? پذÛ?ر Ù?Ù?Û? باشد.
 torlauncher.tor_failed_to_start=خطا در راÙ? اÙ?دازÛ?.
-torlauncher.tor_bootstrap_failed=تÙ?ر براÛ? اتصاÙ? بÙ? شبکÙ? تÙ?ر Ù?اÙ?Ù?Ù?Ù? Ù?Û? باشد (%S).
+torlauncher.tor_bootstrap_failed=تÙ?ر براÛ? اتصاÙ? بÙ? شبکÙ? تÙ?ر Ù?اÙ?Ù?Ù?Ù? Ù?Û? باشد.
+torlauncher.tor_bootstrap_failed_details=%1$S Ù?اÙ?Ù?Ù?Ù? (%2$S).
 
 torlauncher.unable_to_start_tor=راÙ? اÙ?دازÛ? تÙ?ر اÙ?کاÙ? پذÛ?ر Ù?Ù?Û? باشد.\n\n%S
 torlauncher.tor_missing=تÙ?ر اجرا Ø´Ù?Ù?دÙ? Û?اÙ?ت Ù?شد.
diff --git a/src/chrome/locale/fi/torlauncher.properties b/src/chrome/locale/fi/torlauncher.properties
index 3f35f69..ffc6a21 100644
--- a/src/chrome/locale/fi/torlauncher.properties
+++ b/src/chrome/locale/fi/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S epäonnistui (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=Yhdistetään reititinlistaan
 torlauncher.bootstrapStatus.handshake_dir=Muodostetaan suojattu hakemistoyhteys
 torlauncher.bootstrapStatus.requesting_status=Selvitetään verkon tilaa
diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties
index be36d43..86ba52e 100644
--- a/src/chrome/locale/fr/torlauncher.properties
+++ b/src/chrome/locale/fr/torlauncher.properties
@@ -7,7 +7,8 @@ torlauncher.tor_exited=Le programme Tor s'est terminé de manière inatendue.
 torlauncher.please_restart_app=Veuillez redémarrer l'application.
 torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor.
 torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer.
-torlauncher.tor_bootstrap_failed=Tor n'a pas réussi à établir une connexion au réseau Tor (%S).
+torlauncher.tor_bootstrap_failed=Tor n'a pas réussi à établir une connexion au réseau Tor.
+torlauncher.tor_bootstrap_failed_details=%1$S échec (%2$S).
 
 torlauncher.unable_to_start_tor=Impossible de démarrer Tor.\n\n%S
 torlauncher.tor_missing=L'exécutable Tor est introuvable.
diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties
index c1e2c80..525bd3c 100644
--- a/src/chrome/locale/he/torlauncher.properties
+++ b/src/chrome/locale/he/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S ×?ש×? (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=×?ת×?×?ר ×?עת ×?×? ×?×?×?ר ×?×?סר
 torlauncher.bootstrapStatus.handshake_dir=×?ק×?×? ×?עת ×?×?×?×?ר ספר×?×?ת ×?×?צפ×?
 torlauncher.bootstrapStatus.requesting_status=×?×?תר ×?עת ×?ת ×?צ×? ×?רשת
diff --git a/src/chrome/locale/hr-HR/torlauncher.properties b/src/chrome/locale/hr-HR/torlauncher.properties
index 80d540c..835f796 100644
--- a/src/chrome/locale/hr-HR/torlauncher.properties
+++ b/src/chrome/locale/hr-HR/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S neuspjelo (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=Spajanje na mapu releja
 torlauncher.bootstrapStatus.handshake_dir=Uspostavljanje Å¡ifrirane veze prema mapi
 torlauncher.bootstrapStatus.requesting_status=DohvaÄ?anje statusa mreže
diff --git a/src/chrome/locale/hu/torlauncher.properties b/src/chrome/locale/hu/torlauncher.properties
index 6f39d92..f388fad 100644
--- a/src/chrome/locale/hu/torlauncher.properties
+++ b/src/chrome/locale/hu/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S sikertelen (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=Csatlakozás egy Elosztó címtárhoz
 torlauncher.bootstrapStatus.handshake_dir=Titkosított címtárkapcsolat létrehozása
 torlauncher.bootstrapStatus.requesting_status=Hálózat státuszának lekérdezése
diff --git a/src/chrome/locale/id/torlauncher.properties b/src/chrome/locale/id/torlauncher.properties
index 0b5f80d..1ea0dbb 100644
--- a/src/chrome/locale/id/torlauncher.properties
+++ b/src/chrome/locale/id/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S gagal (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=Menghubungkan diri ke direktori relay
 torlauncher.bootstrapStatus.handshake_dir=Membuat koneksi direktori terenkripsi 
 torlauncher.bootstrapStatus.requesting_status=Mengambil status jaringan
diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties
index 9566559..8f20ef3 100644
--- a/src/chrome/locale/it/torlauncher.properties
+++ b/src/chrome/locale/it/torlauncher.properties
@@ -7,7 +7,8 @@ torlauncher.tor_exited=Tor si è arrestato inaspettatamente.
 torlauncher.please_restart_app=Per favore riavvia questa applicazione.
 torlauncher.tor_controlconn_failed=Impossibile connettersi alla porta di controllo di Tor.
 torlauncher.tor_failed_to_start=Si è verificato un errore nell'avvio di Tor.
-torlauncher.tor_bootstrap_failed=Si è verificato un errore nello stabilire una connessione alla rete Tor (%S).
+torlauncher.tor_bootstrap_failed=Si è verificato un errore nello stabilire una connessione alla rete Tor.
+torlauncher.tor_bootstrap_failed_details=%1$S fallito (%2$S).
 
 torlauncher.unable_to_start_tor=Impossibile avviare Tor.â??\nâ??\n%S
 torlauncher.tor_missing=Il file eseguibile di Tor è mancante.
diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties
index b9a2cd7..80769e1 100644
--- a/src/chrome/locale/ja/torlauncher.properties
+++ b/src/chrome/locale/ja/torlauncher.properties
@@ -7,7 +7,8 @@ torlauncher.tor_exited=Torã?¯äº?æ??ã??ã??çµ?äº?ã??ã?¾ã??ã??ã??
 torlauncher.please_restart_app=ã??ã?®ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã??å??èµ·å??ã??ã?¦ã??ã? ã??ã??ã??
 torlauncher.tor_controlconn_failed=Torã?®ã?³ã?³ã??ã?­ã?¼ã?«ã??ã?¼ã??ã?«æ?¥ç¶?å?ºæ?¥ã?¾ã??ã??ã?§ã??ã??ã??
 torlauncher.tor_failed_to_start=Torã?¯é??å§?å?ºæ?¥ã?¾ã??ã??ã?§ã??ã??ã??
-torlauncher.tor_bootstrap_failed=Torã?¯Torã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?ã?®ç¢ºç«?ã?«å¤±æ??ã??ã?¾ã??ã?? (%S)ã??
+torlauncher.tor_bootstrap_failed=Torã?¯Torã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?ã?®ç¢ºç«?ã?«å¤±æ??ã??ã?¾ã??ã??ã??
+torlauncher.tor_bootstrap_failed_details=%1$S 失æ?? (%2$S).
 
 torlauncher.unable_to_start_tor=Torã??é??å§?å?ºæ?¥ã?¾ã??ã??ã??\n\n%S
 torlauncher.tor_missing=Torã?®å®?è¡?å?¯è?½ã??ã?¡ã?¤ã?«ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã??
diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties
index 3bc1ee9..74aff03 100644
--- a/src/chrome/locale/ko/torlauncher.properties
+++ b/src/chrome/locale/ko/torlauncher.properties
@@ -7,7 +7,8 @@
 # torlauncher.please_restart_app=Please restart this application.
 # torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 # torlauncher.tor_failed_to_start=Tor failed to start.
-# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection (%S).
+# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
+torlauncher.tor_bootstrap_failed_details=%1$S �� (%2$S).
 
 # torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 # torlauncher.tor_missing=The Tor executable is missing.
diff --git a/src/chrome/locale/lt/torlauncher.properties b/src/chrome/locale/lt/torlauncher.properties
index 0387fba..e2924cf 100644
--- a/src/chrome/locale/lt/torlauncher.properties
+++ b/src/chrome/locale/lt/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S nepavyko (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=Jungiamasi prie retransliavimo taškų
 torlauncher.bootstrapStatus.handshake_dir=Užmezgiamas ryšys
 torlauncher.bootstrapStatus.requesting_status=Nuskaitoma tinklo bÅ«klÄ?
diff --git a/src/chrome/locale/lv/torlauncher.properties b/src/chrome/locale/lv/torlauncher.properties
index a92044f..cef7593 100644
--- a/src/chrome/locale/lv/torlauncher.properties
+++ b/src/chrome/locale/lv/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S neizdevÄ?s (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=Veido savienojumu ar retranslatoru direktoriju
 torlauncher.bootstrapStatus.handshake_dir=Izveido Å¡ifrÄ?tu savienojumu ar direktoriju
 torlauncher.bootstrapStatus.requesting_status=Izgūst tīkla statusu
diff --git a/src/chrome/locale/my/torlauncher.properties b/src/chrome/locale/my/torlauncher.properties
index abfd502..6bbb1d7 100644
--- a/src/chrome/locale/my/torlauncher.properties
+++ b/src/chrome/locale/my/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?« (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=Relay á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸ á??á??á?ºá??á?¯á??á?­á?¯ á??á??á?ºá??á?½á??á?ºá??á?±á??á??á?º
 torlauncher.bootstrapStatus.handshake_dir=á??á?¬á??á?¾á??á?ºá??á?¬á?¸á??á??á?ºá?· á??á?­á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸ á??á?»á?­á??á?ºá??á??á?ºá??á?¾á?¯ á??á??á?ºá??á?¯ á??á??á?ºá??á?±á?¬á??á?ºá??á?±á??á??á?º
 torlauncher.bootstrapStatus.requesting_status=á??á?½á??á?ºá??á??á?º á?¡á??á?±á?¡á??á?¬á?¸á??á?­á?¯ á??á?¼á??á?ºá??á??á?°á??á?±á??á??á?º
diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties
index c706902..6043de3 100644
--- a/src/chrome/locale/nb/torlauncher.properties
+++ b/src/chrome/locale/nb/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S feilet (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=Kobler til en relékatalog 
 torlauncher.bootstrapStatus.handshake_dir=Etablerer en kryptert katalogforbindelse
 torlauncher.bootstrapStatus.requesting_status=Mottar nettverkstatus
diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties
index 780f40b..c436126 100644
--- a/src/chrome/locale/nl/torlauncher.properties
+++ b/src/chrome/locale/nl/torlauncher.properties
@@ -7,7 +7,8 @@ torlauncher.tor_exited=Tor is onverwacht afgesloten.
 torlauncher.please_restart_app=Herstart deze applicatie alstublieft.
 torlauncher.tor_controlconn_failed=Kon niet verbinden met een Tor controlepoort.
 torlauncher.tor_failed_to_start=Tor kon niet starten.
-torlauncher.tor_bootstrap_failed=Tor slaagde er niet in een verbinding met het Tor netwerk te maken (%S).
+torlauncher.tor_bootstrap_failed=Tor slaagde er niet in een verbinding met het Tor netwerk te maken.
+torlauncher.tor_bootstrap_failed_details=%1$S mislukt (%2$S).
 
 torlauncher.unable_to_start_tor=Kon Tor niet starten.\n\n%S
 torlauncher.tor_missing=Het Tor uitvoerbare bestand ontbreekt.
diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties
index 537a7c0..8a9482b 100644
--- a/src/chrome/locale/pl/torlauncher.properties
+++ b/src/chrome/locale/pl/torlauncher.properties
@@ -7,7 +7,8 @@ torlauncher.tor_exited=Tor wyÅ?Ä?czyÅ? siÄ? niespodziewanie.
 torlauncher.please_restart_app=ProszÄ? zrestartuj tÄ? aplikacjÄ?.
 torlauncher.tor_controlconn_failed=Nie można poÅ?Ä?czyÄ? siÄ? z portem kontrolnym Tora.
 torlauncher.tor_failed_to_start=Nie powiodÅ?o siÄ? wÅ?Ä?czenie Tora.
-torlauncher.tor_bootstrap_failed=BÅ?Ä?d w ustanowieniu poÅ?Ä?czenia przez Tora (%S).
+torlauncher.tor_bootstrap_failed=BÅ?Ä?d w ustanowieniu poÅ?Ä?czenia przez Tora.
+torlauncher.tor_bootstrap_failed_details=%1$S nie powiodÅ?o siÄ? (%2$S).
 
 torlauncher.unable_to_start_tor=Nie można wystartowaÄ? aplikacji Tor.\n\n%S
 torlauncher.tor_missing=Brakuje pliku wykonywalnego Tora.
diff --git a/src/chrome/locale/pt-BR/torlauncher.properties b/src/chrome/locale/pt-BR/torlauncher.properties
index 83f9f9c..d64e32b 100644
--- a/src/chrome/locale/pt-BR/torlauncher.properties
+++ b/src/chrome/locale/pt-BR/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S falha (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=Conectando a um diretório de servidores
 torlauncher.bootstrapStatus.handshake_dir=Estabelecendo conexão de diretório criptografado
 torlauncher.bootstrapStatus.requesting_status=Recebendo estado da rede
diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties
index 0caeb1f..13008d4 100644
--- a/src/chrome/locale/pt/torlauncher.properties
+++ b/src/chrome/locale/pt/torlauncher.properties
@@ -7,7 +7,8 @@ torlauncher.tor_exited=O Tor fechou-se insperadamente.
 torlauncher.please_restart_app=Por favor reinicie a aplicação.
 torlauncher.tor_controlconn_failed=Não foi possível ligar à porta de controlo do Tor.
 torlauncher.tor_failed_to_start=O Tor falhou a inicialização.
-torlauncher.tor_bootstrap_failed=o Tor não conseguiu ligar-se à rede Tor (%S).
+torlauncher.tor_bootstrap_failed=o Tor não conseguiu ligar-se à rede Tor.
+torlauncher.tor_bootstrap_failed_details=%1$S Falhou (%2$S).
 
 torlauncher.unable_to_start_tor=Impossível inicializar o Tor.\n\n %S
 torlauncher.tor_missing=O executável do Tor está em falta.
diff --git a/src/chrome/locale/ro/torlauncher.properties b/src/chrome/locale/ro/torlauncher.properties
index 79fff0e..5418881 100644
--- a/src/chrome/locale/ro/torlauncher.properties
+++ b/src/chrome/locale/ro/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S Nu a reuÅ?it (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=Conectare la un director relay
 torlauncher.bootstrapStatus.handshake_dir=Se stabileÅ?te o conexiune criptatÄ? la director
 torlauncher.bootstrapStatus.requesting_status=Se obţin informaţii despre starea reţelei
diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties
index 141c2c1..20b9155 100644
--- a/src/chrome/locale/ru/torlauncher.properties
+++ b/src/chrome/locale/ru/torlauncher.properties
@@ -7,7 +7,8 @@ torlauncher.tor_exited=Tor неожиданно завеÑ?Ñ?илÑ?Ñ?.
 torlauncher.please_restart_app=Ð?ожалÑ?йÑ?Ñ?а, пеÑ?езапÑ?Ñ?Ñ?иÑ?е пÑ?иложение
 torlauncher.tor_controlconn_failed=Ð?евозможно Ñ?оединиÑ?Ñ?Ñ?Ñ? Ñ? поÑ?Ñ?ом Ñ?пÑ?авлениÑ? Tor.
 torlauncher.tor_failed_to_start=Ð?евозможно запÑ?Ñ?Ñ?иÑ?Ñ? Tor.
-torlauncher.tor_bootstrap_failed=Tor не Ñ?Ñ?мел Ñ?Ñ?Ñ?ановиÑ?Ñ? Ñ?еÑ?евое Ñ?оединение (%S).
+torlauncher.tor_bootstrap_failed=Tor не Ñ?Ñ?мел Ñ?Ñ?Ñ?ановиÑ?Ñ? Ñ?еÑ?евое Ñ?оединение.
+torlauncher.tor_bootstrap_failed_details=%1$S не Ñ?далоÑ?Ñ? (%2$S).
 
 torlauncher.unable_to_start_tor=Ð?евозможно запÑ?Ñ?Ñ?иÑ?Ñ? Tor.\n\n%S
 torlauncher.tor_missing=Ð?Ñ?полнÑ?емÑ?й Ñ?айл Tor оÑ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ?.
diff --git a/src/chrome/locale/sk/torlauncher.properties b/src/chrome/locale/sk/torlauncher.properties
index f4b446f..1abb28d 100644
--- a/src/chrome/locale/sk/torlauncher.properties
+++ b/src/chrome/locale/sk/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S zlyhalo (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
 torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
diff --git a/src/chrome/locale/sr/torlauncher.properties b/src/chrome/locale/sr/torlauncher.properties
index bb9b993..4a8dbb2 100644
--- a/src/chrome/locale/sr/torlauncher.properties
+++ b/src/chrome/locale/sr/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S неÑ?Ñ?пело (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=Ð?овезиваÑ?е Ñ?а Ñ?елеÑ? диÑ?екÑ?оÑ?иÑ?Ñ?мом
 torlauncher.bootstrapStatus.handshake_dir=УÑ?поÑ?Ñ?авÑ?аÑ?е Ñ?иÑ?Ñ?оване везе диÑ?екÑ?оÑ?иÑ?Ñ?ма
 torlauncher.bootstrapStatus.requesting_status=Ð?Ñ?еÑ?зимаÑ?е мÑ?ежног Ñ?Ñ?аÑ?Ñ?Ñ?а
diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties
index 647ee4f..0a93939 100644
--- a/src/chrome/locale/sv/torlauncher.properties
+++ b/src/chrome/locale/sv/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S misslyckade (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=Ansluter till en nodkatalog
 torlauncher.bootstrapStatus.handshake_dir=Skapar en krypterad kataloganslutning
 torlauncher.bootstrapStatus.requesting_status=Hämtar nätverksstatusen
diff --git a/src/chrome/locale/th/torlauncher.properties b/src/chrome/locale/th/torlauncher.properties
index 1c0a755..fc9e1ca 100644
--- a/src/chrome/locale/th/torlauncher.properties
+++ b/src/chrome/locale/th/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S ล�ม�หลว (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=�ำลั���ื�อม��อ�ั� �ลั�����ราย�ื�อ relay (relay directory)
 torlauncher.bootstrapStatus.handshake_dir=�ำลั�สร�า��าร��ื�อม��อ������ารหัส�ั��ลั�����ราย�ื�อ
 torlauncher.bootstrapStatus.requesting_status=�ำลั��รว�ส�า�ะ��รือ��าย
diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties
index dff67aa..d175b3f 100644
--- a/src/chrome/locale/tr/torlauncher.properties
+++ b/src/chrome/locale/tr/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S hata (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=Aktarım klasörüne baÄ?lanıyor
 torlauncher.bootstrapStatus.handshake_dir=Å?ifrelenmiÅ? dizin baÄ?lantısı kuruluyor
 torlauncher.bootstrapStatus.requesting_status=AÄ? durumu güncelliyor
diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties
index e731323..7162829 100644
--- a/src/chrome/locale/vi/torlauncher.properties
+++ b/src/chrome/locale/vi/torlauncher.properties
@@ -7,7 +7,8 @@
 # torlauncher.please_restart_app=Please restart this application.
 # torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Chạy Tor thất bại.
-torlauncher.tor_bootstrap_failed=Không th� thiết lập kết n�i vào mạng Tor (%S).
+torlauncher.tor_bootstrap_failed=Không th� thiết lập kết n�i vào mạng Tor.
+torlauncher.tor_bootstrap_failed_details=%1$S thất bại (%2$S).
 
 # torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 # torlauncher.tor_missing=The Tor executable is missing.
diff --git a/src/chrome/locale/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties
index 2805383..6a98bfd 100644
--- a/src/chrome/locale/zh-CN/torlauncher.properties
+++ b/src/chrome/locale/zh-CN/torlauncher.properties
@@ -7,7 +7,8 @@ torlauncher.tor_exited=Tor æ??å¤?é??å?ºã??
 torlauncher.please_restart_app=请é??å?¯è¯¥åº?ç?¨ç¨?åº?ã??
 torlauncher.tor_controlconn_failed=æ? æ³?è¿?æ?¥ Tor æ?§å?¶ç«¯å?£ã??
 torlauncher.tor_failed_to_start=Tor æ? æ³?å?¯å?¨ã??
-torlauncher.tor_bootstrap_failed=Tor æ? æ³?建ç«? Tor ç½?ç»?è¿?æ?¥ (%S)ã??
+torlauncher.tor_bootstrap_failed=Tor æ? æ³?建ç«? Tor ç½?ç»?è¿?æ?¥ã??
+torlauncher.tor_bootstrap_failed_details=%1$S 失败 (%2$S).
 
 torlauncher.unable_to_start_tor=æ? æ³?å?¯å?¨ Torã??\n\n%S
 torlauncher.tor_missing=缺å°? Tor å?¯æ?§è¡?æ??件ã??
diff --git a/src/chrome/locale/zh-TW/torlauncher.properties b/src/chrome/locale/zh-TW/torlauncher.properties
index 317fe9b..1be7091 100644
--- a/src/chrome/locale/zh-TW/torlauncher.properties
+++ b/src/chrome/locale/zh-TW/torlauncher.properties
@@ -1,6 +1,8 @@
 ### Copyright (c) 2014, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
+torlauncher.tor_bootstrap_failed_details=%1$S 失æ?? (%2$S).
+
 torlauncher.bootstrapStatus.conn_dir=æ­£å?¨é?£ç·?è?³ä¸­ç¹¼ç«?ç?®é??
 torlauncher.bootstrapStatus.handshake_dir=æ­£å?¨å»ºç«?å? å¯?ç??ç?®é??é?£ç·?
 torlauncher.bootstrapStatus.requesting_descriptors=正���中繼���
diff --git a/src/components/tl-process.js b/src/components/tl-process.js
index f9b863e..f97fa59 100644
--- a/src/components/tl-process.js
+++ b/src/components/tl-process.js
@@ -412,10 +412,14 @@ TorProcessService.prototype =
       {
         this.mBootstrapErrorOccurred = true;
         TorLauncherUtil.setBoolPref(this.kPrefPromptAtStartup, true);
+        var phase = TorLauncherUtil.getLocalizedBootstrapStatus(aStatusObj,
+                                                                "TAG");
         var reason = TorLauncherUtil.getLocalizedBootstrapStatus(aStatusObj,
                                                                  "REASON");
-        TorLauncherLogger.log(5, "Tor bootstrap error: " + aStatusObj.REASON +
-                                 " (" + reason + ")");
+        var details = TorLauncherUtil.getFormattedLocalizedString(
+                          "tor_bootstrap_failed_details", [phase, reason], 2);
+        TorLauncherLogger.log(5, "Tor bootstrap error: [" + aStatusObj.TAG +
+                                 "/" + aStatusObj.REASON + "] " + details);
 
         if ((aStatusObj.TAG != this.mLastTorWarningPhase) ||
             (aStatusObj.REASON != this.mLastTorWarningReason))
@@ -423,9 +427,8 @@ TorProcessService.prototype =
           this.mLastTorWarningPhase = aStatusObj.TAG;
           this.mLastTorWarningReason = aStatusObj.REASON;
 
-          var s = TorLauncherUtil.getFormattedLocalizedString(
-                                         "tor_bootstrap_failed", [reason], 1);
-          TorLauncherUtil.showAlert(null, s);
+          var msg = TorLauncherUtil.getLocalizedString("tor_bootstrap_failed");
+          TorLauncherUtil.showAlert(null, msg + "\n\n" + details);
         
           this.mObsSvc.notifyObservers(null, "TorBootstrapError", reason);
         }


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