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

[tor-commits] [translation/bridgedb] Update translations for bridgedb

commit 8daaf5375e8be357a46be879e4488ccb65bcaef7
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Fri Apr 26 13:45:06 2013 +0000

    Update translations for bridgedb
---
 ar/bridgedb.po         |    2 +-
 es/bridgedb.po         |  133 ++++++++++++++++++++++++++++-------------------
 it/bridgedb.po         |  135 +++++++++++++++++++++++++++++-------------------
 ru/bridgedb.po         |  133 ++++++++++++++++++++++++++++-------------------
 templates/bridgedb.pot |  131 ++++++++++++++++++++++++++++------------------
 zh_CN/bridgedb.po      |    2 +-
 6 files changed, 322 insertions(+), 214 deletions(-)

diff --git a/ar/bridgedb.po b/ar/bridgedb.po
index 23aa39b..54ce6b0 100644
--- a/ar/bridgedb.po
+++ b/ar/bridgedb.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-04-23 19:55+0000\n"
+"PO-Revision-Date: 2013-04-26 13:26+0000\n"
 "Last-Translator: Sherief <sheriefalaa.w@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
diff --git a/es/bridgedb.po b/es/bridgedb.po
index 09bbbee..3a6601d 100644
--- a/es/bridgedb.po
+++ b/es/bridgedb.po
@@ -1,75 +1,102 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Translations template for BridgeDB.
+# Copyright (C) 2013 ORGANIZATION
+# This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# NinjaTuna <nort0ngh0st@xxxxxxxxxxx>, 2011.
-#  <strelnic@xxxxxxxxx>, 2013.
-#   <strelnic@xxxxxxxxx>, 2012.
+# NinjaTuna <nort0ngh0st@xxxxxxxxxxx>, 2011
+# strel <strelnic@xxxxxxxxx>, 2013
+# strel <strelnic@xxxxxxxxx>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-01-01 07:48-0800\n"
-"PO-Revision-Date: 2013-01-18 12:30+0000\n"
+"POT-Creation-Date: 2013-03-27 21:41+0000\n"
+"PO-Revision-Date: 2013-04-26 13:26+0000\n"
 "Last-Translator: strel <strelnic@xxxxxxxxx>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/bridgedb/I18n.py:21
-msgid "Here are your bridge relays: "
-msgstr "Estos son sus repetidores puente (bridge relays):"
+#: lib/bridgedb/templates/base.html:33
+msgid "What are bridges?"
+msgstr ""
 
-#: lib/bridgedb/I18n.py:23
+#: lib/bridgedb/templates/base.html:34
+#, python-format
 msgid ""
-"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\n"
-"in the main directory. Since there is no complete public list of them,\n"
-"even if your ISP is filtering connections to all the known Tor relays,\n"
-"they probably won't be able to block all the bridges."
-msgstr "Los repetidores puente (bridges para acortar) son repetidores de\nTor que no están listados en el repositorio principal de repetidores.\nAl no haber una lista pública completa de ellos, aún cuando su\nproveedor de Internet (ISP) esté filtrando conexiones a todos los repetidores conocidos de Tor, probablemente no serán capaces de bloquear todos los bridges."
+"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+msgstr ""
 
-#: lib/bridgedb/I18n.py:28
-msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click\n"
-"\"My ISP blocks connections to the Tor network\". Then add each bridge\n"
-"address one at a time."
-msgstr "Para usar las líneas de arriba, vaya a la pestaña Red de las\nPreferencias del Panel de control de Vidalia, y haga clic en \"Mi\nproveedor de Internet (ISP) bloquea las conexiones con la red Tor\"."
+#: lib/bridgedb/templates/base.html:39
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
 
-#: lib/bridgedb/I18n.py:32
+#: lib/bridgedb/templates/base.html:40
+#, python-format
 msgid ""
-"Configuring more than one bridge address will make your Tor connection\n"
-"more stable, in case some of the bridges become unreachable."
-msgstr "Configurar más de una dirección de bridge hará su conexión con Tor\nmás estable en caso de que algunos bridges se vuelvan inaccesibles."
+"Another way to find public bridge addresses is to send an email (from a %s "
+"or a %s address) to %s with the line 'get bridges' by itself in the body of "
+"the mail."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:48
+msgid "My bridges don't work! I need help!"
+msgstr ""
 
