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

[or-cvs] [bridgedb/master] Update .pot and .po files and instructions for updating them.

To: or-cvs@xxxxxxxxxxxxx
Subject: [or-cvs] [bridgedb/master] Update .pot and .po files and instructions for updating them.
From: nickm@xxxxxxxxxxxxxx
Date: Mon, 14 Feb 2011 20:54:15 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivered-to: or-cvs-outgoing@xxxxxxxx
Delivered-to: or-cvs@xxxxxxxx
Delivery-date: Mon, 14 Feb 2011 15:54:37 -0500
Patch-author: Robert Ransom <rransom.8774@xxxxxxxxx>
Reply-to: or-cvs@xxxxxxxxxxxxx
Sender: owner-or-cvs@xxxxxxxxxxxxx

commit fa77b306725ed176c6deb78ed12ff2fd4a133d96
Author: Robert Ransom <rransom.8774@xxxxxxxxx>
Date:   Sat Jan 1 08:25:55 2011 -0800

    Update .pot and .po files and instructions for updating them.
---
 README                      |   10 ++++++----
 i18n/de/bridgedb.po         |   18 ++++++++++++------
 i18n/en/bridgedb.po         |   37 +++++++++++++++++++++++++++++++------
 i18n/templates/bridgedb.pot |   12 +++++++++---
 4 files changed, 58 insertions(+), 19 deletions(-)

diff --git a/README b/README
index 00b8a41..a77369f 100644
--- a/README
+++ b/README
@@ -12,9 +12,12 @@ To set up:
      openssl req -x509 -new -nodes > cert
  - Set up PYTHONPATH to include "~/lib/python2.4/site-packages/".
 
-To re-generate the i18n template (in case translation strings have changed 
-in BridgeDB):
- - Run "xgettext lib/bridgedb/I18n.py -dbridgedb -oi18n/templates/bridgedb.pot"
+To re-generate and update the i18n files (in case translated strings
+have changed in BridgeDB):
+ - Run:
+     xgettext lib/bridgedb/I18n.py -dbridgedb -oi18n/templates/bridgedb.pot
+     msgen -o i18n/en/bridgedb.po --lang=en i18n/templates/bridgedb.pot
+     msgmerge -U i18n/de/bridgedb.po i18n/templates/bridgedb.pot
 
 To run:
  - Run "python -m TorBridgeDB bridgedb.conf"
@@ -46,4 +49,3 @@ To use with email:
 
 Support
  - Send your questions to nickm.
-
diff --git a/i18n/de/bridgedb.po b/i18n/de/bridgedb.po
index 420c73c..dfe3139 100644
--- a/i18n/de/bridgedb.po
+++ b/i18n/de/bridgedb.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-29 14:16+0200\n"
+"POT-Creation-Date: 2011-01-01 07:48-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,7 +44,6 @@ msgstr ""
 "Netzwerk\" anklicken. Anschliessend koennen sie die Bridge-Adressen\n"
 "hinzufuegen."
 
-
 #: lib/bridgedb/I18n.py:32
 msgid ""
 "Configuring more than one bridge address will make your Tor connection\n"
@@ -54,17 +54,19 @@ msgstr ""
 "erreichbar ist."
 
 #: lib/bridgedb/I18n.py:35
+#, fuzzy
 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 a gmail or\n"
-"yahoo account."
+"lots of bridge addresses, you must send this request from an email address "
+"at\n"
+"one of the following domains:"
 msgstr ""
 "Eine weitere Moeglichkeit Bridge-Adressen zu finden ist, eine Email\n"
 "an bridges@xxxxxxxxxxxxxx mit der Zeile \"get bridges\" zu Schreiben.\n"
-"Diesen Reqeuest muessen Sie allerdings von einem GMail oder Yahoo-Account"
-"schicken."
+"Diesen Reqeuest muessen Sie allerdings von einem GMail oder Yahoo-"
+"Accountschicken."
 
 #: lib/bridgedb/I18n.py:41
 msgid "[This is an automated message; please do not reply.]"
@@ -85,3 +87,7 @@ msgstr ""
 #: lib/bridgedb/I18n.py:48
 msgid "(no bridges currently available)"
 msgstr "(Zur Zeit sind keine Bridges verfuegbar)"
+
+#: lib/bridgedb/I18n.py:50
+msgid "(e-mail requests not currently supported)"
+msgstr ""
diff --git a/i18n/en/bridgedb.po b/i18n/en/bridgedb.po
index 339e3d5..b533896 100644
--- a/i18n/en/bridgedb.po
+++ b/i18n/en/bridgedb.po
@@ -8,17 +8,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-29 14:25+0200\n"
+"POT-Creation-Date: 2011-01-01 07:48-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: lib/bridgedb/I18n.py:21
 msgid "Here are your bridge relays: "
-msgstr ""
+msgstr "Here are your bridge relays: "
 
 #: lib/bridgedb/I18n.py:23
 msgid ""
@@ -27,6 +28,10 @@ msgid ""
 "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\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."
 
 #: lib/bridgedb/I18n.py:28
 msgid ""
@@ -34,25 +39,37 @@ msgid ""
 "\"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\n"
+"address one at a time."
 
 #: lib/bridgedb/I18n.py:32
 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\n"
+"more stable, in case some of the bridges become unreachable."
 
 #: lib/bridgedb/I18n.py:35
 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 a gmail or\n"
-"yahoo account."
+"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\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:"
 
 #: lib/bridgedb/I18n.py:41
 msgid "[This is an automated message; please do not reply.]"
-msgstr ""
+msgstr "[This is an automated message; please do not reply.]"
 
 #: lib/bridgedb/I18n.py:43
 msgid ""
@@ -61,7 +78,15 @@ msgid ""
 "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\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."
 
 #: lib/bridgedb/I18n.py:48
 msgid "(no bridges currently available)"
-msgstr ""
+msgstr "(no bridges currently available)"
+
+#: lib/bridgedb/I18n.py:50
+msgid "(e-mail requests not currently supported)"
+msgstr "(e-mail requests not currently supported)"
diff --git a/i18n/templates/bridgedb.pot b/i18n/templates/bridgedb.pot
index 339e3d5..34d0510 100644
--- a/i18n/templates/bridgedb.pot
+++ b/i18n/templates/bridgedb.pot
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-29 14:25+0200\n"
+"POT-Creation-Date: 2011-01-01 07:48-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,8 +47,9 @@ 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 a gmail or\n"
-"yahoo account."
+"lots of bridge addresses, you must send this request from an email address "
+"at\n"
+"one of the following domains:"
 msgstr ""
 
 #: lib/bridgedb/I18n.py:41
@@ -65,3 +67,7 @@ msgstr ""
 #: lib/bridgedb/I18n.py:48
 msgid "(no bridges currently available)"
 msgstr ""
+
+#: lib/bridgedb/I18n.py:50
+msgid "(e-mail requests not currently supported)"
+msgstr ""

Prev by Author: [or-cvs] [bridgedb/master] Internationalize the ‘e-mail requests broken’ message.
Next by Author: [or-cvs] [bridgedb/master] Fix some issues that popped up during BridgeDB deployment
Previous by thread: [or-cvs] [bridgedb/master] Internationalize the ‘e-mail requests broken’ message.
Next by thread: [or-cvs] [torsocks/master] Remove socksdns, tordns and hostnames configure options.
Index(es):
- Author
- Thread