-#: lib/bridgedb/I18n.py:35
+#: lib/bridgedb/templates/base.html:49
+#, python-format
 msgid ""
-"Another way to find public bridge addresses is to send mail to\n"
-"bridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body\n"
-"of the mail. However, so we can make it harder for an attacker to learn\n"
-"lots of bridge addresses, you must send this request from an email address at\n"
-"one of the following domains:"
-msgstr "Otra forma de encontrar direcciones de bridges públicos es enviar un\ncorreo a bridges@xxxxxxxxxxxxxx con la línea \"get bridges\" por si sola\nen el cuerpo del correo. Sin embargo, para que podamos ponerle más\ndifícil a un atacante conseguir muchas direcciones de bridge, debe enviar\nesta petición desde una dirección de correo de uno de estos dominios: "
-
-#: lib/bridgedb/I18n.py:41
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Este es un mensaje automatizado; por favor no responda.]"
-
-#: lib/bridgedb/I18n.py:43
+"If your Tor doesn't work, you should email %s. Try including as much info "
+"about your case as you can, including the list of bridges you used, the "
+"bundle filename/version you used, the messages that Tor gave out, etc."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:10
 msgid ""
-"Another way to find public bridge addresses is to visit\n"
-"https://bridges.torproject.org/. The answers you get from that page\n"
-"will change every few days, so check back periodically if you need more\n"
-"bridge addresses."
-msgstr "Otra forma de encontrar direcciones de bridge es visitando\nhttps://bridges.torproject.org/ Los resultados que consiga de esa página\ncambiarán cada pocos días, así que compruébela periódicamente si\nnecesita más direcciones de bridge."
-
-#: lib/bridgedb/I18n.py:48
-msgid "(no bridges currently available)"
-msgstr "(no hay bridges disponibles en este momento)"
-
-#: lib/bridgedb/I18n.py:50
-msgid "(e-mail requests not currently supported)"
-msgstr "(no se aceptan peticiones por correo en este momento)"
+"To use the above lines, go to Vidalia's Network settings page, and click "
+"\"My ISP blocks connections to the Tor network\". Then add each bridge "
+"address one at a time."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:13
+msgid "No bridges currently available"
+msgstr ""
+
+#: lib/bridgedb/templates/captcha.html:6
+msgid "Upgrade your browser to Firefox"
+msgstr ""
+
+#: lib/bridgedb/templates/captcha.html:8
+msgid "Type the two words"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:6
+msgid "Step 1"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:8
+#, python-format
+msgid "Get %s Tor Browser Bundle %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+msgid "Step 2"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:15
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:19
+msgid "Step 3"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:21
+#, python-format
+msgid "Now %s add the bridges to Tor %s"
+msgstr ""
diff --git a/it/bridgedb.po b/it/bridgedb.po
index 65747e9..5eb875d 100644
--- a/it/bridgedb.po
+++ b/it/bridgedb.po
@@ -1,74 +1,101 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Translations template for BridgeDB.
+# Copyright (C) 2013 ORGANIZATION
+# This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-#   <ironbishop@xxxxxxxx>, 2011.
-#   <tru74368@xxxxxxxxx>, 2011.
+# ironbishop <ironbishop@xxxxxxxx>, 2011
+# fetidyoo <tru74368@xxxxxxxxx>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-01-01 07:48-0800\n"
-"PO-Revision-Date: 2012-02-14 10:04+0000\n"
+"POT-Creation-Date: 2013-03-27 21:41+0000\n"
+"PO-Revision-Date: 2013-04-26 13:26+0000\n"
 "Last-Translator: fetidyoo <tru74368@xxxxxxxxx>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/torproject/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/bridgedb/I18n.py:21
-msgid "Here are your bridge relays: "
-msgstr "Questi sono i tuoi relay bridge:"
+#: lib/bridgedb/templates/base.html:33
+msgid "What are bridges?"
+msgstr ""
 
-#: lib/bridgedb/I18n.py:23
+#: lib/bridgedb/templates/base.html:34
+#, python-format
 msgid ""
-"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\n"
-"in the main directory. Since there is no complete public list of them,\n"
-"even if your ISP is filtering connections to all the known Tor relays,\n"
-"they probably won't be able to block all the bridges."
-msgstr "I relay bridge (o \"bridge\" in breve) sono relay Tor che non sono elencati nella directory principale. Poiché non esiste un elenco completo pubblico, anche se il vostro ISP filtrasse le connessioni verso tutti i relay Tor conosciuti, probabilmente non sarebbe in grado di bloccare tutti i bridge."
+"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+msgstr ""
 
-#: lib/bridgedb/I18n.py:28
-msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click\n"
-"\"My ISP blocks connections to the Tor network\". Then add each bridge\n"
-"address one at a time."
-msgstr "Per utilizzare le righe precedenti, vai alla pagina Impostazioni di rete di Vidalia e fai click su \"Il mio ISP blocca le connessioni alla rete Tor\". Quindi aggiungi l'indirizzo di ciascun bridge, uno alla volta."
+#: lib/bridgedb/templates/base.html:39
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
 
-#: lib/bridgedb/I18n.py:32
+#: lib/bridgedb/templates/base.html:40
+#, python-format
 msgid ""
-"Configuring more than one bridge address will make your Tor connection\n"
-"more stable, in case some of the bridges become unreachable."
-msgstr "Configurare più di un indirizzo bridge renderà la tua connessione Tor più stabile, nel caso alcuni dei bridge diventino irraggiungibili."
+"Another way to find public bridge addresses is to send an email (from a %s "
+"or a %s address) to %s with the line 'get bridges' by itself in the body of "
+"the mail."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:48
+msgid "My bridges don't work! I need help!"
+msgstr ""
 
-#: lib/bridgedb/I18n.py:35
+#: lib/bridgedb/templates/base.html:49
+#, python-format
 msgid ""
-"Another way to find public bridge addresses is to send mail to\n"
-"bridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body\n"
-"of the mail. However, so we can make it harder for an attacker to learn\n"
-"lots of bridge addresses, you must send this request from an email address at\n"
-"one of the following domains:"
-msgstr "Un altro modo per ottenere indirizzi bridge è inviare una email a bridges@xxxxxxxxxxxxxx con la frase \"get bridges\" nel corpo del messaggio. Tuttavia, per rendere più difficile ad un utente malintenzionato la scoperta di molti indirizzi bridge, è necessario inviare la richiesta da un indirizzo appartenente a uno dei seguenti domini:"
-
-#: lib/bridgedb/I18n.py:41
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Questo è un messaggio automatico, si prega di non rispondere.]"
-
-#: lib/bridgedb/I18n.py:43
+"If your Tor doesn't work, you should email %s. Try including as much info "
+"about your case as you can, including the list of bridges you used, the "
+"bundle filename/version you used, the messages that Tor gave out, etc."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:10
 msgid ""
-"Another way to find public bridge addresses is to visit\n"
-"https://bridges.torproject.org/. The answers you get from that page\n"
-"will change every few days, so check back periodically if you need more\n"
-"bridge addresses."
-msgstr "Un altro modo per ottenere indirizzi bridge è visitare la pagina https://bridges.torproject.org/. Le risposte ottenute da questa pagina cambiano ogni pochi giorni, quindi visitala periodicamente se hai bisogno di più indirizzi bridge."
-
-#: lib/bridgedb/I18n.py:48
-msgid "(no bridges currently available)"
-msgstr "(al momento non sono disponibili bridge)"
-
-#: lib/bridgedb/I18n.py:50
-msgid "(e-mail requests not currently supported)"
-msgstr "(al momento le richieste e-mail non sono supportate)"
+"To use the above lines, go to Vidalia's Network settings page, and click "
+"\"My ISP blocks connections to the Tor network\". Then add each bridge "
+"address one at a time."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:13
+msgid "No bridges currently available"
+msgstr ""
+
+#: lib/bridgedb/templates/captcha.html:6
+msgid "Upgrade your browser to Firefox"
+msgstr ""
+
+#: lib/bridgedb/templates/captcha.html:8
+msgid "Type the two words"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:6
+msgid "Step 1"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:8
+#, python-format
+msgid "Get %s Tor Browser Bundle %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+msgid "Step 2"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:15
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:19
+msgid "Step 3"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:21
+#, python-format
+msgid "Now %s add the bridges to Tor %s"
+msgstr ""
diff --git a/ru/bridgedb.po b/ru/bridgedb.po
index a505da0..533b215 100644
--- a/ru/bridgedb.po
+++ b/ru/bridgedb.po
@@ -1,73 +1,100 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Translations template for BridgeDB.
+# Copyright (C) 2013 ORGANIZATION
+# This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-#   <liquixis@xxxxxxxxx>, 2012.
+# liquixis <liquixis@xxxxxxxxx>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-01-01 07:48-0800\n"
-"PO-Revision-Date: 2012-02-14 10:04+0000\n"
+"POT-Creation-Date: 2013-03-27 21:41+0000\n"
+"PO-Revision-Date: 2013-04-26 13:26+0000\n"
 "Last-Translator: liquixis <liquixis@xxxxxxxxx>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
 "Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: lib/bridgedb/I18n.py:21
-msgid "Here are your bridge relays: "
-msgstr "ЭÑ?о ваÑ?и Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?Ñ? моÑ?Ñ?ов: "
+#: lib/bridgedb/templates/base.html:33
+msgid "What are bridges?"
+msgstr ""
 
-#: lib/bridgedb/I18n.py:23
+#: lib/bridgedb/templates/base.html:34
+#, python-format
 msgid ""
-"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\n"
-"in the main directory. Since there is no complete public list of them,\n"
-"even if your ISP is filtering connections to all the known Tor relays,\n"
-"they probably won't be able to block all the bridges."
-msgstr "РеÑ?Ñ?анÑ?лÑ?Ñ?оÑ?Ñ? моÑ?Ñ?ов (или пÑ?оÑ?Ñ?о \"моÑ?Ñ?Ñ?\") Ñ?Ñ?о Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?Ñ? Tor коÑ?оÑ?Ñ?е не пеÑ?еÑ?иÑ?лÑ?Ñ?Ñ?Ñ?Ñ?\nв главной диÑ?екÑ?оÑ?ии. Ð?оÑ?колÑ?кÑ? неÑ? иÑ? полного пÑ?блиÑ?ного Ñ?пиÑ?ка,\nÑ?о даже еÑ?ли ваÑ? пÑ?овайдеÑ? Ð?нÑ?еÑ?неÑ? оÑ?Ñ?илÑ?Ñ?Ñ?овÑ?ваеÑ? Ñ?оединениÑ? ко вÑ?ем извеÑ?Ñ?нÑ?м Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?ам Tor,\nон возможно не Ñ?можеÑ? заблокиÑ?оваÑ?Ñ? вÑ?е моÑ?Ñ?Ñ?."
+"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+msgstr ""
 
-#: lib/bridgedb/I18n.py:28
-msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click\n"
-"\"My ISP blocks connections to the Tor network\". Then add each bridge\n"
-"address one at a time."
-msgstr "Ð?лÑ? иÑ?полÑ?зованиÑ? Ñ?Ñ?Ñ?ок вÑ?Ñ?е, оÑ?кÑ?ойÑ?е Ñ?Ñ?Ñ?аниÑ?Ñ? Vidalia наÑ?Ñ?Ñ?ойки СеÑ?и, и нажмиÑ?е\n\"Ð?ой пÑ?овайдеÑ? Ð?нÑ?еÑ?неÑ? блокиÑ?Ñ?еÑ? Ñ?оединениÑ? Ñ? Ñ?еÑ?Ñ?Ñ? Tor\". Ð?аÑ?ем добавÑ?Ñ?е каждÑ?й адÑ?еÑ? моÑ?Ñ?а\nза Ñ?аз."
+#: lib/bridgedb/templates/base.html:39
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
 
-#: lib/bridgedb/I18n.py:32
+#: lib/bridgedb/templates/base.html:40
+#, python-format
 msgid ""
-"Configuring more than one bridge address will make your Tor connection\n"
-"more stable, in case some of the bridges become unreachable."
-msgstr "Ð?аÑ?Ñ?Ñ?ойка более Ñ?ем одного адÑ?еÑ?а моÑ?Ñ?а Ñ?делаеÑ? ваÑ?е Ñ?оединение Tor\nболее Ñ?Ñ?абилÑ?нÑ?м, в Ñ?лÑ?Ñ?аÑ?Ñ? еÑ?ли неÑ?колÑ?ко моÑ?Ñ?ов Ñ?Ñ?анÑ?Ñ? недоÑ?Ñ?Ñ?пнÑ?."
+"Another way to find public bridge addresses is to send an email (from a %s "
+"or a %s address) to %s with the line 'get bridges' by itself in the body of "
+"the mail."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:48
+msgid "My bridges don't work! I need help!"
+msgstr ""
 
-#: lib/bridgedb/I18n.py:35
+#: lib/bridgedb/templates/base.html:49
+#, python-format
 msgid ""
-"Another way to find public bridge addresses is to send mail to\n"
-"bridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body\n"
-"of the mail. However, so we can make it harder for an attacker to learn\n"
-"lots of bridge addresses, you must send this request from an email address at\n"
-"one of the following domains:"
-msgstr "Ð?Ñ?Ñ?гой Ñ?поÑ?об найÑ?и адÑ?еÑ?а пÑ?блиÑ?нÑ?Ñ? моÑ?Ñ?ов - Ñ?Ñ?о оÑ?пÑ?авиÑ?Ñ? e-mail на адÑ?еÑ?\nbridges@xxxxxxxxxxxxxx Ñ?о Ñ?Ñ?Ñ?окой \"get bridges\" в каÑ?еÑ?Ñ?ве Ñ?ела\nÑ?ообÑ?ениÑ?. Ð?днако, мÑ? можем Ñ?делаÑ?Ñ? Ñ?Ñ?Ñ?днее длÑ? аÑ?акÑ?Ñ?Ñ?его Ñ?знаÑ?Ñ?\nмножеÑ?Ñ?во адÑ?еÑ?ов моÑ?Ñ?ов, вÑ? должнÑ? оÑ?пÑ?авиÑ?Ñ? Ñ?Ñ?оÑ? запÑ?оÑ? Ñ? e-mail адÑ?еÑ?а на\nодном из Ñ?ледÑ?Ñ?Ñ?иÑ? доменов:"
-
-#: lib/bridgedb/I18n.py:41
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[ЭÑ?о авÑ?омаÑ?иÑ?еÑ?кое Ñ?ообÑ?ение; пожалÑ?йÑ?Ñ?а, не оÑ?веÑ?айÑ?е на него.]"
-
-#: lib/bridgedb/I18n.py:43
+"If your Tor doesn't work, you should email %s. Try including as much info "
+"about your case as you can, including the list of bridges you used, the "
+"bundle filename/version you used, the messages that Tor gave out, etc."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:10
 msgid ""
-"Another way to find public bridge addresses is to visit\n"
-"https://bridges.torproject.org/. The answers you get from that page\n"
-"will change every few days, so check back periodically if you need more\n"
-"bridge addresses."
-msgstr "Ð?Ñ?Ñ?гой Ñ?поÑ?об найÑ?и адÑ?еÑ?а пÑ?блиÑ?нÑ?Ñ? моÑ?Ñ?ов - Ñ?Ñ?о поÑ?еÑ?иÑ?Ñ?\nhttps://bridges.torproject.org/. Ð?аннÑ?е на Ñ?Ñ?ой Ñ?Ñ?Ñ?аниÑ?е\nменÑ?Ñ?Ñ?Ñ?Ñ? каждÑ?е неÑ?колÑ?ко дней, Ñ?ак Ñ?Ñ?о заÑ?одиÑ?е пеÑ?иодиÑ?еÑ?ки еÑ?ли вам бÑ?дÑ?Ñ? нÑ?жнÑ? еÑ?е\nадÑ?еÑ?а моÑ?Ñ?ов."
-
-#: lib/bridgedb/I18n.py:48
-msgid "(no bridges currently available)"
-msgstr "(на даннÑ?й моменÑ? неÑ? доÑ?Ñ?Ñ?пнÑ?Ñ? моÑ?Ñ?ов)"
-
-#: lib/bridgedb/I18n.py:50
-msgid "(e-mail requests not currently supported)"
-msgstr "(e-mail запоÑ?Ñ? на даннÑ?й моменÑ? не поддеÑ?живаÑ?Ñ?Ñ?Ñ?)"
+"To use the above lines, go to Vidalia's Network settings page, and click "
+"\"My ISP blocks connections to the Tor network\". Then add each bridge "
+"address one at a time."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:13
+msgid "No bridges currently available"
+msgstr ""
+
+#: lib/bridgedb/templates/captcha.html:6
+msgid "Upgrade your browser to Firefox"
+msgstr ""
+
+#: lib/bridgedb/templates/captcha.html:8
+msgid "Type the two words"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:6
+msgid "Step 1"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:8
+#, python-format
+msgid "Get %s Tor Browser Bundle %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+msgid "Step 2"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:15
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:19
+msgid "Step 3"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:21
+#, python-format
+msgid "Now %s add the bridges to Tor %s"
+msgstr ""
diff --git a/templates/bridgedb.pot b/templates/bridgedb.pot
index 8314599..78b0404 100644
--- a/templates/bridgedb.pot
+++ b/templates/bridgedb.pot
@@ -1,73 +1,100 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Translations template for BridgeDB.
+# Copyright (C) 2013 ORGANIZATION
+# This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# runasand <runa.sandvik@xxxxxxxxx>, 2011.
+# runasand <runa.sandvik@xxxxxxxxx>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2011-01-01 07:48-0800\n"
-"PO-Revision-Date: 2012-02-14 10:04+0000\n"
+"POT-Creation-Date: 2013-03-27 21:41+0000\n"
+"PO-Revision-Date: 2013-04-26 13:26+0000\n"
 "Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
 "Language: en\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/bridgedb/I18n.py:21
-msgid "Here are your bridge relays: "
-msgstr "Here are your bridge relays: "
+#: lib/bridgedb/templates/base.html:33
+msgid "What are bridges?"
+msgstr "What are bridges?"
 
-#: lib/bridgedb/I18n.py:23
+#: lib/bridgedb/templates/base.html:34
+#, python-format
 msgid ""
-"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\n"
-"in the main directory. Since there is no complete public list of them,\n"
-"even if your ISP is filtering connections to all the known Tor relays,\n"
-"they probably won't be able to block all the bridges."
-msgstr "Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\nin the main directory. Since there is no complete public list of them,\neven if your ISP is filtering connections to all the known Tor relays,\nthey probably won't be able to block all the bridges."
+"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+msgstr "%s Bridge relays %s are Tor relays that help you circumvent censorship."
 
-#: lib/bridgedb/I18n.py:28
-msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click\n"
-"\"My ISP blocks connections to the Tor network\". Then add each bridge\n"
-"address one at a time."
-msgstr "To use the above lines, go to Vidalia's Network settings page, and click\n\"My ISP blocks connections to the Tor network\". Then add each bridge\naddress one at a time."
+#: lib/bridgedb/templates/base.html:39
+msgid "I need an alternative way of getting bridges!"
+msgstr "I need an alternative way of getting bridges!"
 
-#: lib/bridgedb/I18n.py:32
+#: lib/bridgedb/templates/base.html:40
+#, python-format
 msgid ""
-"Configuring more than one bridge address will make your Tor connection\n"
-"more stable, in case some of the bridges become unreachable."
-msgstr "Configuring more than one bridge address will make your Tor connection\nmore stable, in case some of the bridges become unreachable."
+"Another way to find public bridge addresses is to send an email (from a %s "
+"or a %s address) to %s with the line 'get bridges' by itself in the body of "
+"the mail."
+msgstr "Another way to find public bridge addresses is to send an email (from a %s or a %s address) to %s with the line 'get bridges' by itself in the body of the mail."
 
-#: lib/bridgedb/I18n.py:35
+#: lib/bridgedb/templates/base.html:48
+msgid "My bridges don't work! I need help!"
+msgstr "My bridges don't work! I need help!"
+
+#: lib/bridgedb/templates/base.html:49
+#, python-format
 msgid ""
-"Another way to find public bridge addresses is to send mail to\n"
-"bridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body\n"
-"of the mail. However, so we can make it harder for an attacker to learn\n"
-"lots of bridge addresses, you must send this request from an email address at\n"
-"one of the following domains:"
-msgstr "Another way to find public bridge addresses is to send mail to\nbridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body\nof the mail. However, so we can make it harder for an attacker to learn\nlots of bridge addresses, you must send this request from an email address at\none of the following domains:"
-
-#: lib/bridgedb/I18n.py:41
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[This is an automated message; please do not reply.]"
-
-#: lib/bridgedb/I18n.py:43
+"If your Tor doesn't work, you should email %s. Try including as much info "
+"about your case as you can, including the list of bridges you used, the "
+"bundle filename/version you used, the messages that Tor gave out, etc."
+msgstr "If your Tor doesn't work, you should email %s. Try including as much info about your case as you can, including the list of bridges you used, the bundle filename/version you used, the messages that Tor gave out, etc."
+
+#: lib/bridgedb/templates/bridges.html:10
 msgid ""
-"Another way to find public bridge addresses is to visit\n"
-"https://bridges.torproject.org/. The answers you get from that page\n"
-"will change every few days, so check back periodically if you need more\n"
-"bridge addresses."
-msgstr "Another way to find public bridge addresses is to visit\nhttps://bridges.torproject.org/. The answers you get from that page\nwill change every few days, so check back periodically if you need more\nbridge addresses."
-
-#: lib/bridgedb/I18n.py:48
-msgid "(no bridges currently available)"
-msgstr "(no bridges currently available)"
-
-#: lib/bridgedb/I18n.py:50
-msgid "(e-mail requests not currently supported)"
-msgstr "(e-mail requests not currently supported)"
+"To use the above lines, go to Vidalia's Network settings page, and click "
+"\"My ISP blocks connections to the Tor network\". Then add each bridge "
+"address one at a time."
+msgstr "To use the above lines, go to Vidalia's Network settings page, and click \"My ISP blocks connections to the Tor network\". Then add each bridge address one at a time."
+
+#: lib/bridgedb/templates/bridges.html:13
+msgid "No bridges currently available"
+msgstr "No bridges currently available"
+
+#: lib/bridgedb/templates/captcha.html:6
+msgid "Upgrade your browser to Firefox"
+msgstr "Upgrade your browser to Firefox"
+
+#: lib/bridgedb/templates/captcha.html:8
+msgid "Type the two words"
+msgstr "Type the two words"
+
+#: lib/bridgedb/templates/index.html:6
+msgid "Step 1"
+msgstr "Step 1"
+
+#: lib/bridgedb/templates/index.html:8
+#, python-format
+msgid "Get %s Tor Browser Bundle %s"
+msgstr "Get %s Tor Browser Bundle %s"
+
+#: lib/bridgedb/templates/index.html:13
+msgid "Step 2"
+msgstr "Step 2"
+
+#: lib/bridgedb/templates/index.html:15
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Get %s bridges %s"
+
+#: lib/bridgedb/templates/index.html:19
+msgid "Step 3"
+msgstr "Step 3"
+
+#: lib/bridgedb/templates/index.html:21
+#, python-format
+msgid "Now %s add the bridges to Tor %s"
+msgstr "Now %s add the bridges to Tor %s"
diff --git a/zh_CN/bridgedb.po b/zh_CN/bridgedb.po
index 8f1517c..732d423 100644
--- a/zh_CN/bridgedb.po
+++ b/zh_CN/bridgedb.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
 "POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-04-19 16:27+0000\n"
+"PO-Revision-Date: 2013-04-26 13:26+0000\n"
 "Last-Translator: simabull tsai\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"


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