r24289: {website} updated translations for the website as wml files (in website/trunk: about/ru docs/en download/en projects/en)
by Runa Sandvik 02 Mar '11
by Runa Sandvik 02 Mar '11
02 Mar '11
Author: runa
Date: 2011-03-02 17:16:57 +0000 (Wed, 02 Mar 2011)
New Revision: 24289
Modified:
website/trunk/about/ru/overview.wml
website/trunk/docs/en/faq.wml
website/trunk/download/en/download-easy.wml
website/trunk/projects/en/torbrowser.wml
website/trunk/projects/en/vidalia.wml
Log:
updated translations for the website as wml files
Modified: website/trunk/about/ru/overview.wml
===================================================================
--- website/trunk/about/ru/overview.wml 2011-03-02 16:43:14 UTC (rev 24288)
+++ website/trunk/about/ru/overview.wml 2011-03-02 17:16:57 UTC (rev 24289)
@@ -4,7 +4,7 @@
## translation metadata
-# Revision: $Revision: 23689 $
+# Revision: $Revision: 24254 $
# Translation-Priority: 2-medium
#include "head.wmi" TITLE="Tor Project: Overview" CHARSET="UTF-8"
<div id="content" class="clearfix">
@@ -154,8 +154,6 @@
определённо сказать, откуда данные пришли и куда они направляются.
</p>
- <p><img alt="Первый шаг цепи Tor" src="$(IMGROOT)/htw1.png"></p>
-
<p>
Чтобы создать приватный путь с помощью Tor, программа пользователя или
клиент последовательно строит цепочки зашифрованных соединений с серверами
Modified: website/trunk/docs/en/faq.wml
===================================================================
--- website/trunk/docs/en/faq.wml 2011-03-02 16:43:14 UTC (rev 24288)
+++ website/trunk/docs/en/faq.wml 2011-03-02 17:16:57 UTC (rev 24289)
@@ -1577,6 +1577,7 @@
problems are:
</p>
+<ol>
<li>IP packets reveal OS characteristics. We would still need to do
IP-level packet normalization, to stop things like TCP fingerprinting
attacks. Given the diversity and complexity of TCP stacks, along with <a
Modified: website/trunk/download/en/download-easy.wml
===================================================================
--- website/trunk/download/en/download-easy.wml 2011-03-02 16:43:14 UTC (rev 24288)
+++ website/trunk/download/en/download-easy.wml 2011-03-02 17:16:57 UTC (rev 24289)
@@ -19,7 +19,7 @@
<td>The <strong>Tor Browser Bundle</strong> contains everything you need
to safely browse the Internet. This package requires no installation.
Just extract it and run. <a href="<page projects/torbrowser>">Learn more
-& other languages »</a></td>
+& other languages »</a></td>
</tr>
<tr class="gray">
<td><span class="windows">
@@ -28,6 +28,7 @@
(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe.asc">sig</a>)
</span>
</td>
+</tr>
<tr>
<td><span class="mac">
# Translators: please point to the version of TBB in your language, if there is one.
Modified: website/trunk/projects/en/torbrowser.wml
===================================================================
--- website/trunk/projects/en/torbrowser.wml 2011-03-02 16:43:14 UTC (rev 24288)
+++ website/trunk/projects/en/torbrowser.wml 2011-03-02 17:16:57 UTC (rev 24289)
@@ -240,7 +240,8 @@
<p>Click <strong>Extract</strong> (3) to begin extraction. This may take a
few minutes to complete.</p>
- <p><img src="$(IMGROOT)/tbb-screenshot1.png" alt="Screenshot of extraction process"></p>
+ <p><img src="$(IMGROOT)/tbb-screenshot1.png" alt="Screenshot of
+extraction process" /></p>
<a id="Usage"></a>
<h3><a class="anchor" href="#Usage">Usage</a></h3>
@@ -252,7 +253,8 @@
<p>The Vidalia window will shortly appear.</p>
- <p><img src="$(IMGROOT)/tbb-screenshot2.png" alt="Screenshot of bundle startup"></p>
+ <p><img src="$(IMGROOT)/tbb-screenshot2.png" alt="Screenshot of
+bundle startup" /></p>
<p>Once Tor is ready, Firefox will automatically be opened. Only web pages
visited through the included Firefox browser will be sent via Tor. Other web
@@ -264,15 +266,18 @@
<p>If you installed the Tor IM Browser Bundle, the Pidgin instant messaging client will also be automatically opened.</p>
<p>Once you are finished browsing, close any open Firefox windows by clicking
- on the <img src="$(IMGROOT)/tbb-close-button.png" alt="Close button (×)"> (6).
+ on the <img src="$(IMGROOT)/tbb-close-button.png" alt="Close button
+(×)" /> (6).
For privacy reasons, the list of
webpages you visited and any cookies will be deleted.</p>
- <p><img src="$(IMGROOT)/tbb-screenshot3a.png" alt="Screenshot of Firefox"></p>
+ <p><img src="$(IMGROOT)/tbb-screenshot3a.png" alt="Screenshot of
+Firefox" /></p>
<p>With the Tor Browser Bundle, Vidalia and Tor will automatically close. With the Tor IM Browser Bundle you need to also close Pidgin by right-clicking on the Pidgin icon (7), and choosing Quit (8).</p>
- <p><img src="$(IMGROOT)/tbb-screenshot3b.png" alt="Screenshot of Pidgin"></p>
+ <p><img src="$(IMGROOT)/tbb-screenshot3b.png" alt="Screenshot of
+Pidgin" /></p>
<p>To use the Tor Browser Bundle or Tor IM Browser Bundle again, repeat the steps in <a href="#Usage">"Usage"</a>.</p>
Modified: website/trunk/projects/en/vidalia.wml
===================================================================
--- website/trunk/projects/en/vidalia.wml 2011-03-02 16:43:14 UTC (rev 24288)
+++ website/trunk/projects/en/vidalia.wml 2011-03-02 17:16:57 UTC (rev 24289)
@@ -17,7 +17,8 @@
<!-- BEGIN SIDEBAR -->
<div class="sidebar-left">
- <img src="$(IMGROOT)/Screenshot-Vidalia-Control-Panel.png" width="261" height="255" alt="Vidalia Control Panel Screenshot">
+ <img src="$(IMGROOT)/Screenshot-Vidalia-Control-Panel.png"
+width="261" height="255" alt="Vidalia Control Panel Screenshot"/>
</div>
<!-- END SIDEBAR -->
@@ -114,6 +115,7 @@
channel, or #tor-dev.
</p>
+ <p>
If you have any doubts about any of the points in here, you can email
<a href="<page about/contact>">contact us</a> about it.
</p>
1
0
r24288: {translation} more text, some nitpicking, still work in progress (translation/trunk/documentation)
by Runa Sandvik 02 Mar '11
by Runa Sandvik 02 Mar '11
02 Mar '11
Author: runa
Date: 2011-03-02 16:43:14 +0000 (Wed, 02 Mar 2011)
New Revision: 24288
Modified:
translation/trunk/documentation/howto.txt
Log:
more text, some nitpicking, still work in progress
Modified: translation/trunk/documentation/howto.txt
===================================================================
--- translation/trunk/documentation/howto.txt 2011-03-02 15:46:57 UTC (rev 24287)
+++ translation/trunk/documentation/howto.txt 2011-03-02 16:43:14 UTC (rev 24288)
@@ -1,16 +1,16 @@
# This file documents the translation process for all projects
# currently available in the Tor translation portal:
#
-# *. BridgeDB
-# *. GetTor
-# *. Vidalia Help Files
-# *. Vidalia Installer
-# *. Vidalia
-# *. Orbot
-# *. Torbutton-alpha
-# *. Torbutton
-# *. Torcheck
-# *. The Website
+# * BridgeDB
+# * GetTor
+# * Vidalia Help Files
+# * Vidalia Installer
+# * Vidalia
+# * Orbot
+# * Torbutton-alpha
+# * Torbutton
+# * Torcheck
+# * The Website
# * Tor Manual Pages
#
# ( More translation information for Tor related apps and documentation
@@ -235,8 +235,8 @@
5. Pushing Files to the Transifex Server
- To push new/updated source files or translations to the Transifex,
- simply run 'tx push' with either '-s' or '-t'.
+ To push new/updated source files or translations to the Transifex
+ server, simply run 'tx push' with either '-s' or '-t'.
Vidalia:
@@ -266,7 +266,7 @@
5. Pushing Files to the Transifex Server
To push new/updated source files or translations to the
- Transifex, simply run 'tx push' with either '-s' or '-t'.
+ Transifex server, simply run 'tx push' with either '-s' or '-t'.
Orbot:
@@ -314,7 +314,7 @@
5. Pushing Files to the Transifex Server
To push new/updated source files or translations to the
- Transifex, simply run 'tx push' with either '-s' or '-t'.
+ Transifex server, simply run 'tx push' with either '-s' or '-t'.
Torbutton and Torbutton-alpha:
@@ -324,15 +324,71 @@
and here:
https://svn.torproject.org/svn/translation/trunk/projects/torbutton-alpha/.
+ You will also need: https://gitweb.torproject.org/torbutton.git/.
+
1. Pulling Translations from the Transifex Server
- To pull new translations from the server, run 'tx pull'. Remember
- to commit the changes to SVN.
+ To pull new translations from the server, cd to the 'po'
+ directory and run 'tx pull'. Remember to commit the changes to
+ SVN.
+ 2. Converting Translations to Mozilla Files
+ # TODO: document how to convert translations to mozilla files.
+
+ 3. Creating/Updating Translation Template Files
+ If you made changes to strings in Torbutton, you need to rebuild
+ the templates in the 'po/templates' directory. This is done with
+ the following command from within the torbutton.git checkout
+ directory:
+ $ moz2po -P -i src/chrome/locale/en/ -o /path/to/po/templates
+ 4. Adding New Translation Resources to Transifex
+
+ To add new translation resources to Transifex, open up
+ 'po/.tx/config' and create entries for the new resources. Use an
+ existing entry as a template. Remember to commit the file to SVN.
+
+ 5. Pushing Files to the Transifex Server
+
+ To push new/updated source files or translations to the Transifex
+ server, cd to the 'po' directory and run 'tx push' with either
+ '-s' or '-t'.
+
+Torcheck:
+
+ The Transifex configuration file, source file and translations can
+ be found here:
+ https://svn.torproject.org/svn/translation/trunk/projects/torcheck/.
+
+ 1. Pulling Translations from the Transifex Server
+
+ To pull new translations from the server, cd to the 'po'
+ directory and run 'tx pull'. Remember to commit the changes to
+ SVN.
+
+ 2. Converting Translations to
+
+ # TODO: document how to convert translations to a useful format.
+
+ 3. Creating/Updating Translation Template Files
+
+ # TODO: document this as well
+
+ 4. Adding New Translation Resources to Transifex
+
+ To add new translation resources to Transifex, open up
+ 'po/.tx/config' and create entries for the new resources. Use an
+ existing entry as a template. Remember to commit the file to SVN.
+
+ 5. Pushing Files to the Transifex Server
+
+ To push new/updated source files or translations to the Transifex
+ server, cd to the 'po' directory and run 'tx push' with either
+ '-s' or '-t'.
+
---------------------------- TorCheck -------------------------------
TorCheck uses our translation portal to accept translations. Users use
1
0
02 Mar '11
commit 304314dc6d0ec77887125ed7e34caf3d3ca49c09
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Wed Mar 2 11:25:44 2011 -0500
Sebastian confirms that 178 should be "Open"
---
proposals/000-index.txt | 4 ++--
proposals/178-param-voting.txt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index 91c2f27..b642703 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -98,7 +98,7 @@ Proposals by number:
175 Automatically promoting Tor clients to nodes [DRAFT]
176 Proposed version-3 link handshake for Tor [OPEN]
177 Abstaining from votes on individual flags [OPEN]
-178 Require majority of authorities to vote for consensus parameters [DRAFT]
+178 Require majority of authorities to vote for consensus parameters [OPEN]
Proposals by status:
@@ -112,7 +112,6 @@ Proposals by status:
149 Using data from NETINFO cells [for 0.2.1.x]
170 Configuration options regarding circuit building
175 Automatically promoting Tor clients to nodes
- 178 Require majority of authorities to vote for consensus parameters
NEEDS-REVISION:
131 Help users to verify they are using Tor
OPEN:
@@ -130,6 +129,7 @@ Proposals by status:
171 Separate streams across circuits by connection metadata
176 Proposed version-3 link handshake for Tor [for 0.2.3]
177 Abstaining from votes on individual flags
+ 178 Require majority of authorities to vote for consensus parameters
ACCEPTED:
110 Avoiding infinite length circuits [for 0.2.1.x] [in 0.2.1.3-alpha]
117 IPv6 exits [for 0.2.1.x]
diff --git a/proposals/178-param-voting.txt b/proposals/178-param-voting.txt
index ff3d055..b5664b5 100644
--- a/proposals/178-param-voting.txt
+++ b/proposals/178-param-voting.txt
@@ -2,7 +2,7 @@ Filename: 178-param-voting.txt
Title: Require majority of authorities to vote for consensus parameters
Author: Sebastian Hahn
Created: 16-Feb-2011
-Status: Draft
+Status: Open
Overview:
1
0
[torspec/master] Close proposal 166 and make xxx-geoip-survey-plan obsolete
by nickm＠torproject.org 02 Mar '11
by nickm＠torproject.org 02 Mar '11
02 Mar '11
commit 6501e1e80a6eb44aa1ff089ced2870b6728865a8
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Wed Mar 2 11:20:33 2011 -0500
Close proposal 166 and make xxx-geoip-survey-plan obsolete
Karsten confirms that 166 is implemented, and xxx-geoip-survey-plan is
superseded by this tech report:
https://metrics.torproject.org/papers/countingusers-2010-11-30.pdf
---
proposals/000-index.txt | 4 +-
proposals/166-statistics-extra-info-docs.txt | 2 +-
proposals/ideas/old/xxx-geoip-survey-plan.txt | 137 +++++++++++++++++++++++++
proposals/ideas/xxx-geoip-survey-plan.txt | 137 -------------------------
4 files changed, 140 insertions(+), 140 deletions(-)
diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index 48ec6a8..91c2f27 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -86,7 +86,7 @@ Proposals by number:
163 Detecting whether a connection comes from a client [OPEN]
164 Reporting the status of server votes [OPEN]
165 Easy migration for voting authority sets [OPEN]
-166 Including Network Statistics in Extra-Info Documents [ACCEPTED]
+166 Including Network Statistics in Extra-Info Documents [CLOSED]
167 Vote on network parameters in consensus [CLOSED]
168 Reduce default circuit window [OPEN]
169 Eliminate TLS renegotiation for the Tor connection handshake [SUPERSEDED]
@@ -137,7 +137,6 @@ Proposals by status:
140 Provide diffs between consensuses [for 0.2.2.x]
147 Eliminate the need for v2 directories in generating v3 directories [for 0.2.1.x]
157 Make certificate downloads specific [for 0.2.1.x]
- 166 Including Network Statistics in Extra-Info Documents [for 0.2.2]
172 GETINFO controller option for circuit information
173 GETINFO Option Expansion
174 Optimistic Data for Tor: Server Side
@@ -179,6 +178,7 @@ Proposals by status:
148 Stream end reasons from the client side should be uniform [in 0.2.1.9-alpha]
150 Exclude Exit Nodes from a circuit [in 0.2.1.3-alpha]
152 Optionally allow exit from single-hop circuits [in 0.2.1.6-alpha]
+ 166 Including Network Statistics in Extra-Info Documents [for 0.2.2]
167 Vote on network parameters in consensus [in 0.2.2]
SUPERSEDED:
112 Bring Back Pathlen Coin Weight
diff --git a/proposals/166-statistics-extra-info-docs.txt b/proposals/166-statistics-extra-info-docs.txt
index ab2716a..8b0c6a1 100644
--- a/proposals/166-statistics-extra-info-docs.txt
+++ b/proposals/166-statistics-extra-info-docs.txt
@@ -3,7 +3,7 @@ Title: Including Network Statistics in Extra-Info Documents
Author: Karsten Loesing
Created: 21-Jul-2009
Target: 0.2.2
-Status: Accepted
+Status: Closed
Change history:
diff --git a/proposals/ideas/old/xxx-geoip-survey-plan.txt b/proposals/ideas/old/xxx-geoip-survey-plan.txt
new file mode 100644
index 0000000..49c6615
--- /dev/null
+++ b/proposals/ideas/old/xxx-geoip-survey-plan.txt
@@ -0,0 +1,137 @@
+
+
+Abstract
+
+ This document explains how to tell about how many Tor users there
+ are, and how many there are in which country. Statistics are
+ involved.
+
+Motivation
+
+ There are a few reasons we need to keep track of which countries
+ Tor users (in aggregate) are coming from:
+
+ - Resource allocation. Knowing about underserved countries with
+ lots of users can let us know about where we need to direct
+ translation and outreach efforts.
+
+ - Anticensorship. Sudden drops in usage on a national basis can
+ indicate the arrival of a censorious firewall.
+
+ - Sponsor outreach and self-evalutation. Many people and
+ organizations who are interested in funding The Tor Project's
+ work want to know that we're successfully serving parts of the
+ world they're interested in, and that efforts to expand our
+ userbase are actually succeeding. So do we.
+
+Goals
+
+ We want to know approximately how many Tor users there are, and which
+ countries they're in, even in the presence of a hypothetical
+ "directory guard" feature. Some uncertainty is okay, but we'd like
+ to be able to put a bound on the uncertainty.
+
+ We need to make sure this information isn't exposed in a way that
+ helps an adversary.
+
+Methods for current clients:
+
+ Every client downloads network status documents. There are
+ currently three methods (one hypothetical) for clients to get them.
+ - 0.1.2.x clients (and earlier) fetch a v2 networkstatus
+ document about every NETWORKSTATUS_CLIENT_DL_INTERVAL [30
+ minutes].
+
+ - 0.2.0.x clients fetch a v3 networkstatus consensus document
+ at a random interval between when their current document is no
+ longer freshest, and when their current document is about to
+ expire.
+
+ [In both of the above cases, clients choose a running
+ directory cache at random with odds roughly proportional to
+ its bandwidth. If they're just starting, they know a XXXX FIXME -NM]
+
+ - In some future version, clients will choose directory caches
+ to serve as their "directory guards" to avoid profiling
+ attacks, similarly to how clients currently start all their
+ circuits at guard nodes.
+
+ We assume that a directory cache can tell which of these three
+ categories a client is in by the format of its status request.
+
+ A directory cache can be made to count distinct client IP
+ addresses that make a certain request of it in a given timeframe,
+ and total requests made to it over that timeframe. For the first
+ two cases, a cache can get a picture of the overall
+ number and countries of users in the network by dividing the IP
+ count by the probability with which they (as a cache) would be
+ chosen. Assuming that our listed bandwidth is such that we expect
+ to be chosen with probability P for any given request, and we've
+ been counting IPs for long enough that we expect the average
+ client to have made N requests, they will have visited us at least
+ once with probability P' = 1-(1-P)^N, and so we divide the IP
+ counts we've seen by P' for our estimate. To estimate total
+ number of clients of a given type, determine how many requests a
+ client of that type will make over that time, and assume we'll
+ have seen P of them.
+
+ Both of these numbers are useful: the IP counts will give the
+ total number of IPs connecting to the network, and the request
+ counts will give the total number of users on the network at any
+ given time.
+
+ Notes:
+ - [Over H hours, the N for V2 clients is 2*H, and the N for V3
+ clients is currently around H/2 or H/3.]
+
+ - (We should only count requests that we actually intend to answer;
+ 503 requests shouldn't count.)
+
+ - These measurements should also be taken at a directory
+ authority if possible: their picture of the network is skewed
+ by clients that fetch from them directly. These clients,
+ however, are all the clients that are just bootstrapping
+ (assuming that the fallback-consensus feature isn't yet used
+ much).
+
+ - These measurements also overestimate the V2 download rate if
+ some downloads fail and clients retry them later after backing
+ off.
+
+Methods for directory guards:
+
+ If directory guards are in use, directory guards get a picture of
+ all those users who chose them as a guard when they were listed
+ as a good choice for a guard, and who are also on the network
+ now. The cleanest data here will come from nodes that were listed
+ as good new-guards choices for a while, and have not been so for a
+ while longer (to study decay rates); nodes that have been listed
+ as good new-guard choices consistently for a long time (to get a
+ sample of the network); and nodes that have been listed as good
+ new-guard choices only recently (to get a sample of new users and
+ users whose guards have died out.)
+
+ Since directory guards are currently unspecified, we'll need to
+ make some guesses about how they'll turn out to work. Here are
+ a couple of approaches that could work.
+ - We could have clients pick completely new directory guards on
+ a rolling basis every two months or so. This would ensure
+ that staying as a guard for a while would be sufficient to
+ see a sample of users. This is potentially advantageous for
+ load-balancing the network as well, though it might lose some
+ of the benefits of directory guard. We need to quantify the
+ impact of this; it might not actually make stuff worse in
+ practice, if most guards don't stay good guards for a month
+ or two.
+
+ - We could try to collect statistics at several directory
+ guards and combine their statisics, but we would need to make
+ sure that for all time, at least one of the directory guards
+ had been recommended as a good choice for new guards. By
+ looking at new-IP rates for guards, we could get an idea of
+ user uptake; for looking at old-IP decay rates, we could get
+ an idea of turnover. This approach would entail significant
+ complexity, and we'd probably need to record more information
+ than we'd really like to.
+
+
diff --git a/proposals/ideas/xxx-geoip-survey-plan.txt b/proposals/ideas/xxx-geoip-survey-plan.txt
deleted file mode 100644
index 49c6615..0000000
--- a/proposals/ideas/xxx-geoip-survey-plan.txt
+++ /dev/null
@@ -1,137 +0,0 @@
-
-
-Abstract
-
- This document explains how to tell about how many Tor users there
- are, and how many there are in which country. Statistics are
- involved.
-
-Motivation
-
- There are a few reasons we need to keep track of which countries
- Tor users (in aggregate) are coming from:
-
- - Resource allocation. Knowing about underserved countries with
- lots of users can let us know about where we need to direct
- translation and outreach efforts.
-
- - Anticensorship. Sudden drops in usage on a national basis can
- indicate the arrival of a censorious firewall.
-
- - Sponsor outreach and self-evalutation. Many people and
- organizations who are interested in funding The Tor Project's
- work want to know that we're successfully serving parts of the
- world they're interested in, and that efforts to expand our
- userbase are actually succeeding. So do we.
-
-Goals
-
- We want to know approximately how many Tor users there are, and which
- countries they're in, even in the presence of a hypothetical
- "directory guard" feature. Some uncertainty is okay, but we'd like
- to be able to put a bound on the uncertainty.
-
- We need to make sure this information isn't exposed in a way that
- helps an adversary.
-
-Methods for current clients:
-
- Every client downloads network status documents. There are
- currently three methods (one hypothetical) for clients to get them.
- - 0.1.2.x clients (and earlier) fetch a v2 networkstatus
- document about every NETWORKSTATUS_CLIENT_DL_INTERVAL [30
- minutes].
-
- - 0.2.0.x clients fetch a v3 networkstatus consensus document
- at a random interval between when their current document is no
- longer freshest, and when their current document is about to
- expire.
-
- [In both of the above cases, clients choose a running
- directory cache at random with odds roughly proportional to
- its bandwidth. If they're just starting, they know a XXXX FIXME -NM]
-
- - In some future version, clients will choose directory caches
- to serve as their "directory guards" to avoid profiling
- attacks, similarly to how clients currently start all their
- circuits at guard nodes.
-
- We assume that a directory cache can tell which of these three
- categories a client is in by the format of its status request.
-
- A directory cache can be made to count distinct client IP
- addresses that make a certain request of it in a given timeframe,
- and total requests made to it over that timeframe. For the first
- two cases, a cache can get a picture of the overall
- number and countries of users in the network by dividing the IP
- count by the probability with which they (as a cache) would be
- chosen. Assuming that our listed bandwidth is such that we expect
- to be chosen with probability P for any given request, and we've
- been counting IPs for long enough that we expect the average
- client to have made N requests, they will have visited us at least
- once with probability P' = 1-(1-P)^N, and so we divide the IP
- counts we've seen by P' for our estimate. To estimate total
- number of clients of a given type, determine how many requests a
- client of that type will make over that time, and assume we'll
- have seen P of them.
-
- Both of these numbers are useful: the IP counts will give the
- total number of IPs connecting to the network, and the request
- counts will give the total number of users on the network at any
- given time.
-
- Notes:
- - [Over H hours, the N for V2 clients is 2*H, and the N for V3
- clients is currently around H/2 or H/3.]
-
- - (We should only count requests that we actually intend to answer;
- 503 requests shouldn't count.)
-
- - These measurements should also be taken at a directory
- authority if possible: their picture of the network is skewed
- by clients that fetch from them directly. These clients,
- however, are all the clients that are just bootstrapping
- (assuming that the fallback-consensus feature isn't yet used
- much).
-
- - These measurements also overestimate the V2 download rate if
- some downloads fail and clients retry them later after backing
- off.
-
-Methods for directory guards:
-
- If directory guards are in use, directory guards get a picture of
- all those users who chose them as a guard when they were listed
- as a good choice for a guard, and who are also on the network
- now. The cleanest data here will come from nodes that were listed
- as good new-guards choices for a while, and have not been so for a
- while longer (to study decay rates); nodes that have been listed
- as good new-guard choices consistently for a long time (to get a
- sample of the network); and nodes that have been listed as good
- new-guard choices only recently (to get a sample of new users and
- users whose guards have died out.)
-
- Since directory guards are currently unspecified, we'll need to
- make some guesses about how they'll turn out to work. Here are
- a couple of approaches that could work.
- - We could have clients pick completely new directory guards on
- a rolling basis every two months or so. This would ensure
- that staying as a guard for a while would be sufficient to
- see a sample of users. This is potentially advantageous for
- load-balancing the network as well, though it might lose some
- of the benefits of directory guard. We need to quantify the
- impact of this; it might not actually make stuff worse in
- practice, if most guards don't stay good guards for a month
- or two.
-
- - We could try to collect statistics at several directory
- guards and combine their statisics, but we would need to make
- sure that for all time, at least one of the directory guards
- had been recommended as a good choice for new guards. By
- looking at new-IP rates for guards, we could get an idea of
- user uptake; for looking at old-IP decay rates, we could get
- an idea of turnover. This approach would entail significant
- complexity, and we'd probably need to record more information
- than we'd really like to.
-
-
1
0
r24287: {translation} documenting the workflow for all of our translation projects (translation/trunk/documentation)
by Runa Sandvik 02 Mar '11
by Runa Sandvik 02 Mar '11
02 Mar '11
Author: runa
Date: 2011-03-02 15:46:57 +0000 (Wed, 02 Mar 2011)
New Revision: 24287
Modified:
translation/trunk/documentation/howto.txt
Log:
documenting the workflow for all of our translation projects, work in progress
Modified: translation/trunk/documentation/howto.txt
===================================================================
--- translation/trunk/documentation/howto.txt 2011-03-02 15:26:23 UTC (rev 24286)
+++ translation/trunk/documentation/howto.txt 2011-03-02 15:46:57 UTC (rev 24287)
@@ -1,32 +1,338 @@
-## Instructions for helping translate text for Vidalia, TorButton
-## and TorCheck
-## ( More translation information for Tor related apps will accumulate here )
+# This file documents the translation process for all projects
+# currently available in the Tor translation portal:
+#
+# *. BridgeDB
+# *. GetTor
+# *. Vidalia Help Files
+# *. Vidalia Installer
+# *. Vidalia
+# *. Orbot
+# *. Torbutton-alpha
+# *. Torbutton
+# *. Torcheck
+# *. The Website
+# * Tor Manual Pages
+#
+# ( More translation information for Tor related apps and documentation
+# will accumulate here )
-Our translations are handled in one of two places. The Tor Translation Portal
-handles all of the translations for Vidalia, Torbutton and TorCheck. The Tor
-website itself is currently handled by hand translations using subversion.
--------------------------------------------------------------------------
+About Transifex:
-For the Tor website, you'll need a Tor SVN account.
-If you do not have one and you need one, please run this command with your
-desired username in place of 'USERNAME':
- htdigest -c passwd.tmp "Tor subversion repository" USERNAME
-and send us the contents of passwd.tmp.
+ All of the translation projects are located here:
+ https://www.transifex.net/projects/p/torproject/.
--------------------------------------------------------------------------
+ Transifex is a website that lets users contribute translations
+ online using their web browser. Users will have to register at
+ https://www.transifex.net/accounts/register/ before they can start
+ translating.
-For the Portal-based projects, all three check in their respective .po
-files into the following subversion urls:
+ A project may have many files that can be translated. In transifex,
+ these files are called resources. Transifex lists all sentences or
+ phrases (called "strings") used by a particular resource, and allows
+ interested volunteers to translate individual sentences or phrases
+ as they are able.
- https://tor-svn.freehaven.net/svn/translation/trunk/projects/torbutton
- https://tor-svn.freehaven.net/svn/translation/trunk/projects/torcheck
- https://svn.vidalia-project.net/svn/vidalia/trunk/src/vidalia/i18n/
+The Transifex Client:
-The current pootle configuration is checked into subversion as well:
+ The Transifex Command-line Client enables you to easily manage your
+ translations within a project without the need of a GUI. You can use
+ the command line client to easily create new resources, map local
+ files to translations and synchronize translation projects with your
+ local repository and vice verca.
- https://tor-svn.freehaven.net/svn/translation/trunk/pootle
+ For more information about the Transifex client, see
+ http://help.transifex.net/user-guide/client/index.html#user-client
+ 1. Installing the client
+
+ The Transifex Client can be found on the Python Package Index
+ (PYPI) under the name transifex-client. So to install it, make sure you
+ have a recent version of setuptools installed and then issue the
+ following command:
+
+ $ easy_install -U transifex-client
+
+ This command will install the latest version of transifex-client
+ and if you have an outdated version it’ll perform an update.
+
+ 2. Init
+
+ After installing the client, you will need to run the command
+ below to initialize a project and generate your own config file.
+ You may run this command from anywhere on your filesystem:
+
+ $ tx init
+
+ NOTE: You will be asked to enter the URL of the Transifex
+ instance you wish to connect to. Make sure it says
+ "https://www.transifex.net".
+
+ The init command will create the following files for you:
+ ~/.tx/config and ~/.transifexrc. Each of the translation projects
+ have their own configuration file, so you can safely delete
+ ~/.tx/config. The other file, ~/.transifexrc, holds your username
+ and password for Transifex.
+
+ 3. Set
+
+ The following command is an aggregation of all functions needed
+ to initialize and setup a new translation resource:
+
+ $ tx set
+
+ For more information and other examples, see
+ http://help.transifex.net/user-guide/client/index.html
+
+ As an example, here's how you would initialize and set up Orbot
+ as a new translation resource.
+
+ Check out the Orbot translation directory from SVN:
+ https://svn.torproject.org/svn/translation/trunk/projects/orbot/.
+
+ Inside the 'po' directory, run the following command to
+ initialize the new resource:
+
+ ~/translation/projects/orbot/po$ tx init
+
+ Once that is done, you can create the resource 'orbot-strings-pot'
+ and assign a source file:
+
+ ~/translation/projects/orbot/po$ tx set --source -r torproject.orbot-strings-pot -l en strings.pot
+
+ Once you have created a mapping between a source file and a
+ resource, you should add more translations to this resource. To
+ set a specific file as the source and auto-detect translations
+ for all languages, run the following command:
+
+ ~/translation/projects/orbot/po$ tx set --auto-local -r torproject.orbot-strings-pot '<lang>/strings.po' --source-lang en --source-file strings.pot
+
+ The Transifex client will store this information in the following
+ file: /translation/projects/orbot/po/.tx/config.
+
+ To check the existing mapping of source files and translations, run the following command:
+
+ ~/translation/projects/orbot/po$ tx status
+
+ When you have assigned all of the source files and added all
+ existing translations, push the changes up to the Transifex
+ server (see below for information on how to push local changes).
+ Remember to commit the .tx/config file to SVN.
+
+ NOTE: you can also initialize and setup new translation resources
+ on https://www.transifex.net/.
+
+ 4. Push
+
+ The following command sends local changes to the Transifex server:
+
+ $ tx push [-s|--source or -t|--translations]
+
+ If you have added new source files, the corresponding resources
+ are created on the Transifex server and if you have new
+ translations those will get pushed as well. This can also be used
+ to update existing source files or translations on the server
+ with new strings. Use --help for more information.
+
+ NOTE: All translation resources have been configured to
+ automatically update the source files from URL. It is not
+ necessary to push the source files manually.
+
+ 5. Pull
+
+ The following command pdates your local files by pulling the
+ latest translations from the server as well as new translation
+ files that were created in the Transifex UI:
+
+ $ tx pull
+
+ By default, this command will check if the modification time of
+ your local files is more recent than that on the Transifex server
+ and will not overwrite newer files. Use --help for more
+ information.
+
+
+BridgeDB:
+
+ # TODO: document the translation workflow for BridgeDB when we have
+ # figured it out.
+
+GetTor:
+
+ # TODO: document the translation workflow for GetTor when we have
+ # figured it out.
+
+Vidalia Help Files:
+
+ The Transifex configuration file, source files and translations can
+ be found here:
+ https://svn.torproject.org/vidalia/vidalia/trunk/src/vidalia/help/content/.
+
+ 1. Pulling Translations from the Transifex Server
+
+ To pull new translations from the server, cd to the 'po'
+ directory and run 'tx pull'. Remember to commit the changes to
+ SVN.
+
+ 2. Converting Translations to HTML
+
+ Simply pulling translations from the Transifex server is not
+ enough. To make use of the translations, you will need to convert
+ the .po files to .html files.
+
+ You can use the following script to automate the process:
+ https://svn.torproject.org/vidalia/vidalia/trunk/src/vidalia/help/content/p…
+
+ NOTE: You need to have the package 'po4a' installed before running the script.
+
+ 3. Creating/Updating Translation Template Files
+
+ To create a .pot file from an .html file, run the following command:
+
+ $ po4a-gettextize -f html -m file.html -p file.pot
+
+ You will need to edit the header of the .pot file once it has
+ been created. Use the header from one of the existing .pot files
+ in 'po/templates' as a template. Remember to commit the file to
+ SVN.
+
+ 4. Adding New Translation Resources to Transifex
+
+ To add new translation resources to Transifex, open up
+ 'po/.tx/config' and create entries for the new resources. Use an
+ existing entry as a template. Remember to commit the file to SVN.
+
+ 5. Pushing Files to the Transifex Server
+
+ To push new/updated source files or translations to the Transifex
+ server, cd to the 'po' directory and run 'tx push' with either
+ '-s' or '-t'.
+
+Vidalia Installer:
+
+ The Transifex configuration file, source file and translations can
+ be found here:
+ https://svn.torproject.org/vidalia/vidalia/trunk/pkg/win32/po/.
+
+ 1. Pulling Translations from the Transifex Server
+
+ To pull new translations from the server, run 'tx pull'. Remember
+ to commit the changes to SVN.
+
+ 2. Converting Translations
+
+ # TODO: document how to convert translations to a useful format.
+
+ 3. Creating/Updating Translation Template Files
+
+ # TODO: document how to convert from a useful format to .pot
+
+ 4. Adding New Translation Resources to Transifex
+
+ To add new translation resources to Transifex, open up
+ '.tx/config' and create entries for the new resources. Use an
+ existing entry as a template. Remember to commit the file to SVN.
+
+ 5. Pushing Files to the Transifex Server
+
+ To push new/updated source files or translations to the Transifex,
+ simply run 'tx push' with either '-s' or '-t'.
+
+Vidalia:
+
+ The Transifex configuration file, source file and translations can
+ be found here:
+ https://svn.torproject.org/vidalia/vidalia/trunk/src/vidalia/i18n/po/.
+
+ 1. Pulling Translations from the Transifex Server
+
+ To pull new translations from the server, run 'tx pull'. Remember
+ to commit the changes to SVN.
+
+ 2. Converting Translations
+
+ # TODO: document how to convert translations to a useful format.
+
+ 3. Creating/Updating Translation Template Files
+
+ # TODO: document how to convert from a useful format to .pot
+
+ 4. Adding New Translation Resources to Transifex
+
+ To add new translation resources to Transifex, open up
+ '.tx/config' and create entries for the new resources. Use an
+ existing entry as a template. Remember to commit the file to SVN.
+
+ 5. Pushing Files to the Transifex Server
+
+ To push new/updated source files or translations to the
+ Transifex, simply run 'tx push' with either '-s' or '-t'.
+
+Orbot:
+
+ The Transifex configuration file, source file and translations can
+ be found here:
+ https://svn.torproject.org/svn/translation/trunk/projects/orbot/po/.
+
+ 1. Pulling Translations from the Transifex Server
+
+ To pull new translations from the server, run 'tx pull'. Remember
+ to commit the changes to SVN.
+
+ 2. Converting Translations to XML
+
+ Simply pulling translations from the Transifex server is not
+ enough. To make use of the translations, you will need to convert
+ the .po files to .xml files.
+
+ Start by checking out the following directory:
+ https://svn.torproject.org/svn/projects/android/trunk/Orbot/.
+
+ You can use the following script to convert translated .po files to .xml files::
+ https://svn.torproject.org/vidalia/vidalia/trunk/src/vidalia/help/content/p…
+
+ NOTE: You need to have the package 'po4a' installed before running the script.
+
+ 3. Creating/Updating Translation Template Files
+
+ To create a .pot file from an .xml file, run the following
+ command:
+
+ $ po4a-gettextize -f xml -m file.xml -p file.pot
+
+ You will need to edit the header of the .pot file once it has
+ been created. Use the header from one of the existing .pot files
+ in 'orbot/po/templates' as a template. Remember to commit the
+ file to SVN.
+
+ 4. Adding New Translation Resources to Transifex
+
+ To add new translation resources to Transifex, open up
+ '.tx/config' and create entries for the new resources. Use an
+ existing entry as a template. Remember to commit the file to SVN.
+
+ 5. Pushing Files to the Transifex Server
+
+ To push new/updated source files or translations to the
+ Transifex, simply run 'tx push' with either '-s' or '-t'.
+
+Torbutton and Torbutton-alpha:
+
+ The Transifex configuration file, source file and translations can
+ be found here:
+ https://svn.torproject.org/svn/translation/trunk/projects/torbutton/
+ and here:
+ https://svn.torproject.org/svn/translation/trunk/projects/torbutton-alpha/.
+
+ 1. Pulling Translations from the Transifex Server
+
+ To pull new translations from the server, run 'tx pull'. Remember
+ to commit the changes to SVN.
+
+
+
+
+
---------------------------- TorCheck -------------------------------
TorCheck uses our translation portal to accept translations. Users use
1
0
[metrics-web/master] Import relay descriptors as part of metrics-web.
by karsten＠torproject.org 02 Mar '11
by karsten＠torproject.org 02 Mar '11
02 Mar '11
commit dac73329a421cb3b13978c56be88ad36abd1c159
Author: Karsten Loesing <karsten.loesing(a)gmx.net>
Date: Tue Mar 1 16:40:55 2011 +0100
Import relay descriptors as part of metrics-web.
---
build.xml | 1 +
config.template | 14 +
src/org/torproject/ernie/cron/Configuration.java | 27 +
src/org/torproject/ernie/cron/Main.java | 19 +-
.../cron/RelayDescriptorDatabaseImporter.java | 1213 ++++++++++++++++++++
.../ernie/cron/RelayDescriptorParser.java | 241 ++++-
6 files changed, 1509 insertions(+), 6 deletions(-)
diff --git a/build.xml b/build.xml
index 86ce310..446572b 100644
--- a/build.xml
+++ b/build.xml
@@ -13,6 +13,7 @@
<path id="classpath">
<pathelement path="${classes}"/>
<pathelement location="lib/commons-codec-1.4.jar"/>
+ <pathelement location="lib/postgresql-8.4-702.jdbc3.jar"/>
</path>
<target name="init">
diff --git a/config.template b/config.template
index 479d78c..1d0701c 100644
--- a/config.template
+++ b/config.template
@@ -10,6 +10,20 @@
## again, but it can be confusing to users who don't know about it.
#KeepDirectoryArchiveImportHistory 0
#
+## Write relay descriptors to the database
+#WriteRelayDescriptorDatabase 0
+#
+## JDBC string for relay descriptor database
+#RelayDescriptorDatabaseJDBC jdbc:postgresql://localhost/tordir?user=metrics&password=password
+#
+## Write relay descriptors to raw text files for importing them into the
+## database using PostgreSQL's \copy command
+#WriteRelayDescriptorsRawFiles 0
+#
+## Relative path to directory to write raw text files; note that existing
+## files will be overwritten!
+#RelayDescriptorRawFilesDirectory pg-import/
+#
## Write statistics about the current consensus and votes to the
## website
#WriteConsensusHealth 0
diff --git a/src/org/torproject/ernie/cron/Configuration.java b/src/org/torproject/ernie/cron/Configuration.java
index 6b76dc7..66ad778 100644
--- a/src/org/torproject/ernie/cron/Configuration.java
+++ b/src/org/torproject/ernie/cron/Configuration.java
@@ -16,6 +16,11 @@ public class Configuration {
private boolean importDirectoryArchives = false;
private String directoryArchivesDirectory = "archives/";
private boolean keepDirectoryArchiveImportHistory = false;
+ private boolean writeRelayDescriptorDatabase = false;
+ private String relayDescriptorDatabaseJdbc =
+ "jdbc:postgresql://localhost/tordir?user=metrics&password=password";
+ private boolean writeRelayDescriptorsRawFiles = false;
+ private String relayDescriptorRawFilesDirectory = "pg-import/";
private boolean writeConsensusHealth = false;
public Configuration() {
@@ -42,6 +47,16 @@ public class Configuration {
} else if (line.startsWith("KeepDirectoryArchiveImportHistory")) {
this.keepDirectoryArchiveImportHistory = Integer.parseInt(
line.split(" ")[1]) != 0;
+ } else if (line.startsWith("WriteRelayDescriptorDatabase")) {
+ this.writeRelayDescriptorDatabase = Integer.parseInt(
+ line.split(" ")[1]) != 0;
+ } else if (line.startsWith("RelayDescriptorDatabaseJDBC")) {
+ this.relayDescriptorDatabaseJdbc = line.split(" ")[1];
+ } else if (line.startsWith("WriteRelayDescriptorsRawFiles")) {
+ this.writeRelayDescriptorsRawFiles = Integer.parseInt(
+ line.split(" ")[1]) != 0;
+ } else if (line.startsWith("RelayDescriptorRawFilesDirectory")) {
+ this.relayDescriptorRawFilesDirectory = line.split(" ")[1];
} else if (line.startsWith("WriteConsensusHealth")) {
this.writeConsensusHealth = Integer.parseInt(
line.split(" ")[1]) != 0;
@@ -79,6 +94,18 @@ public class Configuration {
public boolean getKeepDirectoryArchiveImportHistory() {
return this.keepDirectoryArchiveImportHistory;
}
+ public boolean getWriteRelayDescriptorDatabase() {
+ return this.writeRelayDescriptorDatabase;
+ }
+ public String getRelayDescriptorDatabaseJDBC() {
+ return this.relayDescriptorDatabaseJdbc;
+ }
+ public boolean getWriteRelayDescriptorsRawFiles() {
+ return this.writeRelayDescriptorsRawFiles;
+ }
+ public String getRelayDescriptorRawFilesDirectory() {
+ return this.relayDescriptorRawFilesDirectory;
+ }
public boolean getWriteConsensusHealth() {
return this.writeConsensusHealth;
}
diff --git a/src/org/torproject/ernie/cron/Main.java b/src/org/torproject/ernie/cron/Main.java
index b95a133..1a125bc 100644
--- a/src/org/torproject/ernie/cron/Main.java
+++ b/src/org/torproject/ernie/cron/Main.java
@@ -37,10 +37,20 @@ public class Main {
ConsensusHealthChecker chc = config.getWriteConsensusHealth() ?
new ConsensusHealthChecker() : null;
+ // Prepare writing relay descriptors to database
+ RelayDescriptorDatabaseImporter rddi =
+ config.getWriteRelayDescriptorDatabase() ||
+ config.getWriteRelayDescriptorsRawFiles() ?
+ new RelayDescriptorDatabaseImporter(
+ config.getWriteRelayDescriptorDatabase() ?
+ config.getRelayDescriptorDatabaseJDBC() : null,
+ config.getWriteRelayDescriptorsRawFiles() ?
+ config.getRelayDescriptorRawFilesDirectory() : null) : null;
+
// Prepare relay descriptor parser (only if we are writing the
// consensus-health page to disk)
- RelayDescriptorParser rdp = config.getWriteConsensusHealth() ?
- new RelayDescriptorParser(chc) : null;
+ RelayDescriptorParser rdp = chc != null || rddi != null ?
+ new RelayDescriptorParser(chc, rddi) : null;
// Import relay descriptors
if (rdp != null) {
@@ -52,6 +62,11 @@ public class Main {
}
}
+ // Close database connection (if active)
+ if (rddi != null) {
+ rddi.closeConnection();
+ }
+
// Write consensus health website
if (chc != null) {
chc.writeStatusWebsite();
diff --git a/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java b/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java
new file mode 100644
index 0000000..f8f1e9a
--- /dev/null
+++ b/src/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java
@@ -0,0 +1,1213 @@
+/* Copyright 2011 The Tor Project
+ * See LICENSE for licensing information */
+package org.torproject.ernie.cron;
+
+import java.io.*;
+import java.sql.*;
+import java.text.*;
+import java.util.*;
+import java.util.logging.*;
+import org.postgresql.util.*;
+
+/**
+ * Parse directory data.
+ */
+
+public final class RelayDescriptorDatabaseImporter {
+
+ /**
+ * How many records to commit with each database transaction.
+ */
+ private final long autoCommitCount = 500;
+
+ /**
+ * Keep track of the number of records committed before each transaction
+ */
+ private int rdsCount = 0;
+ private int resCount = 0;
+ private int rhsCount = 0;
+ private int rrsCount = 0;
+ private int rcsCount = 0;
+ private int rvsCount = 0;
+ private int rbsCount = 0;
+ private int rqsCount = 0;
+
+ /**
+ * Relay descriptor database connection.
+ */
+ private Connection conn;
+
+ /**
+ * Prepared statement to check whether any network status consensus
+ * entries matching a given valid-after time have been imported into the
+ * database before.
+ */
+ private PreparedStatement psSs;
+
+ /**
+ * Prepared statement to check whether a given network status consensus
+ * entry has been imported into the database before.
+ */
+ private PreparedStatement psRs;
+
+ /**
+ * Prepared statement to check whether a given extra-info descriptor has
+ * been imported into the database before.
+ */
+ private PreparedStatement psEs;
+
+ /**
+ * Prepared statement to check whether a given server descriptor has
+ * been imported into the database before.
+ */
+ private PreparedStatement psDs;
+
+ /**
+ * Prepared statement to check whether a given network status consensus
+ * has been imported into the database before.
+ */
+ private PreparedStatement psCs;
+
+ /**
+ * Prepared statement to check whether a given network status vote has
+ * been imported into the database before.
+ */
+ private PreparedStatement psVs;
+
+ /**
+ * Prepared statement to check whether a given conn-bi-direct stats
+ * string has been imported into the database before.
+ */
+ private PreparedStatement psBs;
+
+ /**
+ * Prepared statement to check whether a given dirreq stats string has
+ * been imported into the database before.
+ */
+ private PreparedStatement psQs;
+
+ /**
+ * Set of dates that have been inserted into the database for being
+ * included in the next refresh run.
+ */
+ private Set<Long> scheduledUpdates;
+
+ /**
+ * Prepared statement to insert a date into the database that shall be
+ * included in the next refresh run.
+ */
+ private PreparedStatement psU;
+
+ /**
+ * Prepared statement to insert a network status consensus entry into
+ * the database.
+ */
+ private PreparedStatement psR;
+
+ /**
+ * Prepared statement to insert a server descriptor into the database.
+ */
+ private PreparedStatement psD;
+
+ /**
+ * Prepared statement to insert an extra-info descriptor into the
+ * database.
+ */
+ private PreparedStatement psE;
+
+ /**
+ * Callable statement to insert the bandwidth history of an extra-info
+ * descriptor into the database.
+ */
+ private CallableStatement csH;
+
+ /**
+ * Prepared statement to insert a network status consensus into the
+ * database.
+ */
+ private PreparedStatement psC;
+
+ /**
+ * Prepared statement to insert a network status vote into the
+ * database.
+ */
+ private PreparedStatement psV;
+
+ /**
+ * Prepared statement to insert a conn-bi-direct stats string into the
+ * database.
+ */
+ private PreparedStatement psB;
+
+ /**
+ * Prepared statement to insert a given dirreq stats string into the
+ * database.
+ */
+ private PreparedStatement psQ;
+
+ /**
+ * Logger for this class.
+ */
+ private Logger logger;
+
+ /**
+ * Directory for writing raw import files.
+ */
+ private String rawFilesDirectory;
+
+ /**
+ * Raw import file containing status entries.
+ */
+ private BufferedWriter statusentryOut;
+
+ /**
+ * Raw import file containing server descriptors.
+ */
+ private BufferedWriter descriptorOut;
+
+ /**
+ * Raw import file containing extra-info descriptors.
+ */
+ private BufferedWriter extrainfoOut;
+
+ /**
+ * Raw import file containing bandwidth histories.
+ */
+ private BufferedWriter bwhistOut;
+
+ /**
+ * Raw import file containing consensuses.
+ */
+ private BufferedWriter consensusOut;
+
+ /**
+ * Raw import file containing votes.
+ */
+ private BufferedWriter voteOut;
+
+ /**
+ * Raw import file containing conn-bi-direct stats strings.
+ */
+ private BufferedWriter connBiDirectOut;
+
+ /**
+ * Raw import file containing dirreq stats.
+ */
+ private BufferedWriter dirReqOut;
+
+ /**
+ * Date format to parse timestamps.
+ */
+ private SimpleDateFormat dateTimeFormat;
+
+ /**
+ * The last valid-after time for which we checked whether they have been
+ * any network status entries in the database.
+ */
+ private long lastCheckedStatusEntries;
+
+ /**
+ * Set of fingerprints that we imported for the valid-after time in
+ * <code>lastCheckedStatusEntries</code>.
+ */
+ private Set<String> insertedStatusEntries;
+
+ /**
+ * Flag that tells us whether we need to check whether a network status
+ * entry is already contained in the database or not.
+ */
+ private boolean separateStatusEntryCheckNecessary;
+
+ private boolean importIntoDatabase;
+ private boolean writeRawImportFiles;
+
+ /**
+ * Initialize database importer by connecting to the database and
+ * preparing statements.
+ */
+ public RelayDescriptorDatabaseImporter(String connectionURL,
+ String rawFilesDirectory) {
+
+ /* Initialize logger. */
+ this.logger = Logger.getLogger(
+ RelayDescriptorDatabaseImporter.class.getName());
+
+ if (connectionURL != null) {
+ try {
+ /* Connect to database. */
+ this.conn = DriverManager.getConnection(connectionURL);
+
+ /* Turn autocommit off */
+ this.conn.setAutoCommit(false);
+
+ /* Prepare statements. */
+ this.psSs = conn.prepareStatement("SELECT COUNT(*) "
+ + "FROM statusentry WHERE validafter = ?");
+ this.psRs = conn.prepareStatement("SELECT COUNT(*) "
+ + "FROM statusentry WHERE validafter = ? AND descriptor = ?");
+ this.psDs = conn.prepareStatement("SELECT COUNT(*) "
+ + "FROM descriptor WHERE descriptor = ?");
+ this.psEs = conn.prepareStatement("SELECT COUNT(*) "
+ + "FROM extrainfo WHERE extrainfo = ?");
+ this.psCs = conn.prepareStatement("SELECT COUNT(*) "
+ + "FROM consensus WHERE validafter = ?");
+ this.psVs = conn.prepareStatement("SELECT COUNT(*) "
+ + "FROM vote WHERE validafter = ? AND dirsource = ?");
+ this.psBs = conn.prepareStatement("SELECT COUNT(*) "
+ + "FROM connbidirect WHERE source = ? AND statsend = ?");
+ this.psQs = conn.prepareStatement("SELECT COUNT(*) "
+ + "FROM dirreq_stats WHERE source = ? AND statsend = ?");
+ this.psR = conn.prepareStatement("INSERT INTO statusentry "
+ + "(validafter, nickname, fingerprint, descriptor, "
+ + "published, address, orport, dirport, isauthority, "
+ + "isbadexit, isbaddirectory, isexit, isfast, isguard, "
+ + "ishsdir, isnamed, isstable, isrunning, isunnamed, "
+ + "isvalid, isv2dir, isv3dir, version, bandwidth, ports, "
+ + "rawdesc) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, "
+ + "?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+ this.psD = conn.prepareStatement("INSERT INTO descriptor "
+ + "(descriptor, nickname, address, orport, dirport, "
+ + "fingerprint, bandwidthavg, bandwidthburst, "
+ + "bandwidthobserved, platform, published, uptime, "
+ + "extrainfo, rawdesc) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, "
+ + "?, ?, ?, ?)");
+ this.psE = conn.prepareStatement("INSERT INTO extrainfo "
+ + "(extrainfo, nickname, fingerprint, published, rawdesc) "
+ + "VALUES (?, ?, ?, ?, ?)");
+ this.csH = conn.prepareCall("{call insert_bwhist(?, ?, ?, ?, ?, "
+ + "?)}");
+ this.psC = conn.prepareStatement("INSERT INTO consensus "
+ + "(validafter, rawdesc) VALUES (?, ?)");
+ this.psV = conn.prepareStatement("INSERT INTO vote "
+ + "(validafter, dirsource, rawdesc) VALUES (?, ?, ?)");
+ this.psB = conn.prepareStatement("INSERT INTO connbidirect "
+ + "(source, statsend, seconds, belownum, readnum, writenum, "
+ + "bothnum) VALUES (?, ?, ?, ?, ?, ?, ?)");
+ this.psQ = conn.prepareStatement("INSERT INTO dirreq_stats "
+ + "(source, statsend, seconds, country, requests) VALUES "
+ + "(?, ?, ?, ?, ?)");
+ this.psU = conn.prepareStatement("INSERT INTO scheduled_updates "
+ + "(date) VALUES (?)");
+ this.scheduledUpdates = new HashSet<Long>();
+ this.importIntoDatabase = true;
+ } catch (SQLException e) {
+ this.logger.log(Level.WARNING, "Could not connect to database or "
+ + "prepare statements.", e);
+ }
+
+ /* Initialize set of fingerprints to remember which status entries
+ * we already imported. */
+ this.insertedStatusEntries = new HashSet<String>();
+ }
+
+ /* Remember where we want to write raw import files. */
+ if (rawFilesDirectory != null) {
+ this.rawFilesDirectory = rawFilesDirectory;
+ this.writeRawImportFiles = true;
+ }
+
+ /* Initialize date format, so that we can format timestamps. */
+ this.dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ this.dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+ }
+
+ private void addDateToScheduledUpdates(long timestamp)
+ throws SQLException {
+ if (!this.importIntoDatabase) {
+ return;
+ }
+ long dateMillis = 0L;
+ try {
+ dateMillis = this.dateTimeFormat.parse(
+ this.dateTimeFormat.format(timestamp).substring(0, 10)
+ + " 00:00:00").getTime();
+ } catch (ParseException e) {
+ this.logger.log(Level.WARNING, "Internal parsing error.", e);
+ return;
+ }
+ if (!this.scheduledUpdates.contains(dateMillis)) {
+ this.psU.setDate(1, new java.sql.Date(dateMillis));
+ this.psU.execute();
+ this.scheduledUpdates.add(dateMillis);
+ }
+ }
+
+ /**
+ * Insert network status consensus entry into database.
+ */
+ public void addStatusEntry(long validAfter, String nickname,
+ String fingerprint, String descriptor, long published,
+ String address, long orPort, long dirPort,
+ SortedSet<String> flags, String version, long bandwidth,
+ String ports, byte[] rawDescriptor) {
+ if (this.importIntoDatabase) {
+ try {
+ this.addDateToScheduledUpdates(validAfter);
+ Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+ Timestamp validAfterTimestamp = new Timestamp(validAfter);
+ if (lastCheckedStatusEntries != validAfter) {
+ this.psSs.setTimestamp(1, validAfterTimestamp, cal);
+ ResultSet rs = psSs.executeQuery();
+ rs.next();
+ if (rs.getInt(1) == 0) {
+ separateStatusEntryCheckNecessary = false;
+ insertedStatusEntries.clear();
+ } else {
+ separateStatusEntryCheckNecessary = true;
+ }
+ rs.close();
+ lastCheckedStatusEntries = validAfter;
+ }
+ boolean alreadyContained = false;
+ if (separateStatusEntryCheckNecessary ||
+ insertedStatusEntries.contains(fingerprint)) {
+ this.psRs.setTimestamp(1, validAfterTimestamp, cal);
+ this.psRs.setString(2, descriptor);
+ ResultSet rs = psRs.executeQuery();
+ rs.next();
+ if (rs.getInt(1) > 0) {
+ alreadyContained = true;
+ }
+ rs.close();
+ } else {
+ insertedStatusEntries.add(fingerprint);
+ }
+ if (!alreadyContained) {
+ this.psR.clearParameters();
+ this.psR.setTimestamp(1, validAfterTimestamp, cal);
+ this.psR.setString(2, nickname);
+ this.psR.setString(3, fingerprint);
+ this.psR.setString(4, descriptor);
+ this.psR.setTimestamp(5, new Timestamp(published), cal);
+ this.psR.setString(6, address);
+ this.psR.setLong(7, orPort);
+ this.psR.setLong(8, dirPort);
+ this.psR.setBoolean(9, flags.contains("Authority"));
+ this.psR.setBoolean(10, flags.contains("BadExit"));
+ this.psR.setBoolean(11, flags.contains("BadDirectory"));
+ this.psR.setBoolean(12, flags.contains("Exit"));
+ this.psR.setBoolean(13, flags.contains("Fast"));
+ this.psR.setBoolean(14, flags.contains("Guard"));
+ this.psR.setBoolean(15, flags.contains("HSDir"));
+ this.psR.setBoolean(16, flags.contains("Named"));
+ this.psR.setBoolean(17, flags.contains("Stable"));
+ this.psR.setBoolean(18, flags.contains("Running"));
+ this.psR.setBoolean(19, flags.contains("Unnamed"));
+ this.psR.setBoolean(20, flags.contains("Valid"));
+ this.psR.setBoolean(21, flags.contains("V2Dir"));
+ this.psR.setBoolean(22, flags.contains("V3Dir"));
+ this.psR.setString(23, version);
+ this.psR.setLong(24, bandwidth);
+ this.psR.setString(25, ports);
+ this.psR.setBytes(26, rawDescriptor);
+ this.psR.executeUpdate();
+ rrsCount++;
+ if (rrsCount % autoCommitCount == 0) {
+ this.conn.commit();
+ }
+ }
+ } catch (SQLException e) {
+ this.logger.log(Level.WARNING, "Could not add network status "
+ + "consensus entry. We won't make any further SQL requests "
+ + "in this execution.", e);
+ this.importIntoDatabase = false;
+ }
+ }
+ if (this.writeRawImportFiles) {
+ try {
+ if (this.statusentryOut == null) {
+ new File(rawFilesDirectory).mkdirs();
+ this.statusentryOut = new BufferedWriter(new FileWriter(
+ rawFilesDirectory + "/statusentry.sql"));
+ this.statusentryOut.write(" COPY statusentry (validafter, "
+ + "nickname, fingerprint, descriptor, published, address, "
+ + "orport, dirport, isauthority, isbadExit, "
+ + "isbaddirectory, isexit, isfast, isguard, ishsdir, "
+ + "isnamed, isstable, isrunning, isunnamed, isvalid, "
+ + "isv2dir, isv3dir, version, bandwidth, ports, rawdesc) "
+ + "FROM stdin;\n");
+ }
+ this.statusentryOut.write(
+ this.dateTimeFormat.format(validAfter) + "\t" + nickname
+ + "\t" + fingerprint.toLowerCase() + "\t"
+ + descriptor.toLowerCase() + "\t"
+ + this.dateTimeFormat.format(published) + "\t" + address
+ + "\t" + orPort + "\t" + dirPort + "\t"
+ + (flags.contains("Authority") ? "t" : "f") + "\t"
+ + (flags.contains("BadExit") ? "t" : "f") + "\t"
+ + (flags.contains("BadDirectory") ? "t" : "f") + "\t"
+ + (flags.contains("Exit") ? "t" : "f") + "\t"
+ + (flags.contains("Fast") ? "t" : "f") + "\t"
+ + (flags.contains("Guard") ? "t" : "f") + "\t"
+ + (flags.contains("HSDir") ? "t" : "f") + "\t"
+ + (flags.contains("Named") ? "t" : "f") + "\t"
+ + (flags.contains("Stable") ? "t" : "f") + "\t"
+ + (flags.contains("Running") ? "t" : "f") + "\t"
+ + (flags.contains("Unnamed") ? "t" : "f") + "\t"
+ + (flags.contains("Valid") ? "t" : "f") + "\t"
+ + (flags.contains("V2Dir") ? "t" : "f") + "\t"
+ + (flags.contains("V3Dir") ? "t" : "f") + "\t"
+ + (version != null ? version : "\\N") + "\t"
+ + (bandwidth >= 0 ? bandwidth : "\\N") + "\t"
+ + (ports != null ? ports : "\\N") + "\t");
+ this.statusentryOut.write(PGbytea.toPGString(rawDescriptor).
+ replaceAll("\\\\", "\\\\\\\\") + "\n");
+ } catch (SQLException e) {
+ this.logger.log(Level.WARNING, "Could not write network status "
+ + "consensus entry to raw database import file. We won't "
+ + "make any further attempts to write raw import files in "
+ + "this execution.", e);
+ this.writeRawImportFiles = false;
+ } catch (IOException e) {
+ this.logger.log(Level.WARNING, "Could not write network status "
+ + "consensus entry to raw database import file. We won't "
+ + "make any further attempts to write raw import files in "
+ + "this execution.", e);
+ this.writeRawImportFiles = false;
+ }
+ }
+ }
+
+ /**
+ * Insert server descriptor into database.
+ */
+ public void addServerDescriptor(String descriptor, String nickname,
+ String address, int orPort, int dirPort, String relayIdentifier,
+ long bandwidthAvg, long bandwidthBurst, long bandwidthObserved,
+ String platform, long published, long uptime,
+ String extraInfoDigest, byte[] rawDescriptor) {
+ if (this.importIntoDatabase) {
+ try {
+ this.addDateToScheduledUpdates(published);
+ this.addDateToScheduledUpdates(
+ published + 24L * 60L * 60L * 1000L);
+ Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+ this.psDs.setString(1, descriptor);
+ ResultSet rs = psDs.executeQuery();
+ rs.next();
+ if (rs.getInt(1) == 0) {
+ this.psD.clearParameters();
+ this.psD.setString(1, descriptor);
+ this.psD.setString(2, nickname);
+ this.psD.setString(3, address);
+ this.psD.setInt(4, orPort);
+ this.psD.setInt(5, dirPort);
+ this.psD.setString(6, relayIdentifier);
+ this.psD.setLong(7, bandwidthAvg);
+ this.psD.setLong(8, bandwidthBurst);
+ this.psD.setLong(9, bandwidthObserved);
+ this.psD.setString(10, new String(platform.getBytes(),
+ "US-ASCII"));
+ this.psD.setTimestamp(11, new Timestamp(published), cal);
+ this.psD.setLong(12, uptime);
+ this.psD.setString(13, extraInfoDigest);
+ this.psD.setBytes(14, rawDescriptor);
+ this.psD.executeUpdate();
+ rdsCount++;
+ if (rdsCount % autoCommitCount == 0) {
+ this.conn.commit();
+ }
+ }
+ } catch (UnsupportedEncodingException e) {
+ // US-ASCII is supported for sure
+ } catch (SQLException e) {
+ this.logger.log(Level.WARNING, "Could not add server "
+ + "descriptor. We won't make any further SQL requests in "
+ + "this execution.", e);
+ this.importIntoDatabase = false;
+ }
+ }
+ if (this.writeRawImportFiles) {
+ try {
+ if (this.descriptorOut == null) {
+ new File(rawFilesDirectory).mkdirs();
+ this.descriptorOut = new BufferedWriter(new FileWriter(
+ rawFilesDirectory + "/descriptor.sql"));
+ this.descriptorOut.write(" COPY descriptor (descriptor, "
+ + "nickname, address, orport, dirport, fingerprint, "
+ + "bandwidthavg, bandwidthburst, bandwidthobserved, "
+ + "platform, published, uptime, extrainfo, rawdesc) FROM "
+ + "stdin;\n");
+ }
+ this.descriptorOut.write(descriptor.toLowerCase() + "\t"
+ + nickname + "\t" + address + "\t" + orPort + "\t" + dirPort
+ + "\t" + relayIdentifier + "\t" + bandwidthAvg + "\t"
+ + bandwidthBurst + "\t" + bandwidthObserved + "\t"
+ + (platform != null && platform.length() > 0
+ ? new String(platform.getBytes(), "US-ASCII") : "\\N")
+ + "\t" + this.dateTimeFormat.format(published) + "\t"
+ + (uptime >= 0 ? uptime : "\\N") + "\t"
+ + (extraInfoDigest != null ? extraInfoDigest : "\\N")
+ + "\t");
+ this.descriptorOut.write(PGbytea.toPGString(rawDescriptor).
+ replaceAll("\\\\", "\\\\\\\\") + "\n");
+ } catch (UnsupportedEncodingException e) {
+ // US-ASCII is supported for sure
+ } catch (SQLException e) {
+ this.logger.log(Level.WARNING, "Could not write server "
+ + "descriptor to raw database import file. We won't make "
+ + "any further attempts to write raw import files in this "
+ + "execution.", e);
+ this.writeRawImportFiles = false;
+ } catch (IOException e) {
+ this.logger.log(Level.WARNING, "Could not write server "
+ + "descriptor to raw database import file. We won't make "
+ + "any further attempts to write raw import files in this "
+ + "execution.", e);
+ this.writeRawImportFiles = false;
+ }
+ }
+ }
+
+ /**
+ * Insert extra-info descriptor into database.
+ */
+ public void addExtraInfoDescriptor(String extraInfoDigest,
+ String nickname, String fingerprint, long published,
+ byte[] rawDescriptor, List<String> bandwidthHistoryLines) {
+ if (this.importIntoDatabase) {
+ try {
+ Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+ this.psEs.setString(1, extraInfoDigest);
+ ResultSet rs = psEs.executeQuery();
+ rs.next();
+ if (rs.getInt(1) == 0) {
+ this.psE.clearParameters();
+ this.psE.setString(1, extraInfoDigest);
+ this.psE.setString(2, nickname);
+ this.psE.setString(3, fingerprint);
+ this.psE.setTimestamp(4, new Timestamp(published), cal);
+ this.psE.setBytes(5, rawDescriptor);
+ this.psE.executeUpdate();
+ resCount++;
+ if (resCount % autoCommitCount == 0) {
+ this.conn.commit();
+ }
+ }
+ } catch (SQLException e) {
+ this.logger.log(Level.WARNING, "Could not add extra-info "
+ + "descriptor. We won't make any further SQL requests in "
+ + "this execution.", e);
+ this.importIntoDatabase = false;
+ }
+ }
+ if (this.writeRawImportFiles) {
+ try {
+ if (this.extrainfoOut == null) {
+ new File(rawFilesDirectory).mkdirs();
+ this.extrainfoOut = new BufferedWriter(new FileWriter(
+ rawFilesDirectory + "/extrainfo.sql"));
+ this.extrainfoOut.write(" COPY extrainfo (extrainfo, nickname, "
+ + "fingerprint, published, rawdesc) FROM stdin;\n");
+ }
+ this.extrainfoOut.write(extraInfoDigest.toLowerCase() + "\t"
+ + nickname + "\t" + fingerprint.toLowerCase() + "\t"
+ + this.dateTimeFormat.format(published) + "\t");
+ this.extrainfoOut.write(PGbytea.toPGString(rawDescriptor).
+ replaceAll("\\\\", "\\\\\\\\") + "\n");
+ } catch (IOException e) {
+ this.logger.log(Level.WARNING, "Could not write extra-info "
+ + "descriptor to raw database import file. We won't make "
+ + "any further attempts to write raw import files in this "
+ + "execution.", e);
+ this.writeRawImportFiles = false;
+ } catch (SQLException e) {
+ this.logger.log(Level.WARNING, "Could not write extra-info "
+ + "descriptor to raw database import file. We won't make "
+ + "any further attempts to write raw import files in this "
+ + "execution.", e);
+ this.writeRawImportFiles = false;
+ }
+ }
+ if (!bandwidthHistoryLines.isEmpty()) {
+ this.addBandwidthHistory(fingerprint.toLowerCase(), published,
+ bandwidthHistoryLines);
+ }
+ }
+
+ private static class BigIntArray implements java.sql.Array {
+
+ private final String stringValue;
+
+ public BigIntArray(long[] array, int offset) {
+ if (array == null) {
+ this.stringValue = "[-1:-1]={0}";
+ } else {
+ StringBuilder sb = new StringBuilder("[" + offset + ":"
+ + (offset + array.length - 1) + "]={");
+ for (int i = 0; i < array.length; i++) {
+ sb.append((i > 0 ? "," : "") + array[i]);
+ }
+ sb.append('}');
+ this.stringValue = sb.toString();
+ }
+ }
+
+ public String toString() {
+ return stringValue;
+ }
+
+ public String getBaseTypeName() {
+ return "int8";
+ }
+
+ /* The other methods are never called; no need to implement them. */
+ public void free() {
+ throw new UnsupportedOperationException();
+ }
+ public Object getArray() {
+ throw new UnsupportedOperationException();
+ }
+ public Object getArray(long index, int count) {
+ throw new UnsupportedOperationException();
+ }
+ public Object getArray(long index, int count,
+ Map<String, Class<?>> map) {
+ throw new UnsupportedOperationException();
+ }
+ public Object getArray(Map<String, Class<?>> map) {
+ throw new UnsupportedOperationException();
+ }
+ public int getBaseType() {
+ throw new UnsupportedOperationException();
+ }
+ public ResultSet getResultSet() {
+ throw new UnsupportedOperationException();
+ }
+ public ResultSet getResultSet(long index, int count) {
+ throw new UnsupportedOperationException();
+ }
+ public ResultSet getResultSet(long index, int count,
+ Map<String, Class<?>> map) {
+ throw new UnsupportedOperationException();
+ }
+ public ResultSet getResultSet(Map<String, Class<?>> map) {
+ throw new UnsupportedOperationException();
+ }
+ }
+
+ public void addBandwidthHistory(String fingerprint, long published,
+ List<String> bandwidthHistoryStrings) {
+
+ /* Split history lines by date and rewrite them so that the date
+ * comes first. */
+ SortedSet<String> historyLinesByDate = new TreeSet<String>();
+ for (String bandwidthHistoryString : bandwidthHistoryStrings) {
+ String[] parts = bandwidthHistoryString.split(" ");
+ if (parts.length != 6) {
+ this.logger.finer("Bandwidth history line does not have expected "
+ + "number of elements. Ignoring this line.");
+ continue;
+ }
+ long intervalLength = 0L;
+ try {
+ intervalLength = Long.parseLong(parts[3].substring(1));
+ } catch (NumberFormatException e) {
+ this.logger.fine("Bandwidth history line does not have valid "
+ + "interval length '" + parts[3] + " " + parts[4] + "'. "
+ + "Ignoring this line.");
+ continue;
+ }
+ if (intervalLength != 900L) {
+ this.logger.fine("Bandwidth history line does not consist of "
+ + "15-minute intervals. Ignoring this line.");
+ continue;
+ }
+ String type = parts[0];
+ String intervalEndTime = parts[1] + " " + parts[2];
+ long intervalEnd, dateStart;
+ try {
+ intervalEnd = dateTimeFormat.parse(intervalEndTime).getTime();
+ dateStart = dateTimeFormat.parse(parts[1] + " 00:00:00").
+ getTime();
+ } catch (ParseException e) {
+ this.logger.fine("Parse exception while parsing timestamp in "
+ + "bandwidth history line. Ignoring this line.");
+ continue;
+ }
+ if (Math.abs(published - intervalEnd) >
+ 7L * 24L * 60L * 60L * 1000L) {
+ this.logger.fine("Extra-info descriptor publication time "
+ + dateTimeFormat.format(published) + " and last interval "
+ + "time " + intervalEndTime + " in " + type + " line differ "
+ + "by more than 7 days! Not adding this line!");
+ continue;
+ }
+ long currentIntervalEnd = intervalEnd;
+ StringBuilder sb = new StringBuilder();
+ String[] values = parts[5].split(",");
+ SortedSet<String> newHistoryLines = new TreeSet<String>();
+ try {
+ for (int i = values.length - 1; i >= -1; i--) {
+ if (i == -1 || currentIntervalEnd < dateStart) {
+ sb.insert(0, intervalEndTime + " " + type + " ("
+ + intervalLength + " s) ");
+ sb.setLength(sb.length() - 1);
+ String historyLine = sb.toString();
+ newHistoryLines.add(historyLine);
+ sb = new StringBuilder();
+ dateStart -= 24L * 60L * 60L * 1000L;
+ intervalEndTime = dateTimeFormat.format(currentIntervalEnd);
+ }
+ if (i == -1) {
+ break;
+ }
+ Long.parseLong(values[i]);
+ sb.insert(0, values[i] + ",");
+ currentIntervalEnd -= intervalLength * 1000L;
+ }
+ } catch (NumberFormatException e) {
+ this.logger.fine("Number format exception while parsing "
+ + "bandwidth history line. Ignoring this line.");
+ continue;
+ }
+ historyLinesByDate.addAll(newHistoryLines);
+ }
+
+ /* Add split history lines to database. */
+ String lastDate = null;
+ historyLinesByDate.add("EOL");
+ long[] readArray = null, writtenArray = null, dirreadArray = null,
+ dirwrittenArray = null;
+ int readOffset = 0, writtenOffset = 0, dirreadOffset = 0,
+ dirwrittenOffset = 0;
+ for (String historyLine : historyLinesByDate) {
+ String[] parts = historyLine.split(" ");
+ String currentDate = parts[0];
+ if (lastDate != null && (historyLine.equals("EOL") ||
+ !currentDate.equals(lastDate))) {
+ BigIntArray readIntArray = new BigIntArray(readArray,
+ readOffset);
+ BigIntArray writtenIntArray = new BigIntArray(writtenArray,
+ writtenOffset);
+ BigIntArray dirreadIntArray = new BigIntArray(dirreadArray,
+ dirreadOffset);
+ BigIntArray dirwrittenIntArray = new BigIntArray(dirwrittenArray,
+ dirwrittenOffset);
+ if (this.importIntoDatabase) {
+ try {
+ long dateMillis = dateTimeFormat.parse(lastDate
+ + " 00:00:00").getTime();
+ this.addDateToScheduledUpdates(dateMillis);
+ this.csH.setString(1, fingerprint);
+ this.csH.setDate(2, new java.sql.Date(dateMillis));
+ this.csH.setArray(3, readIntArray);
+ this.csH.setArray(4, writtenIntArray);
+ this.csH.setArray(5, dirreadIntArray);
+ this.csH.setArray(6, dirwrittenIntArray);
+ this.csH.addBatch();
+ rhsCount++;
+ if (rhsCount % autoCommitCount == 0) {
+ this.csH.executeBatch();
+ }
+ } catch (SQLException e) {
+ this.logger.log(Level.WARNING, "Could not insert bandwidth "
+ + "history line into database. We won't make any "
+ + "further SQL requests in this execution.", e);
+ this.importIntoDatabase = false;
+ } catch (ParseException e) {
+ this.logger.log(Level.WARNING, "Could not insert bandwidth "
+ + "history line into database. We won't make any "
+ + "further SQL requests in this execution.", e);
+ this.importIntoDatabase = false;
+ }
+ }
+ if (this.writeRawImportFiles) {
+ try {
+ if (this.bwhistOut == null) {
+ new File(rawFilesDirectory).mkdirs();
+ this.bwhistOut = new BufferedWriter(new FileWriter(
+ rawFilesDirectory + "/bwhist.sql"));
+ }
+ this.bwhistOut.write("SELECT insert_bwhist('" + fingerprint
+ + "','" + lastDate + "','" + readIntArray.toString()
+ + "','" + writtenIntArray.toString() + "','"
+ + dirreadIntArray.toString() + "','"
+ + dirwrittenIntArray.toString() + "');\n");
+ } catch (IOException e) {
+ this.logger.log(Level.WARNING, "Could not write bandwidth "
+ + "history to raw database import file. We won't make "
+ + "any further attempts to write raw import files in "
+ + "this execution.", e);
+ this.writeRawImportFiles = false;
+ }
+ }
+ readArray = writtenArray = dirreadArray = dirwrittenArray = null;
+ }
+ if (historyLine.equals("EOL")) {
+ break;
+ }
+ long lastIntervalTime;
+ try {
+ lastIntervalTime = dateTimeFormat.parse(parts[0] + " "
+ + parts[1]).getTime() - dateTimeFormat.parse(parts[0]
+ + " 00:00:00").getTime();
+ } catch (ParseException e) {
+ continue;
+ }
+ String[] stringValues = parts[5].split(",");
+ long[] longValues = new long[stringValues.length];
+ for (int i = 0; i < longValues.length; i++) {
+ longValues[i] = Long.parseLong(stringValues[i]);
+ }
+
+ int offset = (int) (lastIntervalTime / (15L * 60L * 1000L))
+ - longValues.length + 1;
+ String type = parts[2];
+ if (type.equals("read-history")) {
+ readArray = longValues;
+ readOffset = offset;
+ } else if (type.equals("write-history")) {
+ writtenArray = longValues;
+ writtenOffset = offset;
+ } else if (type.equals("dirreq-read-history")) {
+ dirreadArray = longValues;
+ dirreadOffset = offset;
+ } else if (type.equals("dirreq-write-history")) {
+ dirwrittenArray = longValues;
+ dirwrittenOffset = offset;
+ }
+ lastDate = currentDate;
+ }
+ }
+
+ /**
+ * Insert network status consensus into database.
+ */
+ public void addConsensus(long validAfter, byte[] rawDescriptor) {
+ if (this.importIntoDatabase) {
+ try {
+ this.addDateToScheduledUpdates(validAfter);
+ Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+ Timestamp validAfterTimestamp = new Timestamp(validAfter);
+ this.psCs.setTimestamp(1, validAfterTimestamp, cal);
+ ResultSet rs = psCs.executeQuery();
+ rs.next();
+ if (rs.getInt(1) == 0) {
+ this.psC.clearParameters();
+ this.psC.setTimestamp(1, validAfterTimestamp, cal);
+ this.psC.setBytes(2, rawDescriptor);
+ this.psC.executeUpdate();
+ rcsCount++;
+ if (rcsCount % autoCommitCount == 0) {
+ this.conn.commit();
+ }
+ }
+ } catch (SQLException e) {
+ this.logger.log(Level.WARNING, "Could not add network status "
+ + "consensus. We won't make any further SQL requests in "
+ + "this execution.", e);
+ this.importIntoDatabase = false;
+ }
+ }
+ if (this.writeRawImportFiles) {
+ try {
+ if (this.consensusOut == null) {
+ new File(rawFilesDirectory).mkdirs();
+ this.consensusOut = new BufferedWriter(new FileWriter(
+ rawFilesDirectory + "/consensus.sql"));
+ this.consensusOut.write(" COPY consensus (validafter, rawdesc) "
+ + "FROM stdin;\n");
+ }
+ String validAfterString = this.dateTimeFormat.format(validAfter);
+ this.consensusOut.write(validAfterString + "\t");
+ this.consensusOut.write(PGbytea.toPGString(rawDescriptor).
+ replaceAll("\\\\", "\\\\\\\\") + "\n");
+ } catch (SQLException e) {
+ this.logger.log(Level.WARNING, "Could not write network status "
+ + "consensus to raw database import file. We won't make "
+ + "any further attempts to write raw import files in this "
+ + "execution.", e);
+ this.writeRawImportFiles = false;
+ } catch (IOException e) {
+ this.logger.log(Level.WARNING, "Could not write network status "
+ + "consensus to raw database import file. We won't make "
+ + "any further attempts to write raw import files in this "
+ + "execution.", e);
+ this.writeRawImportFiles = false;
+ }
+ }
+ }
+
+ /**
+ * Insert network status vote into database.
+ */
+ public void addVote(long validAfter, String dirSource,
+ byte[] rawDescriptor) {
+ if (this.importIntoDatabase) {
+ try {
+ Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+ Timestamp validAfterTimestamp = new Timestamp(validAfter);
+ this.psVs.setTimestamp(1, validAfterTimestamp, cal);
+ this.psVs.setString(2, dirSource);
+ ResultSet rs = psVs.executeQuery();
+ rs.next();
+ if (rs.getInt(1) == 0) {
+ this.psV.clearParameters();
+ this.psV.setTimestamp(1, validAfterTimestamp, cal);
+ this.psV.setString(2, dirSource);
+ this.psV.setBytes(3, rawDescriptor);
+ this.psV.executeUpdate();
+ rvsCount++;
+ if (rvsCount % autoCommitCount == 0) {
+ this.conn.commit();
+ }
+ }
+ } catch (SQLException e) {
+ this.logger.log(Level.WARNING, "Could not add network status "
+ + "vote. We won't make any further SQL requests in this "
+ + "execution.", e);
+ this.importIntoDatabase = false;
+ }
+ }
+ if (this.writeRawImportFiles) {
+ try {
+ if (this.voteOut == null) {
+ new File(rawFilesDirectory).mkdirs();
+ this.voteOut = new BufferedWriter(new FileWriter(
+ rawFilesDirectory + "/vote.sql"));
+ this.voteOut.write(" COPY vote (validafter, dirsource, "
+ + "rawdesc) FROM stdin;\n");
+ }
+ String validAfterString = this.dateTimeFormat.format(validAfter);
+ this.voteOut.write(validAfterString + "\t" + dirSource + "\t");
+ this.voteOut.write(PGbytea.toPGString(rawDescriptor).
+ replaceAll("\\\\", "\\\\\\\\") + "\n");
+ } catch (SQLException e) {
+ this.logger.log(Level.WARNING, "Could not write network status "
+ + "vote to raw database import file. We won't make any "
+ + "further attempts to write raw import files in this "
+ + "execution.", e);
+ this.writeRawImportFiles = false;
+ } catch (IOException e) {
+ this.logger.log(Level.WARNING, "Could not write network status "
+ + "vote to raw database import file. We won't make any "
+ + "further attempts to write raw import files in this "
+ + "execution.", e);
+ this.writeRawImportFiles = false;
+ }
+ }
+ }
+
+ /**
+ * Insert a conn-bi-direct stats string into the database.
+ */
+ public void addConnBiDirect(String source, String statsEnd,
+ long seconds, long below, long read, long write, long both) {
+ long statsEndTime = 0L;
+ try {
+ statsEndTime = this.dateTimeFormat.parse(statsEnd).getTime();
+ } catch (ParseException e) {
+ this.logger.log(Level.WARNING, "Could not add conn-bi-direct "
+ + "stats string with interval ending '" + statsEnd + "'.", e);
+ return;
+ }
+ if (this.importIntoDatabase) {
+ try {
+ this.addDateToScheduledUpdates(statsEndTime);
+ Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+ Timestamp statsEndTimestamp = new Timestamp(statsEndTime);
+ this.psBs.setString(1, source);
+ this.psBs.setTimestamp(2, statsEndTimestamp, cal);
+ ResultSet rs = psBs.executeQuery();
+ rs.next();
+ if (rs.getInt(1) == 0) {
+ this.psB.clearParameters();
+ this.psB.setString(1, source);
+ this.psB.setTimestamp(2, statsEndTimestamp, cal);
+ this.psB.setLong(3, seconds);
+ this.psB.setLong(4, below);
+ this.psB.setLong(5, read);
+ this.psB.setLong(6, write);
+ this.psB.setLong(7, both);
+ this.psB.executeUpdate();
+ rbsCount++;
+ if (rbsCount % autoCommitCount == 0) {
+ this.conn.commit();
+ }
+ }
+ } catch (SQLException e) {
+ this.logger.log(Level.WARNING, "Could not add conn-bi-direct "
+ + "stats string. We won't make any further SQL requests in "
+ + "this execution.", e);
+ this.importIntoDatabase = false;
+ }
+ }
+ if (this.writeRawImportFiles) {
+ try {
+ if (this.connBiDirectOut == null) {
+ new File(rawFilesDirectory).mkdirs();
+ this.connBiDirectOut = new BufferedWriter(new FileWriter(
+ rawFilesDirectory + "/connbidirect.sql"));
+ this.connBiDirectOut.write(" COPY connbidirect (source, "
+ + "statsend, seconds, belownum, readnum, writenum, "
+ + "bothnum) FROM stdin;\n");
+ }
+ this.connBiDirectOut.write(source + "\t" + statsEnd + "\t"
+ + seconds + "\t" + below + "\t" + read + "\t" + write + "\t"
+ + both + "\n");
+ } catch (IOException e) {
+ this.logger.log(Level.WARNING, "Could not write conn-bi-direct "
+ + "stats string to raw database import file. We won't make "
+ + "any further attempts to write raw import files in this "
+ + "execution.", e);
+ this.writeRawImportFiles = false;
+ }
+ }
+ }
+
+ /**
+ * Adds observations on the number of directory requests by country as
+ * seen on a directory at a given date to the database.
+ */
+ public void addDirReqStats(String source, String statsEnd, long seconds,
+ Map<String, String> dirReqsPerCountry) {
+ long statsEndTime = 0L;
+ try {
+ statsEndTime = this.dateTimeFormat.parse(statsEnd).getTime();
+ } catch (ParseException e) {
+ this.logger.log(Level.WARNING, "Could not add dirreq stats with "
+ + "interval ending '" + statsEnd + "'.", e);
+ return;
+ }
+ if (this.importIntoDatabase) {
+ try {
+ this.addDateToScheduledUpdates(statsEndTime);
+ Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+ Timestamp statsEndTimestamp = new Timestamp(statsEndTime);
+ this.psQs.setString(1, source);
+ this.psQs.setTimestamp(2, statsEndTimestamp, cal);
+ ResultSet rs = psQs.executeQuery();
+ rs.next();
+ if (rs.getInt(1) == 0) {
+ for (Map.Entry<String, String> e :
+ dirReqsPerCountry.entrySet()) {
+ this.psQ.clearParameters();
+ this.psQ.setString(1, source);
+ this.psQ.setTimestamp(2, statsEndTimestamp, cal);
+ this.psQ.setLong(3, seconds);
+ this.psQ.setString(4, e.getKey());
+ this.psQ.setLong(5, Long.parseLong(e.getValue()));
+ this.psQ.executeUpdate();
+ rqsCount++;
+ if (rqsCount % autoCommitCount == 0) {
+ this.conn.commit();
+ }
+ }
+ }
+ } catch (SQLException e) {
+ this.logger.log(Level.WARNING, "Could not add dirreq stats. We "
+ + "won't make any further SQL requests in this execution.",
+ e);
+ this.importIntoDatabase = false;
+ }
+ }
+ if (this.writeRawImportFiles) {
+ try {
+ if (this.dirReqOut == null) {
+ new File(rawFilesDirectory).mkdirs();
+ this.dirReqOut = new BufferedWriter(new FileWriter(
+ rawFilesDirectory + "/dirreq_stats.sql"));
+ this.dirReqOut.write(" COPY dirreq_stats (source, statsend, "
+ + "seconds, country, requests) FROM stdin;\n");
+ }
+ for (Map.Entry<String, String> e :
+ dirReqsPerCountry.entrySet()) {
+ this.dirReqOut.write(source + "\t" + statsEnd + "\t" + seconds
+ + "\t" + e.getKey() + "\t" + e.getValue() + "\n");
+ }
+ } catch (IOException e) {
+ this.logger.log(Level.WARNING, "Could not write dirreq stats to "
+ + "raw database import file. We won't make any further "
+ + "attempts to write raw import files in this execution.", e);
+ this.writeRawImportFiles = false;
+ }
+ }
+ }
+
+ /**
+ * Close the relay descriptor database connection.
+ */
+ public void closeConnection() {
+
+ /* Log stats about imported descriptors. */
+ this.logger.info(String.format("Finished importing relay "
+ + "descriptors: %d consensuses, %d network status entries, %d "
+ + "votes, %d server descriptors, %d extra-info descriptors, %d "
+ + "bandwidth history elements, %d dirreq stats elements, and %d "
+ + "conn-bi-direct stats lines", rcsCount, rrsCount, rvsCount,
+ rdsCount, resCount, rhsCount, rqsCount, rbsCount));
+
+ /* Insert scheduled updates a second time, just in case the refresh
+ * run has started since inserting them the first time in which case
+ * it will miss the data inserted afterwards. We cannot, however,
+ * insert them only now, because if a Java execution fails at a random
+ * point, we might have added data, but not the corresponding dates to
+ * update statistics. */
+ if (this.importIntoDatabase) {
+ try {
+ for (long dateMillis : this.scheduledUpdates) {
+ this.psU.setDate(1, new java.sql.Date(dateMillis));
+ this.psU.execute();
+ }
+ } catch (SQLException e) {
+ this.logger.log(Level.WARNING, "Could not add scheduled dates "
+ + "for the next refresh run.", e);
+ }
+ }
+
+ /* Commit any stragglers before closing. */
+ if (this.conn != null) {
+ try {
+ this.csH.executeBatch();
+
+ this.conn.commit();
+ } catch (SQLException e) {
+ this.logger.log(Level.WARNING, "Could not commit final records to "
+ + "database", e);
+ }
+ try {
+ this.conn.close();
+ } catch (SQLException e) {
+ this.logger.log(Level.WARNING, "Could not close database "
+ + "connection.", e);
+ }
+ }
+
+ /* Close raw import files. */
+ try {
+ if (this.statusentryOut != null) {
+ this.statusentryOut.write("\\.\n");
+ this.statusentryOut.close();
+ }
+ if (this.descriptorOut != null) {
+ this.descriptorOut.write("\\.\n");
+ this.descriptorOut.close();
+ }
+ if (this.extrainfoOut != null) {
+ this.extrainfoOut.write("\\.\n");
+ this.extrainfoOut.close();
+ }
+ if (this.bwhistOut != null) {
+ this.bwhistOut.write("\\.\n");
+ this.bwhistOut.close();
+ }
+ if (this.consensusOut != null) {
+ this.consensusOut.write("\\.\n");
+ this.consensusOut.close();
+ }
+ if (this.voteOut != null) {
+ this.voteOut.write("\\.\n");
+ this.voteOut.close();
+ }
+ if (this.connBiDirectOut != null) {
+ this.connBiDirectOut.write("\\.\n");
+ this.connBiDirectOut.close();
+ }
+ } catch (IOException e) {
+ this.logger.log(Level.WARNING, "Could not close one or more raw "
+ + "database import files.", e);
+ }
+ }
+}
+
diff --git a/src/org/torproject/ernie/cron/RelayDescriptorParser.java b/src/org/torproject/ernie/cron/RelayDescriptorParser.java
index 24b512b..d02022a 100644
--- a/src/org/torproject/ernie/cron/RelayDescriptorParser.java
+++ b/src/org/torproject/ernie/cron/RelayDescriptorParser.java
@@ -17,6 +17,12 @@ import org.apache.commons.codec.binary.*;
*/
public class RelayDescriptorParser {
+ /**
+ * Relay descriptor database importer that stores relay descriptor
+ * contents for later evaluation.
+ */
+ private RelayDescriptorDatabaseImporter rddi;
+
private ConsensusHealthChecker chc;
/**
@@ -29,8 +35,10 @@ public class RelayDescriptorParser {
/**
* Initializes this class.
*/
- public RelayDescriptorParser(ConsensusHealthChecker chc) {
+ public RelayDescriptorParser(ConsensusHealthChecker chc,
+ RelayDescriptorDatabaseImporter rddi) {
this.chc = chc;
+ this.rddi = rddi;
/* Initialize logger. */
this.logger = Logger.getLogger(RelayDescriptorParser.class.getName());
@@ -60,31 +68,256 @@ public class RelayDescriptorParser {
// time to see when we switch from hourly to half-hourly
// consensuses
boolean isConsensus = true;
- String validAfterTime = null;
- String dirSource = null;
+ String validAfterTime = null, nickname = null,
+ relayIdentity = null, serverDesc = null, version = null,
+ ports = null;
+ String fingerprint = null, dirSource = null, address = null;
+ long validAfter = -1L, published = -1L, bandwidth = -1L,
+ orPort = 0L, dirPort = 0L;
+ SortedSet<String> relayFlags = null;
+ StringBuilder rawStatusEntry = null;
while ((line = br.readLine()) != null) {
if (line.equals("vote-status vote")) {
isConsensus = false;
} else if (line.startsWith("valid-after ")) {
validAfterTime = line.substring("valid-after ".length());
+ validAfter = parseFormat.parse(validAfterTime).getTime();
} else if (line.startsWith("dir-source ")) {
dirSource = line.split(" ")[2];
- break;
+ } else if (line.startsWith("fingerprint ")) {
+ fingerprint = line.split(" ")[1];
+ } else if (line.startsWith("r ")) {
+ if (isConsensus && relayIdentity != null &&
+ this.rddi != null) {
+ byte[] rawDescriptor = rawStatusEntry.toString().getBytes();
+ this.rddi.addStatusEntry(validAfter, nickname,
+ relayIdentity, serverDesc, published, address, orPort,
+ dirPort, relayFlags, version, bandwidth, ports,
+ rawDescriptor);
+ relayFlags = null;
+ version = null;
+ bandwidth = -1L;
+ ports = null;
+ }
+ rawStatusEntry = new StringBuilder(line + "\n");
+ String[] parts = line.split(" ");
+ if (parts.length < 9) {
+ this.logger.log(Level.WARNING, "Could not parse r line '"
+ + line + "' in descriptor. Skipping.");
+ break;
+ }
+ String publishedTime = parts[4] + " " + parts[5];
+ nickname = parts[1];
+ relayIdentity = Hex.encodeHexString(
+ Base64.decodeBase64(parts[2] + "=")).
+ toLowerCase();
+ serverDesc = Hex.encodeHexString(Base64.decodeBase64(
+ parts[3] + "=")).toLowerCase();
+ published = parseFormat.parse(parts[4] + " " + parts[5]).
+ getTime();
+ address = parts[6];
+ orPort = Long.parseLong(parts[7]);
+ dirPort = Long.parseLong(parts[8]);
+ } else if (line.startsWith("s ") || line.equals("s")) {
+ rawStatusEntry.append(line + "\n");
+ relayFlags = new TreeSet<String>();
+ if (line.length() > 2) {
+ for (String flag : line.substring(2).split(" ")) {
+ relayFlags.add(flag);
+ }
+ }
+ } else if (line.startsWith("v ")) {
+ rawStatusEntry.append(line + "\n");
+ version = line.substring(2);
+ } else if (line.startsWith("w ")) {
+ rawStatusEntry.append(line + "\n");
+ String[] parts = line.split(" ");
+ for (String part : parts) {
+ if (part.startsWith("Bandwidth=")) {
+ bandwidth = Long.parseLong(part.substring(
+ "Bandwidth=".length()));
+ }
+ }
+ } else if (line.startsWith("p ")) {
+ rawStatusEntry.append(line + "\n");
+ ports = line.substring(2);
}
}
if (isConsensus) {
if (this.chc != null) {
this.chc.processConsensus(validAfterTime, data);
}
+ if (this.rddi != null) {
+ this.rddi.addConsensus(validAfter, data);
+ if (relayIdentity != null) {
+ byte[] rawDescriptor = rawStatusEntry.toString().getBytes();
+ this.rddi.addStatusEntry(validAfter, nickname,
+ relayIdentity, serverDesc, published, address, orPort,
+ dirPort, relayFlags, version, bandwidth, ports,
+ rawDescriptor);
+ }
+ }
} else {
if (this.chc != null) {
this.chc.processVote(validAfterTime, dirSource, data);
}
+ if (this.rddi != null) {
+ this.rddi.addVote(validAfter, dirSource, data);
+ }
+ }
+ } else if (line.startsWith("router ")) {
+ String platformLine = null, publishedLine = null,
+ bandwidthLine = null, extraInfoDigest = null,
+ relayIdentifier = null;
+ String[] parts = line.split(" ");
+ String nickname = parts[1];
+ String address = parts[2];
+ int orPort = Integer.parseInt(parts[3]);
+ int dirPort = Integer.parseInt(parts[4]);
+ long published = -1L, uptime = -1L;
+ while ((line = br.readLine()) != null) {
+ if (line.startsWith("platform ")) {
+ platformLine = line;
+ } else if (line.startsWith("published ")) {
+ String publishedTime = line.substring("published ".length());
+ published = parseFormat.parse(publishedTime).getTime();
+ } else if (line.startsWith("opt fingerprint") ||
+ line.startsWith("fingerprint")) {
+ relayIdentifier = line.substring(line.startsWith("opt ") ?
+ "opt fingerprint".length() : "fingerprint".length()).
+ replaceAll(" ", "").toLowerCase();
+ } else if (line.startsWith("bandwidth ")) {
+ bandwidthLine = line;
+ } else if (line.startsWith("opt extra-info-digest ") ||
+ line.startsWith("extra-info-digest ")) {
+ extraInfoDigest = line.startsWith("opt ") ?
+ line.split(" ")[2].toLowerCase() :
+ line.split(" ")[1].toLowerCase();
+ } else if (line.startsWith("uptime ")) {
+ uptime = Long.parseLong(line.substring("uptime ".length()));
+ }
+ }
+ String ascii = new String(data, "US-ASCII");
+ String startToken = "router ";
+ String sigToken = "\nrouter-signature\n";
+ int start = ascii.indexOf(startToken);
+ int sig = ascii.indexOf(sigToken) + sigToken.length();
+ String digest = null;
+ if (start >= 0 || sig >= 0 || sig > start) {
+ byte[] forDigest = new byte[sig - start];
+ System.arraycopy(data, start, forDigest, 0, sig - start);
+ digest = DigestUtils.shaHex(forDigest);
+ }
+ if (this.rddi != null && digest != null) {
+ String[] bwParts = bandwidthLine.split(" ");
+ long bandwidthAvg = Long.parseLong(bwParts[1]);
+ long bandwidthBurst = Long.parseLong(bwParts[2]);
+ long bandwidthObserved = Long.parseLong(bwParts[3]);
+ String platform = platformLine.substring("platform ".length());
+ this.rddi.addServerDescriptor(digest, nickname, address, orPort,
+ dirPort, relayIdentifier, bandwidthAvg, bandwidthBurst,
+ bandwidthObserved, platform, published, uptime,
+ extraInfoDigest, data);
+ }
+ } else if (line.startsWith("extra-info ")) {
+ String nickname = line.split(" ")[1];
+ long published = -1L;
+ String dir = line.split(" ")[2];
+ String statsEnd = null;
+ long seconds = -1L;
+ List<String> bandwidthHistory = new ArrayList<String>();
+ boolean skip = false;
+ while ((line = br.readLine()) != null) {
+ if (line.startsWith("published ")) {
+ String publishedTime = line.substring("published ".length());
+ published = parseFormat.parse(publishedTime).getTime();
+ } else if (line.startsWith("read-history ") ||
+ line.startsWith("write-history ") ||
+ line.startsWith("dirreq-read-history ") ||
+ line.startsWith("dirreq-write-history ")) {
+ bandwidthHistory.add(line);
+ } else if (line.startsWith("dirreq-stats-end ")) {
+ String[] parts = line.split(" ");
+ if (parts.length < 5) {
+ this.logger.warning("Could not parse dirreq-stats-end "
+ + "line '" + line + "' in descriptor. Skipping.");
+ break;
+ }
+ statsEnd = parts[1] + " " + parts[2];
+ seconds = Long.parseLong(parts[3].substring(1));
+ } else if (line.startsWith("dirreq-v3-reqs ")
+ && line.length() > "dirreq-v3-reqs ".length()) {
+ if (this.rddi != null) {
+ try {
+ int allUsers = 0;
+ Map<String, String> obs = new HashMap<String, String>();
+ String[] parts = line.substring("dirreq-v3-reqs ".
+ length()).split(",");
+ for (String p : parts) {
+ String country = p.substring(0, 2);
+ int users = Integer.parseInt(p.substring(3)) - 4;
+ allUsers += users;
+ obs.put(country, "" + users);
+ }
+ obs.put("zy", "" + allUsers);
+ this.rddi.addDirReqStats(dir, statsEnd, seconds, obs);
+ } catch (NumberFormatException e) {
+ this.logger.log(Level.WARNING, "Could not parse "
+ + "dirreq-v3-reqs line '" + line + "' in descriptor. "
+ + "Skipping.", e);
+ break;
+ }
+ }
+ } else if (line.startsWith("conn-bi-direct ")) {
+ if (this.rddi != null) {
+ String[] parts = line.split(" ");
+ if (parts.length == 6 &&
+ parts[5].split(",").length == 4) {
+ try {
+ String connBiDirectStatsEnd = parts[1] + " " + parts[2];
+ long connBiDirectSeconds = Long.parseLong(parts[3].
+ substring(1));
+ String[] parts2 = parts[5].split(",");
+ long below = Long.parseLong(parts2[0]);
+ long read = Long.parseLong(parts2[1]);
+ long write = Long.parseLong(parts2[2]);
+ long both = Long.parseLong(parts2[3]);
+ this.rddi.addConnBiDirect(dir, connBiDirectStatsEnd,
+ connBiDirectSeconds, below, read, write, both);
+ } catch (NumberFormatException e) {
+ this.logger.log(Level.WARNING, "Number format "
+ + "exception while parsing conn-bi-direct stats "
+ + "string '" + line + "'. Skipping.", e);
+ }
+ } else {
+ this.logger.warning("Skipping invalid conn-bi-direct "
+ + "stats string '" + line + "'.");
+ }
+ }
+ }
+ }
+ String ascii = new String(data, "US-ASCII");
+ String startToken = "extra-info ";
+ String sigToken = "\nrouter-signature\n";
+ String digest = null;
+ int start = ascii.indexOf(startToken);
+ int sig = ascii.indexOf(sigToken) + sigToken.length();
+ if (start >= 0 || sig >= 0 || sig > start) {
+ byte[] forDigest = new byte[sig - start];
+ System.arraycopy(data, start, forDigest, 0, sig - start);
+ digest = DigestUtils.shaHex(forDigest);
+ }
+ if (this.rddi != null && digest != null) {
+ this.rddi.addExtraInfoDescriptor(digest, nickname,
+ dir.toLowerCase(), published, data, bandwidthHistory);
}
}
} catch (IOException e) {
this.logger.log(Level.WARNING, "Could not parse descriptor. "
+ "Skipping.", e);
+ } catch (ParseException e) {
+ this.logger.log(Level.WARNING, "Could not parse descriptor. "
+ + "Skipping.", e);
}
}
}
1
0
02 Mar '11
commit 0cb4eefde5bc6e8ae98cb823bda25229ff755e47
Author: Karsten Loesing <karsten.loesing(a)gmx.net>
Date: Tue Mar 1 16:41:26 2011 +0100
Remove database import from metrics-db.
---
config.template | 11 -
src/org/torproject/ernie/db/Configuration.java | 28 +-
src/org/torproject/ernie/db/Main.java | 29 +-
.../ernie/db/RelayDescriptorDatabaseImporter.java | 1213 --------------------
.../torproject/ernie/db/RelayDescriptorParser.java | 184 +---
5 files changed, 17 insertions(+), 1448 deletions(-)
diff --git a/config.template b/config.template
index 1ef915c..7385f7b 100644
--- a/config.template
+++ b/config.template
@@ -67,9 +67,6 @@
## Relative path to directory to write directory archives to
#DirectoryArchivesOutputDirectory directory-archive/
#
-## Write relay descriptors to a database for later evaluation
-#WriteRelayDescriptorDatabase 0
-#
## Write aggregate statistics (bridges and bridge users per day, directory
## clients per day, torperf results, packages requested from GetTor, etc.)
## to database for later evaluation
@@ -78,14 +75,6 @@
## JDBC string for relay descriptor database
#RelayDescriptorDatabaseJDBC jdbc:postgresql://localhost/tordir?user=ernie&password=password
#
-## Write relay descriptors to raw text files for importing them into a
-## database using PostgreSQL's \copy command
-#WriteRelayDescriptorsRawFiles 0
-#
-## Relative path to directory to write raw text files; note that existing
-## files will be overwritten!
-#RelayDescriptorRawFilesDirectory pg-import/
-#
## Write statistics about the current consensus and votes to the
## website
#WriteConsensusHealth 0
diff --git a/src/org/torproject/ernie/db/Configuration.java b/src/org/torproject/ernie/db/Configuration.java
index 262ec78..b8f8f39 100644
--- a/src/org/torproject/ernie/db/Configuration.java
+++ b/src/org/torproject/ernie/db/Configuration.java
@@ -23,12 +23,9 @@ public class Configuration {
private boolean importDirectoryArchives = false;
private String directoryArchivesDirectory = "archives/";
private boolean keepDirectoryArchiveImportHistory = false;
- private boolean writeRelayDescriptorDatabase = false;
private boolean writeAggregateStatsDatabase = false;
private String relayDescriptorDatabaseJdbc =
"jdbc:postgresql://localhost/tordir?user=ernie&password=password";
- private boolean writeRelayDescriptorsRawFiles = false;
- private String relayDescriptorRawFilesDirectory = "pg-import/";
private boolean writeSanitizedBridges = false;
private boolean replaceIPAddressesWithHashes = false;
private long limitBridgeDescriptorMappings = -1L;
@@ -98,19 +95,11 @@ public class Configuration {
} else if (line.startsWith("KeepDirectoryArchiveImportHistory")) {
this.keepDirectoryArchiveImportHistory = Integer.parseInt(
line.split(" ")[1]) != 0;
- } else if (line.startsWith("WriteRelayDescriptorDatabase")) {
- this.writeRelayDescriptorDatabase = Integer.parseInt(
- line.split(" ")[1]) != 0;
} else if (line.startsWith("WriteAggregateStatsDatabase")) {
this.writeAggregateStatsDatabase = Integer.parseInt(
line.split(" ")[1]) != 0;
} else if (line.startsWith("RelayDescriptorDatabaseJDBC")) {
this.relayDescriptorDatabaseJdbc = line.split(" ")[1];
- } else if (line.startsWith("WriteRelayDescriptorsRawFiles")) {
- this.writeRelayDescriptorsRawFiles = Integer.parseInt(
- line.split(" ")[1]) != 0;
- } else if (line.startsWith("RelayDescriptorRawFilesDirectory")) {
- this.relayDescriptorRawFilesDirectory = line.split(" ")[1];
} else if (line.startsWith("WriteSanitizedBridges")) {
this.writeSanitizedBridges = Integer.parseInt(
line.split(" ")[1]) != 0;
@@ -199,7 +188,6 @@ public class Configuration {
!this.importWriteTorperfStats &&
!this.downloadProcessGetTorStats && !this.downloadExitList &&
!this.writeDirectoryArchives &&
- !this.writeRelayDescriptorDatabase &&
!this.writeAggregateStatsDatabase &&
!this.writeSanitizedBridges && !this.writeConsensusStats &&
!this.writeBridgeStats) {
@@ -211,9 +199,7 @@ public class Configuration {
}
if ((this.importCachedRelayDescriptors ||
this.importDirectoryArchives || this.downloadRelayDescriptors) &&
- !(this.writeDirectoryArchives ||
- this.writeRelayDescriptorDatabase ||
- this.writeRelayDescriptorsRawFiles || this.writeConsensusStats ||
+ !(this.writeDirectoryArchives || this.writeConsensusStats ||
this.writeBridgeStats)) {
logger.warning("We are configured to import/download relay "
+ "descriptors, but we don't have a single data sink to write "
@@ -221,8 +207,7 @@ public class Configuration {
}
if (!(this.importCachedRelayDescriptors ||
this.importDirectoryArchives || this.downloadRelayDescriptors) &&
- (this.writeDirectoryArchives ||
- this.writeRelayDescriptorDatabase)) {
+ this.writeDirectoryArchives) {
logger.warning("We are configured to write relay descriptor to at "
+ "least one data sink, but we don't have a single data source "
+ "containing relay descriptors.");
@@ -281,21 +266,12 @@ public class Configuration {
public boolean getKeepDirectoryArchiveImportHistory() {
return this.keepDirectoryArchiveImportHistory;
}
- public boolean getWriteRelayDescriptorDatabase() {
- return this.writeRelayDescriptorDatabase;
- }
public boolean getWriteAggregateStatsDatabase() {
return this.writeAggregateStatsDatabase;
}
public String getRelayDescriptorDatabaseJDBC() {
return this.relayDescriptorDatabaseJdbc;
}
- public boolean getWriteRelayDescriptorsRawFiles() {
- return this.writeRelayDescriptorsRawFiles;
- }
- public String getRelayDescriptorRawFilesDirectory() {
- return this.relayDescriptorRawFilesDirectory;
- }
public boolean getWriteSanitizedBridges() {
return this.writeSanitizedBridges;
}
diff --git a/src/org/torproject/ernie/db/Main.java b/src/org/torproject/ernie/db/Main.java
index a495a03..4dced2c 100644
--- a/src/org/torproject/ernie/db/Main.java
+++ b/src/org/torproject/ernie/db/Main.java
@@ -44,23 +44,11 @@ public class Main {
new ArchiveWriter(
new File(config.getDirectoryArchivesOutputDirectory())) : null;
- // Prepare writing relay descriptors to database
- RelayDescriptorDatabaseImporter rddi =
- config.getWriteRelayDescriptorDatabase() ||
- config.getWriteRelayDescriptorsRawFiles() ?
- new RelayDescriptorDatabaseImporter(
- config.getWriteRelayDescriptorDatabase() ?
- config.getRelayDescriptorDatabaseJDBC() : null,
- config.getWriteRelayDescriptorsRawFiles() ?
- config.getRelayDescriptorRawFilesDirectory() : null) : null;
-
// Prepare relay descriptor parser (only if we are writing stats or
// directory archives to disk)
RelayDescriptorParser rdp = config.getWriteBridgeStats() ||
- config.getWriteDirectoryArchives() ||
- config.getWriteRelayDescriptorDatabase() ||
- config.getWriteRelayDescriptorsRawFiles() ?
- new RelayDescriptorParser(bsfh, aw, rddi) : null;
+ config.getWriteDirectoryArchives() ?
+ new RelayDescriptorParser(bsfh, aw) : null;
// Import/download relay descriptors from the various sources
if (rdp != null) {
@@ -68,12 +56,10 @@ public class Main {
if (config.getDownloadRelayDescriptors()) {
List<String> dirSources =
config.getDownloadFromDirectoryAuthorities();
- boolean downloadCurrentConsensus = aw != null || bsfh != null ||
- rddi != null;
+ boolean downloadCurrentConsensus = aw != null || bsfh != null;
boolean downloadCurrentVotes = aw != null;
- boolean downloadAllServerDescriptors = aw != null ||
- rddi != null;
- boolean downloadAllExtraInfos = aw != null || rddi != null;
+ boolean downloadAllServerDescriptors = aw != null;
+ boolean downloadAllExtraInfos = aw != null;
rdd = new RelayDescriptorDownloader(rdp, dirSources,
downloadCurrentConsensus, downloadCurrentVotes,
downloadAllServerDescriptors, downloadAllExtraInfos);
@@ -108,11 +94,6 @@ public class Main {
}
}
- // Close database connection (if active)
- if (rddi != null) {
- rddi.closeConnection();
- }
-
// Write output to disk that only depends on relay descriptors
if (aw != null) {
aw.dumpStats();
diff --git a/src/org/torproject/ernie/db/RelayDescriptorDatabaseImporter.java b/src/org/torproject/ernie/db/RelayDescriptorDatabaseImporter.java
deleted file mode 100644
index 3a06a58..0000000
--- a/src/org/torproject/ernie/db/RelayDescriptorDatabaseImporter.java
+++ /dev/null
@@ -1,1213 +0,0 @@
-/* Copyright 2010 The Tor Project
- * See LICENSE for licensing information */
-package org.torproject.ernie.db;
-
-import java.io.*;
-import java.sql.*;
-import java.text.*;
-import java.util.*;
-import java.util.logging.*;
-import org.postgresql.util.*;
-
-/**
- * Parse directory data.
- */
-
-public final class RelayDescriptorDatabaseImporter {
-
- /**
- * How many records to commit with each database transaction.
- */
- private final long autoCommitCount = 500;
-
- /**
- * Keep track of the number of records committed before each transaction
- */
- private int rdsCount = 0;
- private int resCount = 0;
- private int rhsCount = 0;
- private int rrsCount = 0;
- private int rcsCount = 0;
- private int rvsCount = 0;
- private int rbsCount = 0;
- private int rqsCount = 0;
-
- /**
- * Relay descriptor database connection.
- */
- private Connection conn;
-
- /**
- * Prepared statement to check whether any network status consensus
- * entries matching a given valid-after time have been imported into the
- * database before.
- */
- private PreparedStatement psSs;
-
- /**
- * Prepared statement to check whether a given network status consensus
- * entry has been imported into the database before.
- */
- private PreparedStatement psRs;
-
- /**
- * Prepared statement to check whether a given extra-info descriptor has
- * been imported into the database before.
- */
- private PreparedStatement psEs;
-
- /**
- * Prepared statement to check whether a given server descriptor has
- * been imported into the database before.
- */
- private PreparedStatement psDs;
-
- /**
- * Prepared statement to check whether a given network status consensus
- * has been imported into the database before.
- */
- private PreparedStatement psCs;
-
- /**
- * Prepared statement to check whether a given network status vote has
- * been imported into the database before.
- */
- private PreparedStatement psVs;
-
- /**
- * Prepared statement to check whether a given conn-bi-direct stats
- * string has been imported into the database before.
- */
- private PreparedStatement psBs;
-
- /**
- * Prepared statement to check whether a given dirreq stats string has
- * been imported into the database before.
- */
- private PreparedStatement psQs;
-
- /**
- * Set of dates that have been inserted into the database for being
- * included in the next refresh run.
- */
- private Set<Long> scheduledUpdates;
-
- /**
- * Prepared statement to insert a date into the database that shall be
- * included in the next refresh run.
- */
- private PreparedStatement psU;
-
- /**
- * Prepared statement to insert a network status consensus entry into
- * the database.
- */
- private PreparedStatement psR;
-
- /**
- * Prepared statement to insert a server descriptor into the database.
- */
- private PreparedStatement psD;
-
- /**
- * Prepared statement to insert an extra-info descriptor into the
- * database.
- */
- private PreparedStatement psE;
-
- /**
- * Callable statement to insert the bandwidth history of an extra-info
- * descriptor into the database.
- */
- private CallableStatement csH;
-
- /**
- * Prepared statement to insert a network status consensus into the
- * database.
- */
- private PreparedStatement psC;
-
- /**
- * Prepared statement to insert a network status vote into the
- * database.
- */
- private PreparedStatement psV;
-
- /**
- * Prepared statement to insert a conn-bi-direct stats string into the
- * database.
- */
- private PreparedStatement psB;
-
- /**
- * Prepared statement to insert a given dirreq stats string into the
- * database.
- */
- private PreparedStatement psQ;
-
- /**
- * Logger for this class.
- */
- private Logger logger;
-
- /**
- * Directory for writing raw import files.
- */
- private String rawFilesDirectory;
-
- /**
- * Raw import file containing status entries.
- */
- private BufferedWriter statusentryOut;
-
- /**
- * Raw import file containing server descriptors.
- */
- private BufferedWriter descriptorOut;
-
- /**
- * Raw import file containing extra-info descriptors.
- */
- private BufferedWriter extrainfoOut;
-
- /**
- * Raw import file containing bandwidth histories.
- */
- private BufferedWriter bwhistOut;
-
- /**
- * Raw import file containing consensuses.
- */
- private BufferedWriter consensusOut;
-
- /**
- * Raw import file containing votes.
- */
- private BufferedWriter voteOut;
-
- /**
- * Raw import file containing conn-bi-direct stats strings.
- */
- private BufferedWriter connBiDirectOut;
-
- /**
- * Raw import file containing dirreq stats.
- */
- private BufferedWriter dirReqOut;
-
- /**
- * Date format to parse timestamps.
- */
- private SimpleDateFormat dateTimeFormat;
-
- /**
- * The last valid-after time for which we checked whether they have been
- * any network status entries in the database.
- */
- private long lastCheckedStatusEntries;
-
- /**
- * Set of fingerprints that we imported for the valid-after time in
- * <code>lastCheckedStatusEntries</code>.
- */
- private Set<String> insertedStatusEntries;
-
- /**
- * Flag that tells us whether we need to check whether a network status
- * entry is already contained in the database or not.
- */
- private boolean separateStatusEntryCheckNecessary;
-
- private boolean importIntoDatabase;
- private boolean writeRawImportFiles;
-
- /**
- * Initialize database importer by connecting to the database and
- * preparing statements.
- */
- public RelayDescriptorDatabaseImporter(String connectionURL,
- String rawFilesDirectory) {
-
- /* Initialize logger. */
- this.logger = Logger.getLogger(
- RelayDescriptorDatabaseImporter.class.getName());
-
- if (connectionURL != null) {
- try {
- /* Connect to database. */
- this.conn = DriverManager.getConnection(connectionURL);
-
- /* Turn autocommit off */
- this.conn.setAutoCommit(false);
-
- /* Prepare statements. */
- this.psSs = conn.prepareStatement("SELECT COUNT(*) "
- + "FROM statusentry WHERE validafter = ?");
- this.psRs = conn.prepareStatement("SELECT COUNT(*) "
- + "FROM statusentry WHERE validafter = ? AND descriptor = ?");
- this.psDs = conn.prepareStatement("SELECT COUNT(*) "
- + "FROM descriptor WHERE descriptor = ?");
- this.psEs = conn.prepareStatement("SELECT COUNT(*) "
- + "FROM extrainfo WHERE extrainfo = ?");
- this.psCs = conn.prepareStatement("SELECT COUNT(*) "
- + "FROM consensus WHERE validafter = ?");
- this.psVs = conn.prepareStatement("SELECT COUNT(*) "
- + "FROM vote WHERE validafter = ? AND dirsource = ?");
- this.psBs = conn.prepareStatement("SELECT COUNT(*) "
- + "FROM connbidirect WHERE source = ? AND statsend = ?");
- this.psQs = conn.prepareStatement("SELECT COUNT(*) "
- + "FROM dirreq_stats WHERE source = ? AND statsend = ?");
- this.psR = conn.prepareStatement("INSERT INTO statusentry "
- + "(validafter, nickname, fingerprint, descriptor, "
- + "published, address, orport, dirport, isauthority, "
- + "isbadexit, isbaddirectory, isexit, isfast, isguard, "
- + "ishsdir, isnamed, isstable, isrunning, isunnamed, "
- + "isvalid, isv2dir, isv3dir, version, bandwidth, ports, "
- + "rawdesc) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, "
- + "?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
- this.psD = conn.prepareStatement("INSERT INTO descriptor "
- + "(descriptor, nickname, address, orport, dirport, "
- + "fingerprint, bandwidthavg, bandwidthburst, "
- + "bandwidthobserved, platform, published, uptime, "
- + "extrainfo, rawdesc) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, "
- + "?, ?, ?, ?)");
- this.psE = conn.prepareStatement("INSERT INTO extrainfo "
- + "(extrainfo, nickname, fingerprint, published, rawdesc) "
- + "VALUES (?, ?, ?, ?, ?)");
- this.csH = conn.prepareCall("{call insert_bwhist(?, ?, ?, ?, ?, "
- + "?)}");
- this.psC = conn.prepareStatement("INSERT INTO consensus "
- + "(validafter, rawdesc) VALUES (?, ?)");
- this.psV = conn.prepareStatement("INSERT INTO vote "
- + "(validafter, dirsource, rawdesc) VALUES (?, ?, ?)");
- this.psB = conn.prepareStatement("INSERT INTO connbidirect "
- + "(source, statsend, seconds, belownum, readnum, writenum, "
- + "bothnum) VALUES (?, ?, ?, ?, ?, ?, ?)");
- this.psQ = conn.prepareStatement("INSERT INTO dirreq_stats "
- + "(source, statsend, seconds, country, requests) VALUES "
- + "(?, ?, ?, ?, ?)");
- this.psU = conn.prepareStatement("INSERT INTO scheduled_updates "
- + "(date) VALUES (?)");
- this.scheduledUpdates = new HashSet<Long>();
- this.importIntoDatabase = true;
- } catch (SQLException e) {
- this.logger.log(Level.WARNING, "Could not connect to database or "
- + "prepare statements.", e);
- }
-
- /* Initialize set of fingerprints to remember which status entries
- * we already imported. */
- this.insertedStatusEntries = new HashSet<String>();
- }
-
- /* Remember where we want to write raw import files. */
- if (rawFilesDirectory != null) {
- this.rawFilesDirectory = rawFilesDirectory;
- this.writeRawImportFiles = true;
- }
-
- /* Initialize date format, so that we can format timestamps. */
- this.dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- this.dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
- }
-
- private void addDateToScheduledUpdates(long timestamp)
- throws SQLException {
- if (!this.importIntoDatabase) {
- return;
- }
- long dateMillis = 0L;
- try {
- dateMillis = this.dateTimeFormat.parse(
- this.dateTimeFormat.format(timestamp).substring(0, 10)
- + " 00:00:00").getTime();
- } catch (ParseException e) {
- this.logger.log(Level.WARNING, "Internal parsing error.", e);
- return;
- }
- if (!this.scheduledUpdates.contains(dateMillis)) {
- this.psU.setDate(1, new java.sql.Date(dateMillis));
- this.psU.execute();
- this.scheduledUpdates.add(dateMillis);
- }
- }
-
- /**
- * Insert network status consensus entry into database.
- */
- public void addStatusEntry(long validAfter, String nickname,
- String fingerprint, String descriptor, long published,
- String address, long orPort, long dirPort,
- SortedSet<String> flags, String version, long bandwidth,
- String ports, byte[] rawDescriptor) {
- if (this.importIntoDatabase) {
- try {
- this.addDateToScheduledUpdates(validAfter);
- Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- Timestamp validAfterTimestamp = new Timestamp(validAfter);
- if (lastCheckedStatusEntries != validAfter) {
- this.psSs.setTimestamp(1, validAfterTimestamp, cal);
- ResultSet rs = psSs.executeQuery();
- rs.next();
- if (rs.getInt(1) == 0) {
- separateStatusEntryCheckNecessary = false;
- insertedStatusEntries.clear();
- } else {
- separateStatusEntryCheckNecessary = true;
- }
- rs.close();
- lastCheckedStatusEntries = validAfter;
- }
- boolean alreadyContained = false;
- if (separateStatusEntryCheckNecessary ||
- insertedStatusEntries.contains(fingerprint)) {
- this.psRs.setTimestamp(1, validAfterTimestamp, cal);
- this.psRs.setString(2, descriptor);
- ResultSet rs = psRs.executeQuery();
- rs.next();
- if (rs.getInt(1) > 0) {
- alreadyContained = true;
- }
- rs.close();
- } else {
- insertedStatusEntries.add(fingerprint);
- }
- if (!alreadyContained) {
- this.psR.clearParameters();
- this.psR.setTimestamp(1, validAfterTimestamp, cal);
- this.psR.setString(2, nickname);
- this.psR.setString(3, fingerprint);
- this.psR.setString(4, descriptor);
- this.psR.setTimestamp(5, new Timestamp(published), cal);
- this.psR.setString(6, address);
- this.psR.setLong(7, orPort);
- this.psR.setLong(8, dirPort);
- this.psR.setBoolean(9, flags.contains("Authority"));
- this.psR.setBoolean(10, flags.contains("BadExit"));
- this.psR.setBoolean(11, flags.contains("BadDirectory"));
- this.psR.setBoolean(12, flags.contains("Exit"));
- this.psR.setBoolean(13, flags.contains("Fast"));
- this.psR.setBoolean(14, flags.contains("Guard"));
- this.psR.setBoolean(15, flags.contains("HSDir"));
- this.psR.setBoolean(16, flags.contains("Named"));
- this.psR.setBoolean(17, flags.contains("Stable"));
- this.psR.setBoolean(18, flags.contains("Running"));
- this.psR.setBoolean(19, flags.contains("Unnamed"));
- this.psR.setBoolean(20, flags.contains("Valid"));
- this.psR.setBoolean(21, flags.contains("V2Dir"));
- this.psR.setBoolean(22, flags.contains("V3Dir"));
- this.psR.setString(23, version);
- this.psR.setLong(24, bandwidth);
- this.psR.setString(25, ports);
- this.psR.setBytes(26, rawDescriptor);
- this.psR.executeUpdate();
- rrsCount++;
- if (rrsCount % autoCommitCount == 0) {
- this.conn.commit();
- }
- }
- } catch (SQLException e) {
- this.logger.log(Level.WARNING, "Could not add network status "
- + "consensus entry. We won't make any further SQL requests "
- + "in this execution.", e);
- this.importIntoDatabase = false;
- }
- }
- if (this.writeRawImportFiles) {
- try {
- if (this.statusentryOut == null) {
- new File(rawFilesDirectory).mkdirs();
- this.statusentryOut = new BufferedWriter(new FileWriter(
- rawFilesDirectory + "/statusentry.sql"));
- this.statusentryOut.write(" COPY statusentry (validafter, "
- + "nickname, fingerprint, descriptor, published, address, "
- + "orport, dirport, isauthority, isbadExit, "
- + "isbaddirectory, isexit, isfast, isguard, ishsdir, "
- + "isnamed, isstable, isrunning, isunnamed, isvalid, "
- + "isv2dir, isv3dir, version, bandwidth, ports, rawdesc) "
- + "FROM stdin;\n");
- }
- this.statusentryOut.write(
- this.dateTimeFormat.format(validAfter) + "\t" + nickname
- + "\t" + fingerprint.toLowerCase() + "\t"
- + descriptor.toLowerCase() + "\t"
- + this.dateTimeFormat.format(published) + "\t" + address
- + "\t" + orPort + "\t" + dirPort + "\t"
- + (flags.contains("Authority") ? "t" : "f") + "\t"
- + (flags.contains("BadExit") ? "t" : "f") + "\t"
- + (flags.contains("BadDirectory") ? "t" : "f") + "\t"
- + (flags.contains("Exit") ? "t" : "f") + "\t"
- + (flags.contains("Fast") ? "t" : "f") + "\t"
- + (flags.contains("Guard") ? "t" : "f") + "\t"
- + (flags.contains("HSDir") ? "t" : "f") + "\t"
- + (flags.contains("Named") ? "t" : "f") + "\t"
- + (flags.contains("Stable") ? "t" : "f") + "\t"
- + (flags.contains("Running") ? "t" : "f") + "\t"
- + (flags.contains("Unnamed") ? "t" : "f") + "\t"
- + (flags.contains("Valid") ? "t" : "f") + "\t"
- + (flags.contains("V2Dir") ? "t" : "f") + "\t"
- + (flags.contains("V3Dir") ? "t" : "f") + "\t"
- + (version != null ? version : "\\N") + "\t"
- + (bandwidth >= 0 ? bandwidth : "\\N") + "\t"
- + (ports != null ? ports : "\\N") + "\t");
- this.statusentryOut.write(PGbytea.toPGString(rawDescriptor).
- replaceAll("\\\\", "\\\\\\\\") + "\n");
- } catch (SQLException e) {
- this.logger.log(Level.WARNING, "Could not write network status "
- + "consensus entry to raw database import file. We won't "
- + "make any further attempts to write raw import files in "
- + "this execution.", e);
- this.writeRawImportFiles = false;
- } catch (IOException e) {
- this.logger.log(Level.WARNING, "Could not write network status "
- + "consensus entry to raw database import file. We won't "
- + "make any further attempts to write raw import files in "
- + "this execution.", e);
- this.writeRawImportFiles = false;
- }
- }
- }
-
- /**
- * Insert server descriptor into database.
- */
- public void addServerDescriptor(String descriptor, String nickname,
- String address, int orPort, int dirPort, String relayIdentifier,
- long bandwidthAvg, long bandwidthBurst, long bandwidthObserved,
- String platform, long published, long uptime,
- String extraInfoDigest, byte[] rawDescriptor) {
- if (this.importIntoDatabase) {
- try {
- this.addDateToScheduledUpdates(published);
- this.addDateToScheduledUpdates(
- published + 24L * 60L * 60L * 1000L);
- Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- this.psDs.setString(1, descriptor);
- ResultSet rs = psDs.executeQuery();
- rs.next();
- if (rs.getInt(1) == 0) {
- this.psD.clearParameters();
- this.psD.setString(1, descriptor);
- this.psD.setString(2, nickname);
- this.psD.setString(3, address);
- this.psD.setInt(4, orPort);
- this.psD.setInt(5, dirPort);
- this.psD.setString(6, relayIdentifier);
- this.psD.setLong(7, bandwidthAvg);
- this.psD.setLong(8, bandwidthBurst);
- this.psD.setLong(9, bandwidthObserved);
- this.psD.setString(10, new String(platform.getBytes(),
- "US-ASCII"));
- this.psD.setTimestamp(11, new Timestamp(published), cal);
- this.psD.setLong(12, uptime);
- this.psD.setString(13, extraInfoDigest);
- this.psD.setBytes(14, rawDescriptor);
- this.psD.executeUpdate();
- rdsCount++;
- if (rdsCount % autoCommitCount == 0) {
- this.conn.commit();
- }
- }
- } catch (UnsupportedEncodingException e) {
- // US-ASCII is supported for sure
- } catch (SQLException e) {
- this.logger.log(Level.WARNING, "Could not add server "
- + "descriptor. We won't make any further SQL requests in "
- + "this execution.", e);
- this.importIntoDatabase = false;
- }
- }
- if (this.writeRawImportFiles) {
- try {
- if (this.descriptorOut == null) {
- new File(rawFilesDirectory).mkdirs();
- this.descriptorOut = new BufferedWriter(new FileWriter(
- rawFilesDirectory + "/descriptor.sql"));
- this.descriptorOut.write(" COPY descriptor (descriptor, "
- + "nickname, address, orport, dirport, fingerprint, "
- + "bandwidthavg, bandwidthburst, bandwidthobserved, "
- + "platform, published, uptime, extrainfo, rawdesc) FROM "
- + "stdin;\n");
- }
- this.descriptorOut.write(descriptor.toLowerCase() + "\t"
- + nickname + "\t" + address + "\t" + orPort + "\t" + dirPort
- + "\t" + relayIdentifier + "\t" + bandwidthAvg + "\t"
- + bandwidthBurst + "\t" + bandwidthObserved + "\t"
- + (platform != null && platform.length() > 0
- ? new String(platform.getBytes(), "US-ASCII") : "\\N")
- + "\t" + this.dateTimeFormat.format(published) + "\t"
- + (uptime >= 0 ? uptime : "\\N") + "\t"
- + (extraInfoDigest != null ? extraInfoDigest : "\\N")
- + "\t");
- this.descriptorOut.write(PGbytea.toPGString(rawDescriptor).
- replaceAll("\\\\", "\\\\\\\\") + "\n");
- } catch (UnsupportedEncodingException e) {
- // US-ASCII is supported for sure
- } catch (SQLException e) {
- this.logger.log(Level.WARNING, "Could not write server "
- + "descriptor to raw database import file. We won't make "
- + "any further attempts to write raw import files in this "
- + "execution.", e);
- this.writeRawImportFiles = false;
- } catch (IOException e) {
- this.logger.log(Level.WARNING, "Could not write server "
- + "descriptor to raw database import file. We won't make "
- + "any further attempts to write raw import files in this "
- + "execution.", e);
- this.writeRawImportFiles = false;
- }
- }
- }
-
- /**
- * Insert extra-info descriptor into database.
- */
- public void addExtraInfoDescriptor(String extraInfoDigest,
- String nickname, String fingerprint, long published,
- byte[] rawDescriptor, List<String> bandwidthHistoryLines) {
- if (this.importIntoDatabase) {
- try {
- Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- this.psEs.setString(1, extraInfoDigest);
- ResultSet rs = psEs.executeQuery();
- rs.next();
- if (rs.getInt(1) == 0) {
- this.psE.clearParameters();
- this.psE.setString(1, extraInfoDigest);
- this.psE.setString(2, nickname);
- this.psE.setString(3, fingerprint);
- this.psE.setTimestamp(4, new Timestamp(published), cal);
- this.psE.setBytes(5, rawDescriptor);
- this.psE.executeUpdate();
- resCount++;
- if (resCount % autoCommitCount == 0) {
- this.conn.commit();
- }
- }
- } catch (SQLException e) {
- this.logger.log(Level.WARNING, "Could not add extra-info "
- + "descriptor. We won't make any further SQL requests in "
- + "this execution.", e);
- this.importIntoDatabase = false;
- }
- }
- if (this.writeRawImportFiles) {
- try {
- if (this.extrainfoOut == null) {
- new File(rawFilesDirectory).mkdirs();
- this.extrainfoOut = new BufferedWriter(new FileWriter(
- rawFilesDirectory + "/extrainfo.sql"));
- this.extrainfoOut.write(" COPY extrainfo (extrainfo, nickname, "
- + "fingerprint, published, rawdesc) FROM stdin;\n");
- }
- this.extrainfoOut.write(extraInfoDigest.toLowerCase() + "\t"
- + nickname + "\t" + fingerprint.toLowerCase() + "\t"
- + this.dateTimeFormat.format(published) + "\t");
- this.extrainfoOut.write(PGbytea.toPGString(rawDescriptor).
- replaceAll("\\\\", "\\\\\\\\") + "\n");
- } catch (IOException e) {
- this.logger.log(Level.WARNING, "Could not write extra-info "
- + "descriptor to raw database import file. We won't make "
- + "any further attempts to write raw import files in this "
- + "execution.", e);
- this.writeRawImportFiles = false;
- } catch (SQLException e) {
- this.logger.log(Level.WARNING, "Could not write extra-info "
- + "descriptor to raw database import file. We won't make "
- + "any further attempts to write raw import files in this "
- + "execution.", e);
- this.writeRawImportFiles = false;
- }
- }
- if (!bandwidthHistoryLines.isEmpty()) {
- this.addBandwidthHistory(fingerprint.toLowerCase(), published,
- bandwidthHistoryLines);
- }
- }
-
- private static class BigIntArray implements java.sql.Array {
-
- private final String stringValue;
-
- public BigIntArray(long[] array, int offset) {
- if (array == null) {
- this.stringValue = "[-1:-1]={0}";
- } else {
- StringBuilder sb = new StringBuilder("[" + offset + ":"
- + (offset + array.length - 1) + "]={");
- for (int i = 0; i < array.length; i++) {
- sb.append((i > 0 ? "," : "") + array[i]);
- }
- sb.append('}');
- this.stringValue = sb.toString();
- }
- }
-
- public String toString() {
- return stringValue;
- }
-
- public String getBaseTypeName() {
- return "int8";
- }
-
- /* The other methods are never called; no need to implement them. */
- public void free() {
- throw new UnsupportedOperationException();
- }
- public Object getArray() {
- throw new UnsupportedOperationException();
- }
- public Object getArray(long index, int count) {
- throw new UnsupportedOperationException();
- }
- public Object getArray(long index, int count,
- Map<String, Class<?>> map) {
- throw new UnsupportedOperationException();
- }
- public Object getArray(Map<String, Class<?>> map) {
- throw new UnsupportedOperationException();
- }
- public int getBaseType() {
- throw new UnsupportedOperationException();
- }
- public ResultSet getResultSet() {
- throw new UnsupportedOperationException();
- }
- public ResultSet getResultSet(long index, int count) {
- throw new UnsupportedOperationException();
- }
- public ResultSet getResultSet(long index, int count,
- Map<String, Class<?>> map) {
- throw new UnsupportedOperationException();
- }
- public ResultSet getResultSet(Map<String, Class<?>> map) {
- throw new UnsupportedOperationException();
- }
- }
-
- public void addBandwidthHistory(String fingerprint, long published,
- List<String> bandwidthHistoryStrings) {
-
- /* Split history lines by date and rewrite them so that the date
- * comes first. */
- SortedSet<String> historyLinesByDate = new TreeSet<String>();
- for (String bandwidthHistoryString : bandwidthHistoryStrings) {
- String[] parts = bandwidthHistoryString.split(" ");
- if (parts.length != 6) {
- this.logger.finer("Bandwidth history line does not have expected "
- + "number of elements. Ignoring this line.");
- continue;
- }
- long intervalLength = 0L;
- try {
- intervalLength = Long.parseLong(parts[3].substring(1));
- } catch (NumberFormatException e) {
- this.logger.fine("Bandwidth history line does not have valid "
- + "interval length '" + parts[3] + " " + parts[4] + "'. "
- + "Ignoring this line.");
- continue;
- }
- if (intervalLength != 900L) {
- this.logger.fine("Bandwidth history line does not consist of "
- + "15-minute intervals. Ignoring this line.");
- continue;
- }
- String type = parts[0];
- String intervalEndTime = parts[1] + " " + parts[2];
- long intervalEnd, dateStart;
- try {
- intervalEnd = dateTimeFormat.parse(intervalEndTime).getTime();
- dateStart = dateTimeFormat.parse(parts[1] + " 00:00:00").
- getTime();
- } catch (ParseException e) {
- this.logger.fine("Parse exception while parsing timestamp in "
- + "bandwidth history line. Ignoring this line.");
- continue;
- }
- if (Math.abs(published - intervalEnd) >
- 7L * 24L * 60L * 60L * 1000L) {
- this.logger.fine("Extra-info descriptor publication time "
- + dateTimeFormat.format(published) + " and last interval "
- + "time " + intervalEndTime + " in " + type + " line differ "
- + "by more than 7 days! Not adding this line!");
- continue;
- }
- long currentIntervalEnd = intervalEnd;
- StringBuilder sb = new StringBuilder();
- String[] values = parts[5].split(",");
- SortedSet<String> newHistoryLines = new TreeSet<String>();
- try {
- for (int i = values.length - 1; i >= -1; i--) {
- if (i == -1 || currentIntervalEnd < dateStart) {
- sb.insert(0, intervalEndTime + " " + type + " ("
- + intervalLength + " s) ");
- sb.setLength(sb.length() - 1);
- String historyLine = sb.toString();
- newHistoryLines.add(historyLine);
- sb = new StringBuilder();
- dateStart -= 24L * 60L * 60L * 1000L;
- intervalEndTime = dateTimeFormat.format(currentIntervalEnd);
- }
- if (i == -1) {
- break;
- }
- Long.parseLong(values[i]);
- sb.insert(0, values[i] + ",");
- currentIntervalEnd -= intervalLength * 1000L;
- }
- } catch (NumberFormatException e) {
- this.logger.fine("Number format exception while parsing "
- + "bandwidth history line. Ignoring this line.");
- continue;
- }
- historyLinesByDate.addAll(newHistoryLines);
- }
-
- /* Add split history lines to database. */
- String lastDate = null;
- historyLinesByDate.add("EOL");
- long[] readArray = null, writtenArray = null, dirreadArray = null,
- dirwrittenArray = null;
- int readOffset = 0, writtenOffset = 0, dirreadOffset = 0,
- dirwrittenOffset = 0;
- for (String historyLine : historyLinesByDate) {
- String[] parts = historyLine.split(" ");
- String currentDate = parts[0];
- if (lastDate != null && (historyLine.equals("EOL") ||
- !currentDate.equals(lastDate))) {
- BigIntArray readIntArray = new BigIntArray(readArray,
- readOffset);
- BigIntArray writtenIntArray = new BigIntArray(writtenArray,
- writtenOffset);
- BigIntArray dirreadIntArray = new BigIntArray(dirreadArray,
- dirreadOffset);
- BigIntArray dirwrittenIntArray = new BigIntArray(dirwrittenArray,
- dirwrittenOffset);
- if (this.importIntoDatabase) {
- try {
- long dateMillis = dateTimeFormat.parse(lastDate
- + " 00:00:00").getTime();
- this.addDateToScheduledUpdates(dateMillis);
- this.csH.setString(1, fingerprint);
- this.csH.setDate(2, new java.sql.Date(dateMillis));
- this.csH.setArray(3, readIntArray);
- this.csH.setArray(4, writtenIntArray);
- this.csH.setArray(5, dirreadIntArray);
- this.csH.setArray(6, dirwrittenIntArray);
- this.csH.addBatch();
- rhsCount++;
- if (rhsCount % autoCommitCount == 0) {
- this.csH.executeBatch();
- }
- } catch (SQLException e) {
- this.logger.log(Level.WARNING, "Could not insert bandwidth "
- + "history line into database. We won't make any "
- + "further SQL requests in this execution.", e);
- this.importIntoDatabase = false;
- } catch (ParseException e) {
- this.logger.log(Level.WARNING, "Could not insert bandwidth "
- + "history line into database. We won't make any "
- + "further SQL requests in this execution.", e);
- this.importIntoDatabase = false;
- }
- }
- if (this.writeRawImportFiles) {
- try {
- if (this.bwhistOut == null) {
- new File(rawFilesDirectory).mkdirs();
- this.bwhistOut = new BufferedWriter(new FileWriter(
- rawFilesDirectory + "/bwhist.sql"));
- }
- this.bwhistOut.write("SELECT insert_bwhist('" + fingerprint
- + "','" + lastDate + "','" + readIntArray.toString()
- + "','" + writtenIntArray.toString() + "','"
- + dirreadIntArray.toString() + "','"
- + dirwrittenIntArray.toString() + "');\n");
- } catch (IOException e) {
- this.logger.log(Level.WARNING, "Could not write bandwidth "
- + "history to raw database import file. We won't make "
- + "any further attempts to write raw import files in "
- + "this execution.", e);
- this.writeRawImportFiles = false;
- }
- }
- readArray = writtenArray = dirreadArray = dirwrittenArray = null;
- }
- if (historyLine.equals("EOL")) {
- break;
- }
- long lastIntervalTime;
- try {
- lastIntervalTime = dateTimeFormat.parse(parts[0] + " "
- + parts[1]).getTime() - dateTimeFormat.parse(parts[0]
- + " 00:00:00").getTime();
- } catch (ParseException e) {
- continue;
- }
- String[] stringValues = parts[5].split(",");
- long[] longValues = new long[stringValues.length];
- for (int i = 0; i < longValues.length; i++) {
- longValues[i] = Long.parseLong(stringValues[i]);
- }
-
- int offset = (int) (lastIntervalTime / (15L * 60L * 1000L))
- - longValues.length + 1;
- String type = parts[2];
- if (type.equals("read-history")) {
- readArray = longValues;
- readOffset = offset;
- } else if (type.equals("write-history")) {
- writtenArray = longValues;
- writtenOffset = offset;
- } else if (type.equals("dirreq-read-history")) {
- dirreadArray = longValues;
- dirreadOffset = offset;
- } else if (type.equals("dirreq-write-history")) {
- dirwrittenArray = longValues;
- dirwrittenOffset = offset;
- }
- lastDate = currentDate;
- }
- }
-
- /**
- * Insert network status consensus into database.
- */
- public void addConsensus(long validAfter, byte[] rawDescriptor) {
- if (this.importIntoDatabase) {
- try {
- this.addDateToScheduledUpdates(validAfter);
- Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- Timestamp validAfterTimestamp = new Timestamp(validAfter);
- this.psCs.setTimestamp(1, validAfterTimestamp, cal);
- ResultSet rs = psCs.executeQuery();
- rs.next();
- if (rs.getInt(1) == 0) {
- this.psC.clearParameters();
- this.psC.setTimestamp(1, validAfterTimestamp, cal);
- this.psC.setBytes(2, rawDescriptor);
- this.psC.executeUpdate();
- rcsCount++;
- if (rcsCount % autoCommitCount == 0) {
- this.conn.commit();
- }
- }
- } catch (SQLException e) {
- this.logger.log(Level.WARNING, "Could not add network status "
- + "consensus. We won't make any further SQL requests in "
- + "this execution.", e);
- this.importIntoDatabase = false;
- }
- }
- if (this.writeRawImportFiles) {
- try {
- if (this.consensusOut == null) {
- new File(rawFilesDirectory).mkdirs();
- this.consensusOut = new BufferedWriter(new FileWriter(
- rawFilesDirectory + "/consensus.sql"));
- this.consensusOut.write(" COPY consensus (validafter, rawdesc) "
- + "FROM stdin;\n");
- }
- String validAfterString = this.dateTimeFormat.format(validAfter);
- this.consensusOut.write(validAfterString + "\t");
- this.consensusOut.write(PGbytea.toPGString(rawDescriptor).
- replaceAll("\\\\", "\\\\\\\\") + "\n");
- } catch (SQLException e) {
- this.logger.log(Level.WARNING, "Could not write network status "
- + "consensus to raw database import file. We won't make "
- + "any further attempts to write raw import files in this "
- + "execution.", e);
- this.writeRawImportFiles = false;
- } catch (IOException e) {
- this.logger.log(Level.WARNING, "Could not write network status "
- + "consensus to raw database import file. We won't make "
- + "any further attempts to write raw import files in this "
- + "execution.", e);
- this.writeRawImportFiles = false;
- }
- }
- }
-
- /**
- * Insert network status vote into database.
- */
- public void addVote(long validAfter, String dirSource,
- byte[] rawDescriptor) {
- if (this.importIntoDatabase) {
- try {
- Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- Timestamp validAfterTimestamp = new Timestamp(validAfter);
- this.psVs.setTimestamp(1, validAfterTimestamp, cal);
- this.psVs.setString(2, dirSource);
- ResultSet rs = psVs.executeQuery();
- rs.next();
- if (rs.getInt(1) == 0) {
- this.psV.clearParameters();
- this.psV.setTimestamp(1, validAfterTimestamp, cal);
- this.psV.setString(2, dirSource);
- this.psV.setBytes(3, rawDescriptor);
- this.psV.executeUpdate();
- rvsCount++;
- if (rvsCount % autoCommitCount == 0) {
- this.conn.commit();
- }
- }
- } catch (SQLException e) {
- this.logger.log(Level.WARNING, "Could not add network status "
- + "vote. We won't make any further SQL requests in this "
- + "execution.", e);
- this.importIntoDatabase = false;
- }
- }
- if (this.writeRawImportFiles) {
- try {
- if (this.voteOut == null) {
- new File(rawFilesDirectory).mkdirs();
- this.voteOut = new BufferedWriter(new FileWriter(
- rawFilesDirectory + "/vote.sql"));
- this.voteOut.write(" COPY vote (validafter, dirsource, "
- + "rawdesc) FROM stdin;\n");
- }
- String validAfterString = this.dateTimeFormat.format(validAfter);
- this.voteOut.write(validAfterString + "\t" + dirSource + "\t");
- this.voteOut.write(PGbytea.toPGString(rawDescriptor).
- replaceAll("\\\\", "\\\\\\\\") + "\n");
- } catch (SQLException e) {
- this.logger.log(Level.WARNING, "Could not write network status "
- + "vote to raw database import file. We won't make any "
- + "further attempts to write raw import files in this "
- + "execution.", e);
- this.writeRawImportFiles = false;
- } catch (IOException e) {
- this.logger.log(Level.WARNING, "Could not write network status "
- + "vote to raw database import file. We won't make any "
- + "further attempts to write raw import files in this "
- + "execution.", e);
- this.writeRawImportFiles = false;
- }
- }
- }
-
- /**
- * Insert a conn-bi-direct stats string into the database.
- */
- public void addConnBiDirect(String source, String statsEnd,
- long seconds, long below, long read, long write, long both) {
- long statsEndTime = 0L;
- try {
- statsEndTime = this.dateTimeFormat.parse(statsEnd).getTime();
- } catch (ParseException e) {
- this.logger.log(Level.WARNING, "Could not add conn-bi-direct "
- + "stats string with interval ending '" + statsEnd + "'.", e);
- return;
- }
- if (this.importIntoDatabase) {
- try {
- this.addDateToScheduledUpdates(statsEndTime);
- Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- Timestamp statsEndTimestamp = new Timestamp(statsEndTime);
- this.psBs.setString(1, source);
- this.psBs.setTimestamp(2, statsEndTimestamp, cal);
- ResultSet rs = psBs.executeQuery();
- rs.next();
- if (rs.getInt(1) == 0) {
- this.psB.clearParameters();
- this.psB.setString(1, source);
- this.psB.setTimestamp(2, statsEndTimestamp, cal);
- this.psB.setLong(3, seconds);
- this.psB.setLong(4, below);
- this.psB.setLong(5, read);
- this.psB.setLong(6, write);
- this.psB.setLong(7, both);
- this.psB.executeUpdate();
- rbsCount++;
- if (rbsCount % autoCommitCount == 0) {
- this.conn.commit();
- }
- }
- } catch (SQLException e) {
- this.logger.log(Level.WARNING, "Could not add conn-bi-direct "
- + "stats string. We won't make any further SQL requests in "
- + "this execution.", e);
- this.importIntoDatabase = false;
- }
- }
- if (this.writeRawImportFiles) {
- try {
- if (this.connBiDirectOut == null) {
- new File(rawFilesDirectory).mkdirs();
- this.connBiDirectOut = new BufferedWriter(new FileWriter(
- rawFilesDirectory + "/connbidirect.sql"));
- this.connBiDirectOut.write(" COPY connbidirect (source, "
- + "statsend, seconds, belownum, readnum, writenum, "
- + "bothnum) FROM stdin;\n");
- }
- this.connBiDirectOut.write(source + "\t" + statsEnd + "\t"
- + seconds + "\t" + below + "\t" + read + "\t" + write + "\t"
- + both + "\n");
- } catch (IOException e) {
- this.logger.log(Level.WARNING, "Could not write conn-bi-direct "
- + "stats string to raw database import file. We won't make "
- + "any further attempts to write raw import files in this "
- + "execution.", e);
- this.writeRawImportFiles = false;
- }
- }
- }
-
- /**
- * Adds observations on the number of directory requests by country as
- * seen on a directory at a given date to the database.
- */
- public void addDirReqStats(String source, String statsEnd, long seconds,
- Map<String, String> dirReqsPerCountry) {
- long statsEndTime = 0L;
- try {
- statsEndTime = this.dateTimeFormat.parse(statsEnd).getTime();
- } catch (ParseException e) {
- this.logger.log(Level.WARNING, "Could not add dirreq stats with "
- + "interval ending '" + statsEnd + "'.", e);
- return;
- }
- if (this.importIntoDatabase) {
- try {
- this.addDateToScheduledUpdates(statsEndTime);
- Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- Timestamp statsEndTimestamp = new Timestamp(statsEndTime);
- this.psQs.setString(1, source);
- this.psQs.setTimestamp(2, statsEndTimestamp, cal);
- ResultSet rs = psQs.executeQuery();
- rs.next();
- if (rs.getInt(1) == 0) {
- for (Map.Entry<String, String> e :
- dirReqsPerCountry.entrySet()) {
- this.psQ.clearParameters();
- this.psQ.setString(1, source);
- this.psQ.setTimestamp(2, statsEndTimestamp, cal);
- this.psQ.setLong(3, seconds);
- this.psQ.setString(4, e.getKey());
- this.psQ.setLong(5, Long.parseLong(e.getValue()));
- this.psQ.executeUpdate();
- rqsCount++;
- if (rqsCount % autoCommitCount == 0) {
- this.conn.commit();
- }
- }
- }
- } catch (SQLException e) {
- this.logger.log(Level.WARNING, "Could not add dirreq stats. We "
- + "won't make any further SQL requests in this execution.",
- e);
- this.importIntoDatabase = false;
- }
- }
- if (this.writeRawImportFiles) {
- try {
- if (this.dirReqOut == null) {
- new File(rawFilesDirectory).mkdirs();
- this.dirReqOut = new BufferedWriter(new FileWriter(
- rawFilesDirectory + "/dirreq_stats.sql"));
- this.dirReqOut.write(" COPY dirreq_stats (source, statsend, "
- + "seconds, country, requests) FROM stdin;\n");
- }
- for (Map.Entry<String, String> e :
- dirReqsPerCountry.entrySet()) {
- this.dirReqOut.write(source + "\t" + statsEnd + "\t" + seconds
- + "\t" + e.getKey() + "\t" + e.getValue() + "\n");
- }
- } catch (IOException e) {
- this.logger.log(Level.WARNING, "Could not write dirreq stats to "
- + "raw database import file. We won't make any further "
- + "attempts to write raw import files in this execution.", e);
- this.writeRawImportFiles = false;
- }
- }
- }
-
- /**
- * Close the relay descriptor database connection.
- */
- public void closeConnection() {
-
- /* Log stats about imported descriptors. */
- this.logger.info(String.format("Finished importing relay "
- + "descriptors: %d consensuses, %d network status entries, %d "
- + "votes, %d server descriptors, %d extra-info descriptors, %d "
- + "bandwidth history elements, %d dirreq stats elements, and %d "
- + "conn-bi-direct stats lines", rcsCount, rrsCount, rvsCount,
- rdsCount, resCount, rhsCount, rqsCount, rbsCount));
-
- /* Insert scheduled updates a second time, just in case the refresh
- * run has started since inserting them the first time in which case
- * it will miss the data inserted afterwards. We cannot, however,
- * insert them only now, because if a Java execution fails at a random
- * point, we might have added data, but not the corresponding dates to
- * update statistics. */
- if (this.importIntoDatabase) {
- try {
- for (long dateMillis : this.scheduledUpdates) {
- this.psU.setDate(1, new java.sql.Date(dateMillis));
- this.psU.execute();
- }
- } catch (SQLException e) {
- this.logger.log(Level.WARNING, "Could not add scheduled dates "
- + "for the next refresh run.", e);
- }
- }
-
- /* Commit any stragglers before closing. */
- if (this.conn != null) {
- try {
- this.csH.executeBatch();
-
- this.conn.commit();
- } catch (SQLException e) {
- this.logger.log(Level.WARNING, "Could not commit final records to "
- + "database", e);
- }
- try {
- this.conn.close();
- } catch (SQLException e) {
- this.logger.log(Level.WARNING, "Could not close database "
- + "connection.", e);
- }
- }
-
- /* Close raw import files. */
- try {
- if (this.statusentryOut != null) {
- this.statusentryOut.write("\\.\n");
- this.statusentryOut.close();
- }
- if (this.descriptorOut != null) {
- this.descriptorOut.write("\\.\n");
- this.descriptorOut.close();
- }
- if (this.extrainfoOut != null) {
- this.extrainfoOut.write("\\.\n");
- this.extrainfoOut.close();
- }
- if (this.bwhistOut != null) {
- this.bwhistOut.write("\\.\n");
- this.bwhistOut.close();
- }
- if (this.consensusOut != null) {
- this.consensusOut.write("\\.\n");
- this.consensusOut.close();
- }
- if (this.voteOut != null) {
- this.voteOut.write("\\.\n");
- this.voteOut.close();
- }
- if (this.connBiDirectOut != null) {
- this.connBiDirectOut.write("\\.\n");
- this.connBiDirectOut.close();
- }
- } catch (IOException e) {
- this.logger.log(Level.WARNING, "Could not close one or more raw "
- + "database import files.", e);
- }
- }
-}
-
diff --git a/src/org/torproject/ernie/db/RelayDescriptorParser.java b/src/org/torproject/ernie/db/RelayDescriptorParser.java
index e94b55b..fcfc0eb 100644
--- a/src/org/torproject/ernie/db/RelayDescriptorParser.java
+++ b/src/org/torproject/ernie/db/RelayDescriptorParser.java
@@ -35,12 +35,6 @@ public class RelayDescriptorParser {
private RelayDescriptorDownloader rdd;
/**
- * Relay descriptor database importer that stores relay descriptor
- * contents for later evaluation.
- */
- private RelayDescriptorDatabaseImporter rddi;
-
- /**
* Logger for this class.
*/
private Logger logger;
@@ -51,10 +45,9 @@ public class RelayDescriptorParser {
* Initializes this class.
*/
public RelayDescriptorParser(BridgeStatsFileHandler bsfh,
- ArchiveWriter aw, RelayDescriptorDatabaseImporter rddi) {
+ ArchiveWriter aw) {
this.bsfh = bsfh;
this.aw = aw;
- this.rddi = rddi;
/* Initialize logger. */
this.logger = Logger.getLogger(RelayDescriptorParser.class.getName());
@@ -89,18 +82,12 @@ public class RelayDescriptorParser {
// time to see when we switch from hourly to half-hourly
// consensuses
boolean isConsensus = true;
- int exit = 0, fast = 0, guard = 0, running = 0, stable = 0;
- String validAfterTime = null, nickname = null,
- relayIdentity = null, serverDesc = null, version = null,
- ports = null;
- String fingerprint = null, dirSource = null, address = null;
- long validAfter = -1L, published = -1L, bandwidth = -1L,
- orPort = 0L, dirPort = 0L;
+ String validAfterTime = null, fingerprint = null,
+ dirSource = null;
+ long validAfter = -1L;
SortedSet<String> dirSources = new TreeSet<String>();
SortedSet<String> serverDescriptors = new TreeSet<String>();
SortedSet<String> hashedRelayIdentities = new TreeSet<String>();
- SortedSet<String> relayFlags = null;
- StringBuilder rawStatusEntry = null;
while ((line = br.readLine()) != null) {
if (line.equals("vote-status vote")) {
isConsensus = false;
@@ -114,19 +101,6 @@ public class RelayDescriptorParser {
} else if (line.startsWith("fingerprint ")) {
fingerprint = line.split(" ")[1];
} else if (line.startsWith("r ")) {
- if (isConsensus && relayIdentity != null &&
- this.rddi != null) {
- byte[] rawDescriptor = rawStatusEntry.toString().getBytes();
- this.rddi.addStatusEntry(validAfter, nickname,
- relayIdentity, serverDesc, published, address, orPort,
- dirPort, relayFlags, version, bandwidth, ports,
- rawDescriptor);
- relayFlags = null;
- version = null;
- bandwidth = -1L;
- ports = null;
- }
- rawStatusEntry = new StringBuilder(line + "\n");
String[] parts = line.split(" ");
if (parts.length < 9) {
this.logger.log(Level.WARNING, "Could not parse r line '"
@@ -134,65 +108,19 @@ public class RelayDescriptorParser {
break;
}
String publishedTime = parts[4] + " " + parts[5];
- nickname = parts[1];
- relayIdentity = Hex.encodeHexString(
+ String relayIdentity = Hex.encodeHexString(
Base64.decodeBase64(parts[2] + "=")).
toLowerCase();
- serverDesc = Hex.encodeHexString(Base64.decodeBase64(
+ String serverDesc = Hex.encodeHexString(Base64.decodeBase64(
parts[3] + "=")).toLowerCase();
serverDescriptors.add(publishedTime + "," + relayIdentity
+ "," + serverDesc);
hashedRelayIdentities.add(DigestUtils.shaHex(
Base64.decodeBase64(parts[2] + "=")).
toUpperCase());
- published = parseFormat.parse(parts[4] + " " + parts[5]).
- getTime();
- address = parts[6];
- orPort = Long.parseLong(parts[7]);
- dirPort = Long.parseLong(parts[8]);
- } else if (line.startsWith("s ") || line.equals("s")) {
- rawStatusEntry.append(line + "\n");
- if (line.contains(" Running")) {
- exit += line.contains(" Exit") ? 1 : 0;
- fast += line.contains(" Fast") ? 1 : 0;
- guard += line.contains(" Guard") ? 1 : 0;
- stable += line.contains(" Stable") ? 1 : 0;
- running++;
- }
- relayFlags = new TreeSet<String>();
- if (line.length() > 2) {
- for (String flag : line.substring(2).split(" ")) {
- relayFlags.add(flag);
- }
- }
- } else if (line.startsWith("v ")) {
- rawStatusEntry.append(line + "\n");
- version = line.substring(2);
- } else if (line.startsWith("w ")) {
- rawStatusEntry.append(line + "\n");
- String[] parts = line.split(" ");
- for (String part : parts) {
- if (part.startsWith("Bandwidth=")) {
- bandwidth = Long.parseLong(part.substring(
- "Bandwidth=".length()));
- }
- }
- } else if (line.startsWith("p ")) {
- rawStatusEntry.append(line + "\n");
- ports = line.substring(2);
}
}
if (isConsensus) {
- if (this.rddi != null) {
- this.rddi.addConsensus(validAfter, data);
- if (relayIdentity != null) {
- byte[] rawDescriptor = rawStatusEntry.toString().getBytes();
- this.rddi.addStatusEntry(validAfter, nickname,
- relayIdentity, serverDesc, published, address, orPort,
- dirPort, relayFlags, version, bandwidth, ports,
- rawDescriptor);
- }
- }
if (this.bsfh != null) {
for (String hashedRelayIdentity : hashedRelayIdentities) {
this.bsfh.addHashedRelay(hashedRelayIdentity);
@@ -206,9 +134,6 @@ public class RelayDescriptorParser {
this.aw.storeConsensus(data, validAfter);
}
} else {
- if (this.rddi != null) {
- this.rddi.addVote(validAfter, dirSource, data);
- }
if (this.rdd != null) {
this.rdd.haveParsedVote(validAfterTime, fingerprint,
serverDescriptors);
@@ -231,19 +156,16 @@ public class RelayDescriptorParser {
}
}
} else if (line.startsWith("router ")) {
- String platformLine = null, publishedLine = null,
- publishedTime = null, bandwidthLine = null,
+ String publishedLine = null, publishedTime = null,
extraInfoDigest = null, relayIdentifier = null;
String[] parts = line.split(" ");
String nickname = parts[1];
String address = parts[2];
int orPort = Integer.parseInt(parts[3]);
int dirPort = Integer.parseInt(parts[4]);
- long published = -1L, uptime = -1L;
+ long published = -1L;
while ((line = br.readLine()) != null) {
- if (line.startsWith("platform ")) {
- platformLine = line;
- } else if (line.startsWith("published ")) {
+ if (line.startsWith("published ")) {
publishedTime = line.substring("published ".length());
published = parseFormat.parse(publishedTime).getTime();
} else if (line.startsWith("opt fingerprint") ||
@@ -251,15 +173,11 @@ public class RelayDescriptorParser {
relayIdentifier = line.substring(line.startsWith("opt ") ?
"opt fingerprint".length() : "fingerprint".length()).
replaceAll(" ", "").toLowerCase();
- } else if (line.startsWith("bandwidth ")) {
- bandwidthLine = line;
} else if (line.startsWith("opt extra-info-digest ") ||
line.startsWith("extra-info-digest ")) {
extraInfoDigest = line.startsWith("opt ") ?
line.split(" ")[2].toLowerCase() :
line.split(" ")[1].toLowerCase();
- } else if (line.startsWith("uptime ")) {
- uptime = Long.parseLong(line.substring("uptime ".length()));
}
}
String ascii = new String(data, "US-ASCII");
@@ -280,93 +198,14 @@ public class RelayDescriptorParser {
this.rdd.haveParsedServerDescriptor(publishedTime,
relayIdentifier, digest, extraInfoDigest);
}
- if (this.rddi != null && digest != null) {
- String[] bwParts = bandwidthLine.split(" ");
- long bandwidthAvg = Long.parseLong(bwParts[1]);
- long bandwidthBurst = Long.parseLong(bwParts[2]);
- long bandwidthObserved = Long.parseLong(bwParts[3]);
- String platform = platformLine.substring("platform ".length());
- this.rddi.addServerDescriptor(digest, nickname, address, orPort,
- dirPort, relayIdentifier, bandwidthAvg, bandwidthBurst,
- bandwidthObserved, platform, published, uptime,
- extraInfoDigest, data);
- }
} else if (line.startsWith("extra-info ")) {
- String nickname = line.split(" ")[1];
String publishedTime = null, relayIdentifier = line.split(" ")[2];
long published = -1L;
- String dir = line.split(" ")[2];
- String statsEnd = null;
- long seconds = -1L;
- List<String> bandwidthHistory = new ArrayList<String>();
boolean skip = false;
while ((line = br.readLine()) != null) {
if (line.startsWith("published ")) {
publishedTime = line.substring("published ".length());
published = parseFormat.parse(publishedTime).getTime();
- } else if (line.startsWith("read-history ") ||
- line.startsWith("write-history ") ||
- line.startsWith("dirreq-read-history ") ||
- line.startsWith("dirreq-write-history ")) {
- bandwidthHistory.add(line);
- } else if (line.startsWith("dirreq-stats-end ")) {
- String[] parts = line.split(" ");
- if (parts.length < 5) {
- this.logger.warning("Could not parse dirreq-stats-end "
- + "line '" + line + "' in descriptor. Skipping.");
- break;
- }
- statsEnd = parts[1] + " " + parts[2];
- seconds = Long.parseLong(parts[3].substring(1));
- } else if (line.startsWith("dirreq-v3-reqs ")
- && line.length() > "dirreq-v3-reqs ".length()) {
- if (this.rddi != null) {
- try {
- int allUsers = 0;
- Map<String, String> obs = new HashMap<String, String>();
- String[] parts = line.substring("dirreq-v3-reqs ".
- length()).split(",");
- for (String p : parts) {
- String country = p.substring(0, 2);
- int users = Integer.parseInt(p.substring(3)) - 4;
- allUsers += users;
- obs.put(country, "" + users);
- }
- obs.put("zy", "" + allUsers);
- this.rddi.addDirReqStats(dir, statsEnd, seconds, obs);
- } catch (NumberFormatException e) {
- this.logger.log(Level.WARNING, "Could not parse "
- + "dirreq-v3-reqs line '" + line + "' in descriptor. "
- + "Skipping.", e);
- break;
- }
- }
- } else if (line.startsWith("conn-bi-direct ")) {
- if (this.rddi != null) {
- String[] parts = line.split(" ");
- if (parts.length == 6 &&
- parts[5].split(",").length == 4) {
- try {
- String connBiDirectStatsEnd = parts[1] + " " + parts[2];
- long connBiDirectSeconds = Long.parseLong(parts[3].
- substring(1));
- String[] parts2 = parts[5].split(",");
- long below = Long.parseLong(parts2[0]);
- long read = Long.parseLong(parts2[1]);
- long write = Long.parseLong(parts2[2]);
- long both = Long.parseLong(parts2[3]);
- this.rddi.addConnBiDirect(dir, connBiDirectStatsEnd,
- connBiDirectSeconds, below, read, write, both);
- } catch (NumberFormatException e) {
- this.logger.log(Level.WARNING, "Number format "
- + "exception while parsing conn-bi-direct stats "
- + "string '" + line + "'. Skipping.", e);
- }
- } else {
- this.logger.warning("Skipping invalid conn-bi-direct "
- + "stats string '" + line + "'.");
- }
- }
}
}
String ascii = new String(data, "US-ASCII");
@@ -387,10 +226,6 @@ public class RelayDescriptorParser {
this.rdd.haveParsedExtraInfoDescriptor(publishedTime,
relayIdentifier.toLowerCase(), digest);
}
- if (this.rddi != null && digest != null) {
- this.rddi.addExtraInfoDescriptor(digest, nickname,
- dir.toLowerCase(), published, data, bandwidthHistory);
- }
}
} catch (IOException e) {
this.logger.log(Level.WARNING, "Could not parse descriptor. "
@@ -401,3 +236,4 @@ public class RelayDescriptorParser {
}
}
}
+
1
0
r24286: {projects} translation xml files for orbot (in projects/android/trunk/Orbot: . res res/values-ar res/values-ca res/values-de res/values-es res/values-fa res/values-nl res/values-pl res/values-ru res/values-zh)
by Runa Sandvik 02 Mar '11
by Runa Sandvik 02 Mar '11
02 Mar '11
Author: runa
Date: 2011-03-02 15:26:23 +0000 (Wed, 02 Mar 2011)
New Revision: 24286
Added:
projects/android/trunk/Orbot/res/values-ca/
projects/android/trunk/Orbot/res/values-ca/strings.xml
Modified:
projects/android/trunk/Orbot/po2xml.sh
projects/android/trunk/Orbot/res/values-ar/strings.xml
projects/android/trunk/Orbot/res/values-de/strings.xml
projects/android/trunk/Orbot/res/values-es/strings.xml
projects/android/trunk/Orbot/res/values-fa/strings.xml
projects/android/trunk/Orbot/res/values-nl/strings.xml
projects/android/trunk/Orbot/res/values-pl/strings.xml
projects/android/trunk/Orbot/res/values-ru/strings.xml
projects/android/trunk/Orbot/res/values-zh/strings.xml
Log:
translation xml files for orbot
Modified: projects/android/trunk/Orbot/po2xml.sh
===================================================================
--- projects/android/trunk/Orbot/po2xml.sh 2011-03-01 17:06:10 UTC (rev 24285)
+++ projects/android/trunk/Orbot/po2xml.sh 2011-03-02 15:26:23 UTC (rev 24286)
@@ -15,12 +15,12 @@
# Location of the translated files, i.e. the path to the orbot
# directory in the translation module. Do not add the trailing slash.
-translated=""
+translated="/home/runa/tor/translation/projects/orbot"
# Location of the orbot directory, i.e. the original English xml file.
# In svn, this should be svn/projects/android/trunk/Orbot/res. Do not add the
# trailing slash.
-xml=""
+xml="/home/runa/tor/orbot/res"
### End config ###
@@ -37,7 +37,8 @@
xmlfile="${pofile%.*}.xml"
# Figure out which language we are dealing with.
- lang=`dirname $file | sed "s#$translated/##"`
+ dir=`dirname $file | sed "s#$translated/##"`
+ lang=`basename $dir`
# The translated document is written if 80% or more of the po
# file has been translated. Also, po4a-translate will only write
Modified: projects/android/trunk/Orbot/res/values-ar/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-ar/strings.xml 2011-03-01 17:06:10 UTC (rev 24285)
+++ projects/android/trunk/Orbot/res/values-ar/strings.xml 2011-03-02 15:26:23 UTC (rev 24286)
@@ -50,6 +50,13 @@
<string name="pref_transparent_all_title">تور كل شيء</string>
<string name="pref_transparent_all_summary">حركة مرور الوكيل لجميع التطبيقات عبر تور</string>
+<string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
+<string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
+
+<string name="pref_transparent_port_title">Port List</string>
+<string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
+<string name="pref_transparent_port_dialog">Enter ports to proxy</string>
+
<string name="status_install_success">تم تثبيت ثنائيات تور بنجاح!</string>
<string name="status_install_fail">غير قادر على تثبيت ملفات ثنائيات تور. يرجى التحقق من السجل وإعلامنا على البريد الإلكتروني tor-assistants(a)torproject.org</string>
Added: projects/android/trunk/Orbot/res/values-ca/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-ca/strings.xml (rev 0)
+++ projects/android/trunk/Orbot/res/values-ca/strings.xml 2011-03-02 15:26:23 UTC (rev 24286)
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="app_name">Orbot</string>
+ <string name="app_version">1.0.4</string>
+
+ <string name="internal_web_url">http://orbot/</string>
+ <string name="default_web_url">http://check.torproject.org</string>
+ <string name="secure_default_web_url">https://check.torproject.org</string>
+ <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+ <string name="control_permission_label">Engega o atura Tor</string>
+ <string name="tor_proxy_service_process">torproxyservice</string>
+
+<string name="status_starting_up">Orbot s\'està iniciant...</string>
+<string name="status_activated">Connectat a la xarxa Tor</string>
+<string name="status_disabled">Orbot està desactivat</string>
+<string name="status_shutting_down">Orbot s\'està aturant</string>
+
+<string name="tor_process_connecting">Iniciant Tor...</string>
+<string name="tor_process_connecting_step2">Preparant el control...</string>
+<string name="tor_process_connecting_step3">acomplert.</string>
+<string name="tor_process_connecting_step4">esperant.</string>
+
+<string name="not_anonymous_yet">ATENCIÓ : El trànsit de la teva connexió ja no es anònim! Siusplau, configura les teves aplicacions per a usar HTTP proxy 127.0.0.1:8118, per SOCKS4A o SOCKS5 proxy 127.0.0.1:9050</string>
+<string name="menu_home">Lloc d\'inici</string>
+<string name="menu_browse">Navega</string>
+<string name="menu_settings">Preferències</string>
+<string name="menu_log">Registre</string>
+<string name="menu_info">Ajut</string>
+<string name="menu_apps">Aplicacions</string>
+<string name="menu_start">Inici</string>
+<string name="menu_stop">Atura</string>
+
+
+<string name="button_help">Ajut</string>
+<string name="button_close">Tanca</string>
+<string name="button_about">Quant a...</string>
+
+<string name="button_clear_log">Esborra el registre</string>
+
+
+<string name="menu_verify">Prova</string>
+<string name="menu_exit">Surt</string>
+<string name="powered_by">Funciona gràcies al Projecte Tor</string>
+<string name="press_to_start">- prem per a iniciar -</string>
+
+<string name="pref_trans_proxy_group">Utilitza un proxy transparent (requereix accés)</string>
+<string name="pref_trans_proxy_title">Utilitza un proxy transparent</string>
+<string name="pref_trans_proxy_summary">Automatitza Tor per a les aplicacions</string>
+
+<string name="pref_transparent_all_title">Automatitza Tor per a tot</string>
+<string name="pref_transparent_all_summary">Canalitza tot el trànsit de proxy de les aplicacions per Tor</string>
+
+<string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
+<string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
+
+<string name="pref_transparent_port_title">Port List</string>
+<string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
+<string name="pref_transparent_port_dialog">Enter ports to proxy</string>
+
+<string name="status_install_success">Binaris de Tor instal·lats correctament!</string>
+<string name="status_install_fail">Els fitxers binaris de Tor no s\'han pogut instalar. Per favor, comprova el registre i notifica-ho a tor-assistants(a)torproject.org</string>
+
+<string name="title_error">Error de l\'aplicació</string>
+
+<string name="wizard_title">Benvingut/da a Orbot</string>
+
+<string name="wizard_btn_tell_me_more">Quant a Orbot...</string>
+<string name="btn_next">Següent</string>
+<string name="btn_back">Enrere</string>
+<string name="btn_finish">Fi</string>
+
+<string name="btn_okay">D\'acord</string>
+<string name="btn_cancel">Cancel·la</string>
+
+
+<!-- Welcome Wizard strings (DJH) -->
+
+ <string name="wizard_welcome_msg">Orbot et porta Tor a l\'Android. Tor és programari lliure i una xarxa oberta que t\'ajuda a defensar-te d\'una vigilància a través de la xarxa, amenaçant la teva privacitat i llibertat personal, informació confidencial, activitats i relacions, i seguretat estatal coneguda com anàlisi de trànsit.
+
+*ALERTA:* Instal·lar Orbot _no_ convertirà la teva connexió en anònima instantàniament! Aquest assistent t\'ajudarà a començar.</string>
+ <string name="wizard_details">Alguns detalls d\'Orbot...</string>
+ <string name="wizard_details_msg">Orbot és una aplicació de codi lliure que conté Tor, LibEvent i Privoxy. Proporciona un Proxy HTTP local (8118) i un proxy SOCKS (9050) a la xarxa Tor. Orbot també té capacitat d\'enviar tot el trànsit de dades d\'internet a través de Tor.</string>
+ <string name="wizard_permissions_root">Permís concedit</string>
+ <string name="wizard_permissions_stock">Permisos d\'Orbot</string>
+ <string name="wizard_premissions_msg_root">Perfecte! Hem detectat que tens els permisos matriu activats per a Orbot. Utilitzarem aquest poder sàviament.</string>
+ <string name="wizard_permissions_msg_stock">Encara que no és imprescindible, Orbot pot esdevenir una eina molt més potent si el teu terminal té accés complet. Utilitza el botó d\'aquí sota per conferir superpoders a Orbot!</string>
+
+ <string name="wizard_permissions_no_root">Si no tens accés complet, o no tens ni idea del què t\'estem parlant, simplement assegura\'t d\'utilitzar aplicacions fetes per a funcionar amb Orbot.</string>
+ <string name="wizard_permissions_consent">Ho entenc i vull continuar sense accés complet.</string>
+
+ <string name="wizard_permission_enable_root">Concedeix accés complet a Orbot</string>
+ <string name="wizard_configure">Configura la connexió a Tor</string>
+ <string name="wizard_configure_msg">Orbot t\'ofereix l\'opció de conduir el trànsit de totes les aplicacions per Tor o bé escollir quines aplicacions vols utilitzar amb Tor.</string>
+ <string name="wizard_configure_all">Connecta totes les aplicacions per Proxy per Tor.</string>
+ <string name="wizard_configure_select_apps">Selecciona aplicacions individuals per a funcionar amb Tor</string>
+
+
+ <string name="wizard_tips_tricks">Aplicacions per a usar-se amb Orbot</string>
+ <string name="wizard_tips_msg">T\'animem a descarregar-te & utilitza aplicacions que sàpiguen com connectar-se directament a Orbot. Fes clic als botons de sota per instal·lar.</string>
+ <string name="wizard_tips_otrchat">OTRCHAT - Client de missatgeria instantània segura per a Android</string>
+ <string name="wizard_tips_orweb">ORWEB (Només Android 1.x) - Navegador dissenyat per la privacitat & per a Orbot</string>
+ <string name="wizard_tips_proxy">Coniguració de Proxy - Aprèn a configurar aplicacions per a què funcionin amb Orbot</string>
+
+ <string name="wizard_proxy_help_info">Configuració de Proxy</string>
+ <string name="wizard_proxy_help_msg">Si l\'aplicació d\'Android que estàs utilitzant admet l\'ús d\'un proxy HTTP o SOCKS, pots configurar-la per a connectar-se a Orbot i utilitzar Tor.
+
+
+La configuració de l\'amfitrió és 127.0.0.1 o "localhost". Per a HTTP, el port actiu és 8118. Per a SOCKS, el proxy és 9050. Hauries d\'utlitzar SOCKS4A o SOCKS5 si és possible.
+
+
+
+Pots aprendre més coses sobre l\'ús dels proxys a Android al FAQ de: http://tinyurl.com/proxyandroid
+</string>
+
+ <string name="wizard_final">Orbot és a punt!</string>
+ <string name="wizard_final_msg">Centenars de milers de persones arreu del món utilitzen Tor per un gran ventall de raons: periodistes i blocaires, treballadors pels drets humans, agents de l\'autoritat, soldats, corporacions, ciutadans de règims opressors, i ciutadans qualssevol... I ara tu també ho pots fer!</string>
+
+ <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
+ <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
+
+<!-- END Welcome Wizard strings (DJH) -->
+
+
+ <string name="connect_first_time">T\'has connectat correctament a la xarxa Tor, però això NO vol dir que el teu dispositiu sigui segur. Pots utilitzar la opció \'Comprova\' del menú per provar el teu navegador.
+
+Visita\'ns a https://guardianproject.info/apps/orbot o envia\'ns un correu electrònic a help(a)guardianproject.info per a saber-ne més.</string>
+
+ <string name="tor_check">Això obrirà el teu navegador web per defecte i es connectarà a https://check.torproject.org per tal de comprovar si Orbot està configurat correctament i estàs connectat/da a Tor.</string>
+
+
+ <string name="pref_hs_group">Serveis ocults</string>
+
+ <string name="pref_general_group">General</string>
+ <string name="pref_start_boot_title">Start Orbot on Boot</string>
+ <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
+
+</resources>
Modified: projects/android/trunk/Orbot/res/values-de/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-de/strings.xml 2011-03-01 17:06:10 UTC (rev 24285)
+++ projects/android/trunk/Orbot/res/values-de/strings.xml 2011-03-02 15:26:23 UTC (rev 24286)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="pref_hs_group">Versteckte Dienste</string>
<string name="app_name">Orbot</string>
<string name="app_version">1.0.4</string>
@@ -36,7 +35,7 @@
<string name="button_close">Schließen</string>
<string name="button_about">Über</string>
-<string name="button_clear_log">Clear Log</string>
+<string name="button_clear_log">Log löschen</string>
<string name="menu_verify">Überprüfen</string>
@@ -44,15 +43,22 @@
<string name="powered_by">ermöglicht durch das Tor Projekt</string>
<string name="press_to_start">- zum Starten drücken -</string>
-<string name="pref_trans_proxy_group">Transparenter Proxy (nur gerootete Geräte)</string>
+<string name="pref_trans_proxy_group">Transparenter Proxy (benötigt Administratorrechte)</string>
<string name="pref_trans_proxy_title">Transparenter Proxy</string>
<string name="pref_trans_proxy_summary">Anwendungen automatisch durch Tor leiten</string>
<string name="pref_transparent_all_title">Alles durch Tor leiten</string>
<string name="pref_transparent_all_summary">Verbindungen aller Anwendungen durch Tor leiten</string>
+<string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
+<string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
+
+<string name="pref_transparent_port_title">Port List</string>
+<string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
+<string name="pref_transparent_port_dialog">Enter ports to proxy</string>
+
<string name="status_install_success">Die Tor-Pakete wurden erfolgreich installiert!</string>
-<string name="status_install_fail">Die Tor Pakete konnten nicht erfolgreich installiert werden. Bitte prüfe das Logfile und wende Dich an tor-assistants(a)torproject.org.</string>
+<string name="status_install_fail">Die Tor-Pakete konnten nicht erfolgreich installiert werden. Bitte prüfen Sie das Logfile und wenden Sie sich an tor-assistants(a)torproject.org.</string>
<string name="title_error">Anwendungsfehler</string>
@@ -73,51 +79,59 @@
*WARNUNG:* Durch die Installation von Orbot wird _nicht_ sofort Ihr kompletter Datenverkehr anonymisiert! Hilfestellung erhalten Sie von diesem Assitenten.</string>
<string name="wizard_details">Nähere Informationen zu Orbot</string>
- <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Privoxy. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string>
+ <string name="wizard_details_msg">Orbot ist eine quelloffene Anwendung die Tor, LibEvent und Privoxy enthält. Es stellt einen lokalen HTTP Proxy (8118) und einen SOCKS Proxy (9050) zum Tor-Netzwerk zur Verfügung. Orbot hat auf einem System mit Administrationsrechten auch die Fähigkeit, jeglichen Internetverkehr über das Tor-Netzwerk abzuwickeln.</string>
<string name="wizard_permissions_root">Erlaubnis erteilt</string>
- <string name="wizard_permissions_stock">Orbot Permissions</string>
- <string name="wizard_premissions_msg_root">Exzellent! Wir haben festgestellt, dass sie Orbot Root-Rechte eingeräumt haben. Wir werden diese Macht weise nutzen.</string>
- <string name="wizard_permissions_msg_stock">Obwohl es nicht nötig ist, kann Orbot ein mächtigeres Tool werden, wenn sie ihn Root-Rechte einräumen. Drücken sie auf den Kopf unten um Orbot diese Superkräfte einzuräumen.</string>
+ <string name="wizard_permissions_stock">Orbot Rechte</string>
+ <string name="wizard_premissions_msg_root">Exzellent! Wir haben festgestellt, dass Sie Orbot Administrator-Rechte eingeräumt haben. Wir werden diese Macht weise nutzen.</string>
+ <string name="wizard_permissions_msg_stock">Obwohl es nicht nötig ist, kann Orbot ein mächtigeres Tool werden, wenn Sie ihm Administrator-Rechte einräumen. Drücken Sie auf den Kopf unten um Orbot diese Superkräfte einzuräumen.</string>
- <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string>
- <string name="wizard_permissions_consent">I understand and would like to continue without root</string>
+ <string name="wizard_permissions_no_root">Falls Sie keinen Administrator-Zugang haben oder nicht wissen was das ist, stellen Sie sicher, dass Sie Anwendungen benutzen die mit Orbot kompatibel können.</string>
+ <string name="wizard_permissions_consent">Ich habe verstanden und möchte ohne Administrator-Rechte weitermachen.</string>
- <string name="wizard_permission_enable_root">Orbot Root-Rechte einräumen</string>
+ <string name="wizard_permission_enable_root">Orbot Administrator-Rechte einräumen</string>
<string name="wizard_configure">Configure Torification</string>
- <string name="wizard_configure_msg">Orbot gibt ihnen die Wahl den Datenverkehr aller Programme durch Tor zu leiten ODER die Wahl für alle Programme einzeln zu treffen.</string>
+ <string name="wizard_configure_msg">Orbot gibt Ihnen die Wahl den Datenverkehr aller Programme durch Tor zu leiten ODER die Wahl für alle Programme einzeln zu treffen.</string>
<string name="wizard_configure_all">Den Verkehr aller Programme durch Tor leiten</string>
<string name="wizard_configure_select_apps">Programme einzeln wählen</string>
<string name="wizard_tips_tricks">Programme, für die Orbot aktiviert ist</string>
- <string name="wizard_tips_msg">Wir raten ihnen Programme herunterzuladen & zu nutzen, die wissen, wie sie sich direkt mit Orbot verbinden. Klicken sie zum Installieren auf den Knopf unten.</string>
+ <string name="wizard_tips_msg">Wir raten Ihnen Programme herunterzuladen & zu nutzen, die wissen, wie sie sich direkt mit Orbot verbinden. Klicken Sie zum Installieren auf den Knopf unten.</string>
<string name="wizard_tips_otrchat">OTRCHAT - Ein sicheres Instant-Messaging-Programm für Android</string>
<string name="wizard_tips_orweb">ORWEB (Nur Android 1.x) - Ein für Privatsphäre & Orbot entworfener Browser</string>
- <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string>
+ <string name="wizard_tips_proxy">Proxy-Einstellungen - Lernen Sie Anwendungen so zu konfigurieren, dass sie mit Orbot zusammenarbeiten.</string>
- <string name="wizard_proxy_help_info">Proxy Settings</string>
- <string name="wizard_proxy_help_msg">Wenn das Android-Programm, das du benutzt, die Verwendung von HTTP- oder SOCKS-Proxys unterstützt kannst du es konfigurieren sich mit Orbot zu verbinden und Tor zu nutzen.
+ <string name="wizard_proxy_help_info">Proxy-Einstellungen</string>
+ <string name="wizard_proxy_help_msg">Wenn das Android-Programm, das Sie benutzten die Verwendung von HTTP- oder SOCKS-Proxys unterstützt, können Sie es konfigurieren sich mit Orbot zu verbinden und Tor zu nutzen.
Die Host-Einstellungen sind 127.0.0.1 oder "localhost". Die Port-Einstellungen sind 8118 für HTTP und 9050 für SOCKS. Sie sollten versuchen SOCKS4A oder SOCKS5 zu benutzen.
-Erfahren sie mehr über die Verwendung von Proxys unter Android im FAQ unter http://tinyurl.com/proxyandroid
-</string>
+Erfahren Sie mehr über die Verwendung von Proxys unter Android in den FAQ unter http://tinyurl.com/proxyandroid
+ </string>
- <string name="wizard_final">Orbot is ready!</string>
- <string name="wizard_final_msg">Hunderttausende Menschen auf der ganzen Welt nutzen Tor aus einer Vielzahl von Gründen: Journalisten und Blogger, Menschenrechtsaktivisten, Strafverfolgungsbehörden, Soldaten, Unternehmen, Bürger repressiver Regime und ganz normale Menschen... und sind sie ebenfalls bereit!</string>
+ <string name="wizard_final">Orbot ist bereit!</string>
+ <string name="wizard_final_msg">Hunderttausende Menschen auf der ganzen Welt nutzen Tor aus einer Vielzahl von Gründen: Journalisten und Blogger, Menschenrechtsaktivisten, Strafverfolgungsbehörden, Soldaten, Unternehmen, Bürger repressiver Regime und ganz normale Menschen... und sind Sie ebenfalls bereit!</string>
- <string name="otrchat_apk_url">https://guardianproject/getgibber</string>
- <string name="orweb_apk_url">https://guardianproject/getorweb</string>
+ <string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
+ <string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
<!-- END Welcome Wizard strings (DJH) -->
- <string name="connect_first_time">Sie haben sich erfolgreich mit dem Tor-Netzwerk verbunden - das bedeutet aber NICHT, dass dein Gerät sicher ist. Du kannst die \'Überprüfen\'-Option aus dem Menü benutzen, um deinen Browser zu testen.
+ <string name="connect_first_time">Sie haben sich erfolgreich mit dem Tor-Netzwerk verbunden - das bedeutet aber NICHT, dass Ihr Gerät sicher ist. Sie können die \'Überprüfen\'-Option aus dem Menü benutzen, um Ihren Browser zu testen.
-Besuchen sie https://guardianproject.info/apps/orbot oder senden sie eine E-Mail an help(a)guardianproject.info um mehr zu erfahren.</string>
+Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail an help(a)guardianproject.info um mehr zu erfahren.</string>
- <string name="tor_check">This will open your default web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
+ <string name="tor_check">Das wird die Seite https://check.torproject.org in Ihrem Webbrowser öffnen, so dass Sie überprüfen können, ob Orbot richtig configuriert ist und Sie mit Tor verbunden sind.</string>
+
+
+ <string name="pref_hs_group">Versteckte Dienste</string>
+
+ <string name="pref_general_group">General</string>
+ <string name="pref_start_boot_title">Start Orbot on Boot</string>
+ <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
+
</resources>
Modified: projects/android/trunk/Orbot/res/values-es/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-es/strings.xml 2011-03-01 17:06:10 UTC (rev 24285)
+++ projects/android/trunk/Orbot/res/values-es/strings.xml 2011-03-02 15:26:23 UTC (rev 24286)
@@ -50,6 +50,13 @@
<string name="pref_transparent_all_title">Pasar todo el tráfico por Tor</string>
<string name="pref_transparent_all_summary">Tráfico Proxy para todas las aplicaciones mediante Tor</string>
+<string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
+<string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
+
+<string name="pref_transparent_port_title">Port List</string>
+<string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
+<string name="pref_transparent_port_dialog">Enter ports to proxy</string>
+
<string name="status_install_success">¡Binarios de Tor instalados con éxito!</string>
<string name="status_install_fail">Los archivos binarios de Tor no se han podido instalar. Por favor, verifique el Historial y notifique a: tor-assistants(a)torproject.org</string>
Modified: projects/android/trunk/Orbot/res/values-fa/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-fa/strings.xml 2011-03-01 17:06:10 UTC (rev 24285)
+++ projects/android/trunk/Orbot/res/values-fa/strings.xml 2011-03-02 15:26:23 UTC (rev 24286)
@@ -50,6 +50,13 @@
<string name="pref_transparent_all_title">شامل همه</string>
<string name="pref_transparent_all_summary">فعالیت همه اپلیکیشن ها را از طریق Tor پروکسی کنید.</string>
+<string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
+<string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
+
+<string name="pref_transparent_port_title">Port List</string>
+<string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
+<string name="pref_transparent_port_dialog">Enter ports to proxy</string>
+
<string name="status_install_success">دوتایی های Tor با موفقیت نصب شدند!</string>
<string name="status_install_fail">نصب فایل های دوتایی Tor ممکن نبود. لطفن قطعه را وارسی کنید و به tor-assistance(a)torproject.org اطلاع دهید.</string>
Modified: projects/android/trunk/Orbot/res/values-nl/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-nl/strings.xml 2011-03-01 17:06:10 UTC (rev 24285)
+++ projects/android/trunk/Orbot/res/values-nl/strings.xml 2011-03-02 15:26:23 UTC (rev 24286)
@@ -50,6 +50,13 @@
<string name="pref_transparent_all_title">Tor Alles</string>
<string name="pref_transparent_all_summary">Proxy verkeer voor alle toepasingen door Tor</string>
+<string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
+<string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
+
+<string name="pref_transparent_port_title">Port List</string>
+<string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
+<string name="pref_transparent_port_dialog">Enter ports to proxy</string>
+
<string name="status_install_success">Tor\'s binaire bestanden succesvol geïnstalleerd</string>
<string name="status_install_fail">The binaire bestanden konden niet worden geïnstalleerd. Gelieve het log te raadplegen en tor-assistants(a)torproject.org op de hoogte te stellen</string>
Modified: projects/android/trunk/Orbot/res/values-pl/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-pl/strings.xml 2011-03-01 17:06:10 UTC (rev 24285)
+++ projects/android/trunk/Orbot/res/values-pl/strings.xml 2011-03-02 15:26:23 UTC (rev 24286)
@@ -50,6 +50,13 @@
<string name="pref_transparent_all_title">Przepuść wszystko przez Tora</string>
<string name="pref_transparent_all_summary">Przekierowanie ruchu wszystkich aplikacji przez Tora</string>
+<string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
+<string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
+
+<string name="pref_transparent_port_title">Port List</string>
+<string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
+<string name="pref_transparent_port_dialog">Enter ports to proxy</string>
+
<string name="status_install_success">Binarki Tora pomyslnie zainstalowane!</string>
<string name="status_install_fail">Nie można zainstalować plików binarnych Tora. Zajrzyj do dziennika i powiadom tor-assistants(a)torproject.org</string>
Modified: projects/android/trunk/Orbot/res/values-ru/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-ru/strings.xml 2011-03-01 17:06:10 UTC (rev 24285)
+++ projects/android/trunk/Orbot/res/values-ru/strings.xml 2011-03-02 15:26:23 UTC (rev 24286)
@@ -50,6 +50,13 @@
<string name="pref_transparent_all_title">Направлять все через Tor</string>
<string name="pref_transparent_all_summary">Трафик всех приложений будет проходить через Tor</string>
+<string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
+<string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
+
+<string name="pref_transparent_port_title">Port List</string>
+<string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
+<string name="pref_transparent_port_dialog">Enter ports to proxy</string>
+
<string name="status_install_success">Программа Tor успешно установлена!</string>
<string name="status_install_fail">Не удалось установить программу Tor. Пожалуйста, проверьте системный журнал и сообщите нам: tor-assistants(a)torproject.org</string>
Modified: projects/android/trunk/Orbot/res/values-zh/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-zh/strings.xml 2011-03-01 17:06:10 UTC (rev 24285)
+++ projects/android/trunk/Orbot/res/values-zh/strings.xml 2011-03-02 15:26:23 UTC (rev 24286)
@@ -7,20 +7,20 @@
<string name="default_web_url">http://check.torproject.org</string>
<string name="secure_default_web_url">https://check.torproject.org</string>
<string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
- <string name="control_permission_label">启动和停止Tor</string>
- <string name="tor_proxy_service_process">Tor代理服务</string>
+ <string name="control_permission_label">启动和停止 Tor</string>
+ <string name="tor_proxy_service_process">Tor 代理服务</string>
-<string name="status_starting_up">Orbot正在启动...</string>
-<string name="status_activated">已经连接上了Tor网络</string>
-<string name="status_disabled">Orbot已停用</string>
-<string name="status_shutting_down">Orbot正在关闭</string>
+<string name="status_starting_up">Orbot 正在启动...</string>
+<string name="status_activated">已连接到 Tor 网络</string>
+<string name="status_disabled">Orbot 已停用</string>
+<string name="status_shutting_down">Orbot 正在关闭</string>
<string name="tor_process_connecting">正在启动Tor....</string>
-<string name="tor_process_connecting_step2">启动控制连接...</string>
-<string name="tor_process_connecting_step3">完毕.</string>
-<string name="tor_process_connecting_step4">请等待...</string>
+<string name="tor_process_connecting_step2">设置控制...</string>
+<string name="tor_process_connecting_step3">完毕。</string>
+<string name="tor_process_connecting_step4">等待中。</string>
-<string name="not_anonymous_yet">警告: 您的通讯还不是匿名的! 请设置您的应用程序使用代理服务器127.0.0.1:8118或者SOCKS4A或者SOCKS5代理服务器127.0.0.1:9050</string>
+<string name="not_anonymous_yet">警告: 您的通讯还不是匿名的! 请设置您的应用程序使用代理服务器 127.0.0.1:8118 或者 SOCKS4A 或者 SOCKS5 代理服务器 127.0.0.1:9050</string>
<string name="menu_home">首页</string>
<string name="menu_browse">浏览</string>
<string name="menu_settings">设置</string>
@@ -35,31 +35,38 @@
<string name="button_close">关闭</string>
<string name="button_about">关于</string>
-<string name="button_clear_log">清除日志</string>
+<string name="button_clear_log">Clear Log</string>
-<string name="menu_verify">验证</string>
+<string name="menu_verify">检查</string>
<string name="menu_exit">退出</string>
-<string name="powered_by">由 Tor 项目提供动力</string>
-<string name="press_to_start">- 按下后启动 -</string>
+<string name="powered_by">由 Tor 项目强力驱动</string>
+<string name="press_to_start">- 按下以开始 -</string>
-<string name="pref_trans_proxy_group">透明代理(需要 Root 权限)</string>
+<string name="pref_trans_proxy_group">透明代理(需要 root)</string>
<string name="pref_trans_proxy_title">透明代理</string>
-<string name="pref_trans_proxy_summary">应用程序自动通过 Tor 访问网络</string>
+<string name="pref_trans_proxy_summary">自动对应用程序使用 Tor</string>
-<string name="pref_transparent_all_title">全局使用 Tor</string>
-<string name="pref_transparent_all_summary">所有应用程序均通过 Tor 访问网络</string>
+<string name="pref_transparent_all_title">对所有应用使用 Tor</string>
+<string name="pref_transparent_all_summary">使用 Tor 代理所有程序的流量</string>
-<string name="status_install_success">Tor 程序安装成功！</string>
-<string name="status_install_fail">Tor 程序安装失败，请检查日志并报告给 tor-assistants(a)torproject.org</string>
+<string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
+<string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
+<string name="pref_transparent_port_title">Port List</string>
+<string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
+<string name="pref_transparent_port_dialog">Enter ports to proxy</string>
+
+<string name="status_install_success">Tor 二进制程序安装成功！</string>
+<string name="status_install_fail">Tor 二进制程序无法安装。请查看日志 tor-assistants(a)torproject.org</string>
+
<string name="title_error">应用程序错误</string>
<string name="wizard_title">欢迎使用 Orbot</string>
<string name="wizard_btn_tell_me_more">关于 Orbot</string>
-<string name="btn_next">前进</string>
-<string name="btn_back">后退</string>
+<string name="btn_next">下一步</string>
+<string name="btn_back">上一步</string>
<string name="btn_finish">完成</string>
<string name="btn_okay">确定</string>
@@ -68,42 +75,38 @@
<!-- Welcome Wizard strings (DJH) -->
- <string name="wizard_welcome_msg">Orbot 把 Tor 带到 Android 中。Tor 是一个自由软件，也是一个开放的网络。它可以帮助你防御可能威胁到人身自由和隐私，秘密的商业活动和商业关系，国家安全网络监控 - 流量分析。
-
-警告：* 仅仅是安装上 Orbot 并不能神奇地使你的移动网络流量变得无迹可寻！下面的向导将会引领你的匿名之路。</string>
- <string name="wizard_details">关于 Orbot 的详情</string>
- <string name="wizard_details_msg">Orbot 是一个开放源代码的应用程序，它包含了 Tor, LibEvent 和 Privoxy. 它在本地提供一个连接到 Tor 网络的 HTTP 代理（8118）和一个 SOCKS 代理（9050）。在有 Root 权限的设备上，Orbot 能够让所有的互联网访问通过 Tor 网络发出。</string>
- <string name="wizard_permissions_root">已经获得授权</string>
+ <string name="wizard_welcome_msg">Orbot 将 Tor 带到 Android 之上。Tor 是自由软件，致力于构建开放网络，帮助保护网络访问的自由和隐私，可以抵御秘密的商业活动、关系以及已知的流量分析技术。\n\n*警告：*仅仅安装 Orbot 不会自动使您的移动流量匿名化！这个向导将带您入门。</string>
+ <string name="wizard_details">一些 Orbot 详情</string>
+ <string name="wizard_details_msg">Orbot 是包含 Tor、LibEvent 和 Privoxy 的开源软件。它包含了一个本地 HTTP 代理(8118)和 SOCKS 代理(9050)，使您接入 Tor 网络。Orbot 在可以获得 root 权限的设备上接管所有流量经由 Tor 网络。</string>
+ <string name="wizard_permissions_root">已赋予权限</string>
<string name="wizard_permissions_stock">Orbot 权限</string>
- <string name="wizard_premissions_msg_root">很好！我们检测到 Orbot 已经获得了 Root 权限。我们会谨慎地使用它。</string>
- <string name="wizard_permissions_msg_stock">虽然 Root 权限并不是必须的，但是一旦拥有，Orbot 就会变成更加强大的工具。点击下面的按钮获得 Root 权限！</string>
+ <string name="wizard_premissions_msg_root">非常好！我们检测到您已经为 Orbot 配置了 root 权限。我们会聪明地使用这个特权。</string>
+ <string name="wizard_permissions_msg_stock">虽然并非必须，如果你的设备有 root 权限，Orbot 可以表现得更为强大。使用以下按钮来赋予 Orbot 超级能力！</string>
- <string name="wizard_permissions_no_root">如果你没有 Root 权限，或者不明白我们在说什么，请一定只使用那些支持 Orbot的应用程序。</string>
- <string name="wizard_permissions_consent">我知道我没有 Root 权限，继续</string>
+ <string name="wizard_permissions_no_root">如果你没有 root 权限，或不明白上面说的是什么，那么只需使用可与 Orbot 工作的应用程序。</string>
+ <string name="wizard_permissions_consent">我明白并会以非 root 继续</string>
- <string name="wizard_permission_enable_root">授予 Orbot Root 权限</string>
- <string name="wizard_configure">配置 Tor 功能</string>
- <string name="wizard_configure_msg">Orbot 允许你选择代理所有的应用程序或者只代理某几个选中 的应用程序</string>
- <string name="wizard_configure_all">使用 Tor 代理所有的应用程序</string>
- <string name="wizard_configure_select_apps">选择要使用 Tor 的应用程序</string>
+ <string name="wizard_permission_enable_root">为 Orbot 赋予 root 权限</string>
+ <string name="wizard_configure">配置 Tor 使用</string>
+ <string name="wizard_configure_msg">Orbot 给予您路由所有应用程序流量通过 Tor 或者为单个程序设置选择的选项。</string>
+ <string name="wizard_configure_all">通过 Tor 代理全部应用程序</string>
+ <string name="wizard_configure_select_apps">选择使用 Tor 的单个应用程序</string>
- <string name="wizard_tips_tricks">支持 Orbot 的应用程序</string>
- <string name="wizard_tips_msg">我们鼓励你下载并使用能直接连接到 Orbot 的应用程序。点击下面的按钮来安装。</string>
- <string name="wizard_tips_otrchat">OTRCHAT - Android 上的安全的即时聊天客户端</string>
- <string name="wizard_tips_orweb">ORWEB (仅限 Android 1.x) - 通过 Orbot 保护隐私而设计的浏览器</string>
+ <string name="wizard_tips_tricks">可用 Orbot 的应用程序</string>
+ <string name="wizard_tips_msg">我们建议您下载和使用能直接连接到 Orbot 的应用程序。点击以下按钮安装。</string>
+ <string name="wizard_tips_otrchat">OTRCHAT - Android 上的安全即时消息客户端</string>
+ <string name="wizard_tips_orweb">ORWEB (仅 Android 1.x) - 着重隐私设计的浏览器</string>
<string name="wizard_tips_proxy">代理设置 - 学习如何配置应用程序使用 Orbot</string>
<string name="wizard_proxy_help_info">代理设置</string>
- <string name="wizard_proxy_help_msg">如果你的 Android 程序能支持 HTTP 或者 SOCKS 代码，那么你可配置它们连接到 Orbot 以便使用 Tor。
-
-主机地址是 127.0.0.1 或者 localhost, HTTP 代理端口是 8118, SOCKS 代理端口是 9050. 你可以使用 SOCKS4A 或者 SOCKS5.
-
-获取更多关于 Android 上使用代理设置的信息请访问： http://tinyurl.com/proxyandroid
- </string>
+ <string name="wizard_proxy_help_msg">如果您正在使用的 Android 应用程序支持使用 HTTP 或 SOCKS 代理，您可以配置它连接到 Orbot 并使用 Tor。\n\n
+ 主机设置为 127.0.0.1 或 localhost。对于 HTTP，端口为 8118，对于 SOCKS 端口为 9050。如果可能，应当使用 SOCKS4A 或 SOCKS5。
+ \n\n
+ 您可以通过 http://tinyurl.com/proxyandroid 了解更多 Android 上使用代理的知识。</string>
- <string name="wizard_final">Orbot 配置完成</string>
- <string name="wizard_final_msg">全世界有100多万的人由于各种原因正在使用 Tor：新闻记者，博客，人权工作者，法律援助者，士兵，公司，强权政制下的公民，和普通的公民...现在你也一样在使用 Tor 了！</string>
+ <string name="wizard_final">Orbot 已就绪！</string>
+ <string name="wizard_final_msg">数以万计的各国人们因为各种原因使用 Tor：记者、人权工作者、法律工作者、士兵、公司、迫于实际情况使用的市民，当然也有普通的市民。现在你也即将成为其中的一员！</string>
<string name="otrchat_apk_url">https://guardianproject.info/getgibber</string>
<string name="orweb_apk_url">https://guardianproject.info/getorweb</string>
@@ -111,14 +114,12 @@
<!-- END Welcome Wizard strings (DJH) -->
- <string name="connect_first_time">你已经成功连接到Tor网络-但是，这并不意味着你的设备是安全的。你可以使用菜单中的\'检查\'选项来测试你的浏览器。
+ <string name="connect_first_time">您已成功连接至 Tor 网络 - 但这并不意味着您的设备安全。您可以使用“检查”选项测试您的浏览器。\n\n访问 https://guardianproject.info/apps/orbot 或发送邮件到 help(a)guardianproject.info 以了解更多信息。</string>
-访问我们的网站https://guardianproject.info/apps/orbot或发送电子邮件至help@guardianproject.info了解更多信息。</string>
+ <string name="tor_check">这将启动默认浏览器并访问 https://check.torproject.org 以测试是否正确配置了 Orbot 并确认您是否已经连接到 Tor。</string>
- <string name="tor_check">这将打开你的默认浏览器至 https://check.torproject.org 为了确认 Orbot是否安装完成和你是否连接到了Tor。</string>
-
- <string name="pref_hs_group">隐匿服务</string>
+ <string name="pref_hs_group">隐藏服务</string>
<string name="pref_general_group">General</string>
<string name="pref_start_boot_title">Start Orbot on Boot</string>
1
0
r4526: translations for vidaliahelp as html files (in vidalia/trunk/src/vidalia/help/content: . my zh_CN)
by vidalia-svn＠svn.torproject.org 02 Mar '11
by vidalia-svn＠svn.torproject.org 02 Mar '11
02 Mar '11
Author: runa
Date: 2011-03-02 14:22:16 +0000 (Wed, 02 Mar 2011)
New Revision: 4526
Added:
vidalia/trunk/src/vidalia/help/content/my/
vidalia/trunk/src/vidalia/help/content/my/bridges.html
vidalia/trunk/src/vidalia/help/content/my/config.html
vidalia/trunk/src/vidalia/help/content/my/index.html
vidalia/trunk/src/vidalia/help/content/my/links.html
vidalia/trunk/src/vidalia/help/content/my/log.html
vidalia/trunk/src/vidalia/help/content/my/netview.html
vidalia/trunk/src/vidalia/help/content/my/running.html
vidalia/trunk/src/vidalia/help/content/my/server.html
vidalia/trunk/src/vidalia/help/content/my/services.html
vidalia/trunk/src/vidalia/help/content/my/troubleshooting.html
vidalia/trunk/src/vidalia/help/content/zh_CN/bridges.html
Modified:
vidalia/trunk/src/vidalia/help/content/zh_CN/config.html
vidalia/trunk/src/vidalia/help/content/zh_CN/index.html
vidalia/trunk/src/vidalia/help/content/zh_CN/netview.html
vidalia/trunk/src/vidalia/help/content/zh_CN/running.html
Log:
translations for vidaliahelp as html files
Added: vidalia/trunk/src/vidalia/help/content/my/bridges.html
===================================================================
--- vidalia/trunk/src/vidalia/help/content/my/bridges.html (rev 0)
+++ vidalia/trunk/src/vidalia/help/content/my/bridges.html 2011-03-02 14:22:16 UTC (rev 4526)
@@ -0,0 +1,76 @@
+
+
+<!--
+** $Id: bridges.html 3007 2008-08-22 00:12:08Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.vidalia-project.net/. No part of Vidalia, including this file,
+** may be copied, modified, propagated, or distributed except according to
+** the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Bridge Relays</h1>
+<hr />
+
+<a name="about"/>
+<h3>bridge relays ေတြဆိုတာ ဘာလဲ?</h3>
+<p>
+အခ်ိဳ႕ေသာ Internet Service Providers (ISPs) ေတြဟာ Tor relays မ်ားကို
+ဆက္သြယ္မႈအား ပိတ္ဆို႔ျခင္းအားျဖင့္ Tor ကြန္ယက္ကို အသံုးျပဳသူေတြ ခ်ိတ္ဆက္မႈမွ
+ကာကြယ္ရန္ ၾကိဳးစားၾကပါတယ္။ Bridge relays (သို႔မဟုတ္ အတိုေကာက္<i>bridges</i>
+)ေတြဟာ relays မ်ား ျဖစ္ၾကျပီး Tor ကြန္ယက္ကို ခ်ိတ္ဆက္ဖို႔ ဆင္ဆာ အျဖတ္ခံရတဲ့
+အသံုးျပဳသူေတြကို ကူညီေပးပါတယ္။ Tor relays ေတြနဲ႔ မတူတာက ပံုမွန္ relays
+မ်ားလို bridges ေတြဟာ အမ်ားသူငါဆိုင္ရာ လမ္းညႊန္စာရင္းတြင္ မပါဝင္ေပ။
+ျပီးျပည့္စံုေသာ အမ်ားသူငါဆိုင္ရာ စာရင္းဟူ၍ မရွိေပ။ အကယ္၍ သင္၏ ISP က
+၎တို႔သိေသာ Tor relays မ်ားအားလံုးကို စီစစ္လိုက္တယ္ ဆိုရင္ေတာင္ bridges
+အားလံုးကို ပိတ္ဆို႔ဖို႔ေတာ့ မျဖစ္ႏိုင္ေပ။
+</p>
+
+<a name="finding"/>
+<h3>bridge relay ကိုဘယ္လိုရွာေဖြရမလဲ?</h3>
+<p>
+bridge လိပ္စာႏွင့္ပတ္သက္ျပီး ေလ့လာရန္ အဓိက နည္းလမ္း ႏွစ္သြယ္ရွိပါတယ္။ :
+<ol>
+ <li>သင့္အတြက္ သီးသန္႔ bridges မ်ားကို run ရန္ သူငယ္ခ်င္းအခ်ိဳ႕ရွာပါ။</li>
+ <li>အမ်ားသူငါဆိုင္ရာ bridges အခ်ိဳ႕ကို သံုးပါ။</li>
+</ol>
+</p>
+
+<p>
+သီးသန္႔ bridges မ်ားကို သံုးရန္ အင္တာနက္ ဆင္ဆာမျဖတ္ထားေသာ နယ္နမိတ္ထဲမွာ
+Vidalia ႏွင့္ Tor ကို သူငယ္ခ်င္းမ်ားကို run ခိုင္းပါ။ျပီးလွ်င္ Vidalia ၏ <a
+href="server.html">Relay settings page</a> မွာ <i>ဆင္ဆာျဖတ္ေတာက္ခံထားရေသာ
+အသံုးျပဳသူမ်ားကို ကူညီပါ</i> ဆိုတာကို ႏွိပ္ပါ။ ထို႔ေနာက္ Relay page ၏
+ေအာက္ေျခရွိ <i>Bridge address</i> လိုင္းကို သင့္ထံသို႔ သီးသန္႔ေပးပို႔
+ခိုင္းရပါမယ္။ ရွိျပီးသား relay ႏွင့္ run ပံုခ်င္း မတူသည္မွာ bridge relay သည္
+Tor ကြန္ယက္၏ အသြားအျပန္လမ္းေၾကာင္းတြင္ အခ်က္အလက္မ်ား ျဖတ္သန္းရံုမွ်သာ run
+ျခင္းေၾကာင့္ျဖစ္သည္။ ထို႔ေၾကာင့္ ေစာဒကတက္မႈ တစ္စံုတစ္ရာကို operator
+ျမင္ေအာင္ မျပသင့္ေပ။
+</p>
+
+<p>
+အမ်ားသူငါဆိုင္ရာ bridge လိပ္စာမ်ားကို <b>https://bridges.torproject.org</b>
+ကိုသြားေရာက္၍ ရွာေဖြႏိုင္သည္။ ၎စာမ်က္ႏွာမွ သင္ရရွိေသာ အေျဖမ်ားသည္
+ေန႔စဉ္နဲ႔အမွ် ေျပာင္းလဲ ေနလိမ့္မည္။ အကယ္၍ bridge လိပ္စာ မ်ားကို သင္ပိုမို
+လိုအပ္တယ္ဆိုရင္ အခါအားေလ်ာ္စြာ ျပန္လည္စစ္ေဆးပါ။ အမ်ားသူငါဆိုင္ရာ bridge
+လိပ္စာမ်ားကို ရွာေဖြရန္ အျခားေသာ နည္းလမ္းမွာ ေမးလ္၏ စာကိုယ္တြင္ <b>get
+bridges</b> ဟုထည့္သြင္းျပီး <b>bridges(a)torproject.org</b>
+သို႔ေပးပို႔ႏိုင္ပါတယ္။ ဘယ္လိုပဲျဖစ္ျဖစ္ တိုက္ခုိက္သူေတြ bridge လိပ္စာမ်ားကို
+ေလ့လာဖို႔ ခက္ခဲေအာင္ ကၽြန္ေတာ္တို႔က ျပဳလုပ္ႏိုင္ပါတယ္။ Gmail အေကာင့္မွ
+ေတာင္းဆိုမႈမ်ားကိုေတာ့ မျဖစ္မေန ေပးပို႔ရမွာပါ။
+</p>
+
+<p>
+အကယ္၍ အခ်ိဳ႕ေသာ bridges မ်ားသည္ မေရာက္ရွိႏိုင္ျဖစ္ခဲ့လွ်င္ bridge လိပ္စာ
+တစ္ခုထက္ပိုမို ျပင္ဆင္ထည့္သြင္းထားျခင္းသည္ Tor သို႔ခ်ိတ္ဆက္မႈကို ပိုမို
+တည္ျငိမ္ေစမွာ ျဖစ္ပါတယ္။
+</p>
+
+</body>
+</html>
+
Added: vidalia/trunk/src/vidalia/help/content/my/config.html
===================================================================
--- vidalia/trunk/src/vidalia/help/content/my/config.html (rev 0)
+++ vidalia/trunk/src/vidalia/help/content/my/config.html 2011-03-02 14:22:16 UTC (rev 4526)
@@ -0,0 +1,206 @@
+
+
+<!--
+** $Id: config.html 4323 2010-06-26 15:46:44Z runa $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.vidalia-project.net/. No part of Vidalia, including this file,
+** may be copied, modified, propagated, or distributed except according to
+** the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Vidalia ႏွင့္ Tor ကိုျပင္ဆင္ျခင္း</h1>
+<hr />
+
+<p>
+Vidalia သည္ Vidalia ႏွင့္ Tor ၏ အသြင္ျပင္ကို ျပဳျပင္ရန္ ခြင့္ျပဳပါသည္။ <a
+href="server.html">Tor relay</a>ကို ျပဳျပင္ထိန္းသိမ္းရန္ ႏွင့္ set up
+ျပဳလုပ္ရန္လည္း ခြင့္ျပဳပါသည္။ ထို႔ေၾကာင့္ Tor ကြန္ယက္ တိုးတက္ေအာင္
+သင့္ကူညီႏိုင္ပါသည္။
+</p>
+
+<a name="general"/>
+<h3>အေထြေထြ Settings မ်ား</h3>
+<p>
+<i>အေထြေထြ</i> စာမ်က္ႏွာေပၚမွ settings မ်ားသည္ အမ်ားအားျဖင့္
+ျပဳျပင္မြမ္းမံႏိုင္ေသာ settings မ်ား ျဖစ္ၾကပါသည္။
+</p>
+<ul>
+ <li><b>Tor Executable</b> : tray menu မွ <i>Start</i> ကို သင္ေရြးခ်ယ္လိုက္တဲ့အခါ
+Vidalia ကို run မည့္ Tor executable ျဖစ္ပါသည္။ အကယ္၍ Tor multiple
+ဗားရွင္းမ်ားကို install လုပ္ထားတယ္ ဆိုရင္ <i>Browse</i> button ကို
+ႏွိပ္ျခင္းအားျဖင့္ မည္သည့္ Vidalia ဗားရွင္းဆိုတာ ေျပာျပႏိုင္ျပီး
+သင္လိုခ်င္ေသာ ပံုမွန္ Tor installation ကို သြားႏိုင္ပါတယ္။
+ </li>
+ <li><b>Startup Options</b>: Vidalia စတင္လိုက္တာနဲ႔ Tor ကို အလိုအေလ်ာက္ စတင္ေစမွာ
+ျဖစ္ပါတယ္။ သင္၏ system စတင္တာနဲ႔ run ဖို႔ Vidalia ကို ျပင္ဆင္မႈ ျပဳလုပ္ထား
+ႏိုင္ပါေသးတယ္။ (<i>Windows တြင္သာ</i>)
+ </li>
+</ul>
+
+<a name="network"/>
+<h3>Network Settings</h3>
+<p>
+<i>Network</i> settings စာမ်က္ႏွာသည္ သင့္ကို Tor ကြန္ယက္သို႔ Tor
+ဘယ္လိုခ်ိတ္ဆက္ရမယ္ဆိုတာကို ျပဳျပင္ခြင့္ျပဳထားပါတယ္။
+</p>
+<ul>
+ <li><b>အင္တာနက္ရရန္ ကၽြန္ေတာ္သည္ proxy ကိုအသံုးျပဳေနရပါသည္။</b>: သင္၏
+အင္တာနက္ဆက္သြယ္မႈသည္ HTTP proxy လိုအပ္တယ္ဆိုလွ်င္ Tor relay ဆက္သြယ္မႈက သင့္
+proxy ကိုျဖတ္၍ ေတာင္းဆိုမႈလမ္းေၾကာင္းမ်ားကို ပို႔ေပးရန္ Tor ကို
+ျပင္ဆင္ႏိုင္ပါသည္။ သင့္အေနနဲ႔ အနည္းဆံုး hostname သို႔မဟုတ္ သင္၏ proxy
+မ်ားကို သတ္မွတ္ရပါမယ္။ ထို႔ေနာက္ ဆက္သြယ္မႈမ်ားအတြက္ မည္သည့္ port ေပၚမွ proxy
+က ၾကားနာေနသည္ဆို သည္ကိုလည္း သတ္မွတ္ရပါမယ္။ အကယ္၍ သင့္ proxy သည္
+authentication လိုအပ္တယ္ဆိုလွ်င္ proxy ကိုခ်ိတ္ဆက္ဖို႔အတြက္ <i>Username</i>
+ႏွင့္ <i>Password</i> ထည့္ကာ အသံုးျပဳႏိုင္ပါတယ္။ အျခားတနည္းကေတာ့
+ဤျဖည့္စရာမ်ားကို ကြက္လပ္ထားခဲ့လို႔ရပါတယ္။
+ </li>
+ <li><b>ကၽြန္ေတာ္၏ firewall သည္ သတ္မွတ္ထားေသာ ports မ်ားကိုသာ
+ဆက္သြယ္ခြင့္ျပဳသည္။</b>: အကယ္၍ ကန္႔သတ္ထားေသာ firewall သို႔မဟုတ္
+ဆက္သြယ္မႈျပဳလုပ္ရန္ ports မ်ားကို ကန္႔သတ္ထားေသာ proxy ေနာက္တြင္
+သင္ရွိေနလွ်င္ သင္၏ firewall သို႔မဟုတ္ proxy က ခြင့္ျပဳေသာ ports မ်ားေပၚရွိ
+relays မ်ားကို သိရွိရန္ Tor ကို တိုက္ရိုက္ခ်ိတ္ဆက္ကာ ျပင္ဆင္ႏိုင္သည္။ comma
+ျဖင့္ခြဲ၍ သင္၏ firewall သို႔မဟုတ္ proxy က ခြင့္ျပဳေသာ ports စာရင္းမ်ားကို
+ရိုးရိုးရွင္းရွင္း ရိုက္ထည့္ပါ။ (<i>ဥပမာ: 80,443,8080</i>)
+ </li>
+ <li><b>ကၽြန္ေတာ္၏ ISP သည္ Tor ကြန္ယက္သို႔ ခ်ိတ္ဆက္ျခင္းကို
+ပိတ္ဆို႔ထားပါသည္။</b>: အကယ္၍ သင္၏ ISP (Internet Service Provider) သည္ Tor
+ကြန္ယက္သို႔ ခ်ိတ္ဆက္ျခင္းကို ပိတ္ဆိုထားသည္ ဆိုလွ်င္ <i>bridges</i>(Tor
+0.2.0.3-alpha သို႔မဟုတ္ ဗားရွင္းအသစ္ မ်ားတြင္သာ)ဟုေခၚေသာ relays မ်ားကို
+ျဖတ္၍ Tor ကြန္ယက္သို႔ ခ်ိတ္ဆက္ျခင္းႏွင့္ ဆက္သြယ္မႈ လမ္းေၾကာင္းမ်ားကို
+encrypt (ပံုစံဖ်က္ျခင္း) အားျဖင့္ Tor သည္ စီစစ္ျခင္းမ်ားကို
+ေရွာင္ရွားႏိုင္ပါသည္။ ၎တို႔၏ လိပ္စာ၊ port နံပါတ္မ်ားႏွင့္ fingerprint
+မ်ားကို သတ္မွတ္ျခင္းအားျဖင့္ bridge relays မ်ားကို သင္ေပါင္းထည့္ႏိုင္ပါသည္။<br/>
+
+ ေအာက္တြင္ေဖာ္ျပထားသည္မွာ မွန္ကန္ေသာ bridge လိပ္စာ ပံုစံနမူနာမ်ားျဖစ္ပါတယ္။:
+ <ul>
+ <li>
+ 128.213.48.13:8080
+ </li>
+ <li>
+ 128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73
+ </li>
+ <li>
+ 128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73
+ </li>
+ </ul>
+ bridge relay လိပ္စာမ်ားကို သင္မသိဘူးဆိုရင္ေတာင္ ဤcheckbox ကို check
+လုပ္ျခင္းအားျဖင့္ အကူညီရရွိပါလိမ့္မည္။ အျခား relays မ်ားအတြက္
+သတင္းအခ်က္အလက္မ်ားကို Tor မွ ေတာင္းဆိုမႈမ်ားကို စီစစ္ရန္ ၾကိဳးစားေသာ
+ကိရိယာမ်ားကို directory ေတာင္းဆိုမႈမ်ားအား Tor က encrypt လုပ္ျခင္းအားျဖင့္
+ေက်ာ္လႊားႏိုင္ပါတယ္။ ပံုမွန္ Tor relays မ်ား၏ ခ်ိတ္ဆက္မႈမ်ားကို
+ပိတ္ဆို႔ခံလိုက္ရလွ်င္ bridge relay လိပ္စာ ဘယ္လိုနည္းနဲ႔ ဤေနရာတြင္
+ထည့္သြင္းရမည္ ဆိုတာကို ေလ့လာရပါလိမ့္မယ္။ bridge relay လိပ္စာအသစ္မ်ားႏွင့္
+fingerprints မ်ား အေၾကာင္း သတင္းအခ်က္လက္မ်ားကို <a
+href="bridges.html#finding">bridge relaysမ်ားရွာေဖြျခင္း</a> ရွိ အကူအညီက႑ကို
+ၾကည့္ရႈပါ။
+ </li>
+</ul>
+
+<a name="relay"/>
+<h3>Relay Settings</h3>
+<p>
+<i>Tor relay တစ္ခုကို ျပင္ဆင္ျခင္းႏွင့္ စီမံခန္႔ခြဲျခင္းမ်ား ဆိုင္ရာ
+သတင္းအခ်က္လက္မ်ားကို <a href="server.html">အကူအညီ က႑</a></i>တြင္ ၾကည့္ရႈပါ။
+</p>
+
+<a name="appearance"/>
+<h3>Appearance Settings</h3>
+<p>
+<i>Appearance</i> စာမ်က္ႏွာရွိ setting သည္ Vidalia ၏ အသြင္ျပင္ကို
+သင့္စိတ္ၾကိဳက္ျပင္ဆင္ခြင့္ျပဳပါသည္။
+</p>
+<ul>
+ <li><b>ဘာသာစကား</b>: Vidalia ၏ interface ကို ေစတနာ့ဝန္ထမ္းမ်ားက
+ဘာသာစကားမ်ိဳးစံုသို႔ ကူညီဘာသာျပန္ဆိုထားျပီး ျဖစ္ပါတယ္။ Vidalia ကိုစတင္ run
+လိုက္တာနဲ႔ လက္ရွိသင္၏ ကြန္ျပဴတာဟာ ဘယ္ဘာသာစကားကို အသံုးျပဳေနတယ္ဆိုတာ
+ခန္႔မွန္းဖို႔ ၾကိဳးစားပါလိမ့္မယ္။ အကယ္၍ Vidalia ၏ မွန္းဆခ်က္သည္
+မမွန္ဘူးဆိုလွ်င္ သို႔မဟုတ္ တစ္ျခားကြဲျပားေသာ ဘာသာစကားကို
+ရည္ညႊန္းခ်င္တယ္ဆိုလွ်င္ dropdown box မွ တစ္ျခားဘာသာစကားတစ္ခုကို
+သင္ေရြးခ်ယ္ႏိုင္ပါတယ္။ ေဖာ္ျပရန္ ဘာသာစကားကိုေျပာင္းလဲ ျပီးတာနဲ႔
+အဲ့ဒိအေျပာင္းလဲအတြက္ သက္ေရာက္မႈရွိေစရန္ Vidalia ကို restart ျပန္လုပ္ဖို႔
+လုိပါတယ္။
+ </li>
+ <li><b>အသြင္အျပင္</b>: အမ်ားအားျဖင့္ Vidalia ဟာ သင့္ platform ၏ မူရင္း interface
+အသြင္ျပင္ကိုပဲ အသံုးျပဳပါတယ္။ အကယ္၍ မူရင္းပံုစံသြင္ျပင္ကို မၾကိဳက္ဘူးဆိုရင္
+dropdown box ထဲက ၾကိဳက္ႏွစ္သက္ရာ interface အသြင္ျပင္ကို ေရြးခ်ယ္ႏိုင္ပါတယ္။
+ </li>
+</ul>
+
+<a name="advanced"/>
+<h3>အဆင့္ျမင့္ Settings</h3>
+<p>
+<i>အဆင့္ျမင့္</i> စာမ်က္ႏွာ မွာရွိတဲ့ settings ေတြဟာ ပံုမွန္အားျဖင့္
+အေတြ႕အၾကံဳရွိအသံုးျပဳသူေတြသာ ျပင္ဆင္မြမ္းမံ ႏိုင္ပါတယ္။
+</p>
+<ul>
+ <li><b>Control Address & Port</b>: <i>Control Port</i> သည္ Vidalia က Tor
+ကိုေျပာရန္ အသံုးျပဳသည့္ port ျဖစ္သည္။ သင့္စက္ထဲမွာ အျခားေသာ ဝန္ေဆာင္မႈေတြနဲ႔
+ပဋိပကၡ မျဖစ္ဘူးဆိုရင္ ဒါမွမဟုတ္ တစ္ျခား စက္ထဲမွာ Tor process
+အလုပ္လုပ္ေနတာကို ေစာင့္ၾကည့္ဖို႔နဲ႔ ထိန္းခ်ဳပ္ဖို႔ Vidalia
+ကိုအသံုးျပဳေနတာဆိုရင္ ၎ကို ေျပာင္းလဲဖို႔ မလိုအပ္ပါဘူး။
+ </li>
+ <li><b>Control Port Authentication</b>: Control port authentication သည္
+သင့္စက္ထဲမွာ ရွိတဲ့ applications ေတြကို Tor ၏ installation ကို
+ျပန္လည္ျပင္ဆင္ရန္ႏွင့္ ခ်ိတ္ဆက္တာေတြကို ကန္႔သတ္ရန္ အတြက္
+အသံုးျပဳျခင္းျဖစ္သည္။ ရရွိႏိုင္ေသာ authentication နည္းလမ္းမ်ားကေတာ့:
+ <ul>
+ <li>
+ <b>None</b> --authentication မလိုပါ။ ဒီ option ကို သံုးတာဟာ <b>လံုးဝ</b>
+မေရရာပါဘူး။ သင့္ကြန္ျပဴတာေပၚကေန application သို႔မဟုတ္ အသံုးျပဳသူ
+တစ္ေယာက္ေယာက္က သင့္ရဲ႕ Tor installation ကို ျပန္လည္ျပင္ဆင္လိုက္ႏိုင္ပါတယ္။
+ </li>
+ <li>
+ <b>Password</b> <i>(Default)</i> -- အကယ္၍ ဒီနည္းလမ္းကို ေရြးခ်ယ္ခဲ့လွ်င္
+အသံုးျပဳသူပဲျဖစ္ျဖစ္ application ပဲျဖစ္ျဖစ္ Tor ရဲ႕ control port ကို
+ခ်ိတ္ဆက္တိုင္း ခ်ိတ္ဆက္တိုင္းမွာ လိုအပ္မယ့္ password ကို
+သင္သတ္မွတ္ထားႏိုင္ပါတယ္။ အကယ္၍ Vidalia က သင့္အတြက္ Tor ကို စတင္ခဲ့ရင္
+<i>Randomly Generate</i> checkbox ကို ေရြးခ်ယ္ထားျခင္းအားျဖင့္ Tor
+စတင္တိုင္းမွာ Vidlia ဟာ password အသစ္ေတြကို က်ပန္း ထုတ္ေပးေနမွာ ျဖစ္ပါတယ္။
+ </li>
+ <li>
+ <b>Cookie</b> -- အကယ္၍ cookie authentication ကိုေရြးခ်ယ္ျပီးလွ်င္ စတင္တာနဲ႔
+Tor ဟာ က်ပန္း bytes ေတြပါဝင္တဲ့ ဖိုင္တစ္ဖိုင္ (သို႔မဟုတ္ <i>cookie</i>) ကို
+သူရဲ႕အခ်က္အလက္ေတြ သိမ္းထားရာ ေနရာမွာ write လုပ္မွာ ျဖစ္ပါတယ္။
+ဘယ္အသံုးျပဳသူပဲျဖစ္ျဖစ္ သို႔မဟုတ္ ဘယ္application ပဲျဖစ္ျဖစ္ Tor ရဲ႕ control
+port ကို ခ်ိတ္ဆက္ဖို႔ၾကိဳးစားရင္ ၎က cookie ရဲ႕ contents ေတြကို
+ေထာက္ပံ့ကူညီေပးမွာပါ။
+ </li>
+ </ul>
+ </li>
+ <li><b>Tor Configuration File</b> <i>(optional)</i>: သတ္မွတ္ထားေသာ Tor ရဲ႕
+<i>torrc</i> configuration file ကို အသံုးျပဳထားေသာ Tor ကို Vidalia
+စတင္ရန္အတြက္ ဒီ ဝption ကို အသံုးျပဳႏိုင္ပါတယ္။ အကယ္၍ သင္ဟာ ဒီေနရာမွာ
+ကြက္လပ္ ထားခဲ့မယ္ ဆိုရင္ Tor က ၎၏ မူရင္း torrc ေနရာကို အသံုးျပဳမွာ
+ျဖစ္ပါတယ္။
+ </li>
+ <li><b>Tor Data Directory</b> <i>(optional)</i>: Tor ရဲ႕ အခ်က္အလက္ သိမ္းဆည္းမည့္
+directory ကို သင့္သတ္မွတ္ႏိုင္သည္။ Tor relay သတင္းအခ်က္အလက္မ်ား၊Tor relay
+keys ႏွင့္ configuration ဖိုင္မ်ား ကို သိမ္းထားျခင္းမ်ိဳးကဲ့သို႔ ျဖစ္သည္။
+အကယ္၍ ဒီေနရာကို ကြက္လပ္ထားခဲ့လွ်င္ Tor က သူရဲ႕ ကိုယ္ပိုင္
+မူရင္းအခ်က္အလက္သိမ္းတဲ့ေနရာ ကို အသံုးျပဳမွာျဖစ္ပါတယ္။
+ </li>
+ <li><b>ခြင့္ျပဳခ်က္မ်ား</b> <i>(optional, Windows တြင္မရပါ)</i>: <b>Run as
+User</b> အေနနဲ႔ တန္ဖိုးထည့္လိုက္လွ်င္ စတင္လိုက္သည္ႏွင့္ Tor ဟာ
+<i>setuid</i>(အသံုးျပဳသူ၏ ID ကိုမွန္မမွန္ စစ္ေဆးျခင္းကို) လုပ္ပါလိမ့္မယ္။
+အကယ္၍ <b>Run as Group</b> လို႔ တန္ဖိုးထည့္လိုက္လွ်င္ စတင္လုိက္တာနဲ႔ Tor ဟာ
+<i>setgid</i> (အဲ့ဒိအုပ္စု၏ ID မွန္မမွန္စစ္ေဆးျခင္းကို) ျပဳလုပ္ပါလိမ့္မယ္။
+ </li>
+</ul>
+
+<a name="services"/>
+<h3>Hidden Service Settings</h3>
+<p>
+သိုဝွက္ထားေသာ ဝန္ေဆာင္မႈမ်ားက မည္သည့္ TCP-based ဝန္ေဆာင္မႈမ်ားျဖင့္မဆို
+ေထာက္ကူေပးရန္ ခြင့္ျပဳပါသည္။ ဥပမာ HTTP ဝန္ေဆာင္မႈက သင္၏ IP လိပ္စာကို
+မည္သူကိုမွ ထုတ္ေဖာ္ မျပျခင္းမ်ိဳး ျဖစ္သည္။
+</p>
+
+</body>
+</html>
+
Added: vidalia/trunk/src/vidalia/help/content/my/index.html
===================================================================
--- vidalia/trunk/src/vidalia/help/content/my/index.html (rev 0)
+++ vidalia/trunk/src/vidalia/help/content/my/index.html 2011-03-02 14:22:16 UTC (rev 4526)
@@ -0,0 +1,42 @@
+
+
+<!--
+** $Id: index.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.vidalia-project.net/. No part of Vidalia, including this file,
+** may be copied, modified, propagated, or distributed except according to
+** the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Vidalia အကူအညီ</h1>
+<hr />
+
+<p>
+ရရွိႏိုင္ေသာ က႑မ်ားကို Serch button ျဖင့္ အထက္ပါ က႑မ်ား စာရင္းမွလည္းေကာင္း၊
+သို႔မဟုတ္ ဘယ္ဘက္ျခမ္းရွိ tree မွ အကူအညီ က႑ကိုလည္းေကာင္း ေရြးခ်ယ္ပါ။
+</p>
+
+<p>
+toolbar ၏ အထက္မွာရွိတဲ့ <i>ရွာပါ</i> button ကို အကူအညီက႑ တစ္ခုခ်င္းစီအလိုက္
+ရွာရန္ အသံုးျပဳႏိုင္ပါတယ္။
+</p>
+
+<p>
+အထက္ပါ <i>မူလစာမ်က္ႏွာသို႔</i> button သည္ သင့္ကို မူလစာမ်က္ႏွာသို႔ ျပန္လည္
+ေခၚေဆာင္သြားမွာ ျဖစ္ပါတယ္။
+</p>
+
+<p>
+Vidalia ႏွင့္ Tor တို႔၏ အပိုေဆာင္း အကူညီႏွင့္ သတင္းအခ်က္အလက္မ်ားကို
+ရွာေဖြရန္ <a href="links.html">အသုံးဝင္ေသာ Links မ်ား</a>က႑ ကိုၾကည့္ပါ။
+</p>
+
+</body>
+</html>
+
Added: vidalia/trunk/src/vidalia/help/content/my/links.html
===================================================================
--- vidalia/trunk/src/vidalia/help/content/my/links.html (rev 0)
+++ vidalia/trunk/src/vidalia/help/content/my/links.html 2011-03-02 14:22:16 UTC (rev 4526)
@@ -0,0 +1,85 @@
+
+
+<!--
+** $Id: links.html 4323 2010-06-26 15:46:44Z runa $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.vidalia-project.net/. No part of Vidalia, including this file,
+** may be copied, modified, propagated, or distributed except according to
+** the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>အသံုးဝင္ေသာ Links မ်ား</h1>
+<hr />
+
+<h3>Vidalia</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>မူလစာမ်က္ႏွာ</td>
+ <td>
+ <a href="https://www.torproject.org/vidalia/">
+https://www.torproject.org/vidalia/</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki</td>
+ <td>
+ <a href="http://trac.vidalia-project.net/wiki">
+http://trac.vidalia-project.net/wiki</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Bugtracker</td>
+ <td>
+ <a href="http://trac.vidalia-project.net/report">
+http://trac.vidalia-project.net/report</a>
+ </td>
+</tr>
+</table>
+
+<h3>Tor</h3>
+<table>
+<tr>
+ <td> </td>
+ <td>မူလစာမ်က္ႏွာ</td>
+ <td>
+ <a href="https://www.torproject.org/">https://www.torproject.org/</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>ေမးေနက်ေမးခြန္းမ်ား</td>
+ <td>
+ <a href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ">
+https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Wiki</td>
+ <td>
+ <a href="https://wiki.torproject.org/noreply/TheOnionRouter">
+https://wiki.torproject.org/noreply/TheOnionRouter</a>
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td>Bugtracker</td>
+ <td>
+ <a href="https://bugs.torproject.org/flyspray/">
+https://bugs.torproject.org/flyspray</a>
+ </td>
+</tr>
+</table>
+
+</body>
+</html>
+
Added: vidalia/trunk/src/vidalia/help/content/my/log.html
===================================================================
--- vidalia/trunk/src/vidalia/help/content/my/log.html (rev 0)
+++ vidalia/trunk/src/vidalia/help/content/my/log.html 2011-03-02 14:22:16 UTC (rev 4526)
@@ -0,0 +1,107 @@
+
+
+<!--
+** $Id: log.html 4323 2010-06-26 15:46:44Z runa $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.vidalia-project.net/. No part of Vidalia, including this file,
+** may be copied, modified, propagated, or distributed except according to
+** the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Message Log</h1>
+<hr />
+
+message log သည္ Tor process run ေနေသာ သတင္းအခ်က္အလက္ status ကို
+ၾကည့္ရႈခြင့္ေပးသည္။ <a name="basic"/>message
+တစ္ခုခ်င္းစီတြင္<b>အမွား</b>(အေတာ္ေလး) မွ <b>Debug</b>(ပိုမိုမ်ားျပားသည္)
+အထိ စီရီထားျပီး ၎ႏွင့္ ဆက္စပ္လွ်က္ရွိေသာ <i>severity</i> ရွိၾကသည္။
+ပိုမိုသိလိုေသာ သတင္းအခ်က္အလက္မ်ားအတြက္ အကူအညီက႑ရွိ <a
+href="#severities">message severities</a> ကို ၾကည့္ပါ။<a name="severities"/>
+<h3>Message Severities</h3>
+<p>
+message ၏ severity က သင့္ကို message သည္မည္မွ် အေရးၾကီးေၾကာင္း
+ေျပာျပလိမ့္မည္။ အဆင့္ျမင့္ေသာ severity message ေတြဟာ Tor ၌ ျဖစ္ေပၚလာေသာ
+မွားယြင္းမႈ တစ္စံုတစ္ရာကို ေဖာ္ျပပါသည္။ အဆင့္နိမ့္ေသာ severity messages
+ေတြဟာ Tor operations မ်ားအတြင္း မၾကာခဏ ေပၚလာျပီး အျမဲတမ္း log လုပ္ရန္
+မလိုအပ္ေပ။
+</p>
+
+<p>
+အေရးအၾကီးဆံုးမွ စ၍ အစဥ္အတိုင္းစီထားေသာ message မ်ား:
+</p>
+<ul>
+ <li>
+ <b>Error</b>: ေတာ္ေတာ္ေလး အမွားယြင္းျဖစ္ေန၍ message ေပၚလာတဲ့အခါမွာေတာ့ Tor က
+ဆက္လက္ အလုပ္လုပ္ႏိုင္ေတာ့မွာ မဟုတ္ပါဘူး။ အဲ့ဒိလို message မ်ိဳးကို message
+log ထဲတြင္ <i>အနီ</i>ျဖင့္ မ်ဥ္းတား ျပသထားမွာ ျဖစ္ပါတယ္။
+ </li>
+ <li>
+ <b>သတိေပးခ်က္</b>: Tor တြင္ တစ္ခုခု အမွားယြင္းေၾကာင့္ ေပၚလာေသာ messages
+ေတြဟာ ပ်က္စီးေစမွာ မဟုတ္ပဲ Tor က ဆက္လက္ run ေနပါလိမ့္မယ္။ အဲ့ဒိ messages
+ေတြကို <i>အဝါေရာင္</i>ျဖင့္ မ်ဥ္းတားျပထားေပးမွာ ျဖစ္ပါတယ္။
+ </li>
+ <li>
+ <b>အသိေပးခ်က္</b>: ပံုမွန္ Tor operation အတြင္း မၾကာခဏမဟုတ္ပဲ ေပၚလာေသာ
+messages ေတြဟာ errors ေတြကို အဆံုးအျဖတ္မေပးႏိုင္ေပးမယ့္ သင္အေနနဲ႔
+ဂရုစိုက္ဖို႔ေတာ့ လိုပါတယ္။
+ </li>
+ <li>
+ <b>Info</b>: ပံုမွန္ Tor operation အတြင္း မၾကာခဏ ေပၚလာေသာ messages ေတြဟာ
+သာမန္အသံုးျပဳသူေတြကို စိတ္မဝင္စား ေစပါဘူး။
+ </li>
+ <li>
+ <b>Debug</b>:အလြန္ရွည္လ်ားေသာ message ေတြဟာ developers မ်ားကို အဓိက
+စိတ္ဝင္စားေစပါတယ္။ သင္ဘာလုပ္ရမယ္ဆိုတာ မသိရင္ေတာင္ ပံုမွန္အားျဖင့္ debug ကို
+log မလုပ္သင့္ပါဘူး။
+ </li>
+</ul>
+
+<p>
+အသံုးျပဳသူအမ်ားစုသည္ <i>Error</i>, <i>Warning</i>, ႏွင့္ <i>Notice</i>
+messages မ်ားကိုသာ log လုပ္သင့္ပါသည္။
+</p>
+
+<p>
+ျမင္ခ်င္ေသာ message ကို ေရြးခ်ယ္ရန္ ေအာက္ပါအတိုင္းျပဳလုပ္ပါ။
+<ol>
+ <li>Vidalia ၏ အေသးခ်ံဳ႕ထားေသာ menu မွ message log ကိုဖြင့္ပါ။</li>
+ <li>message log window အေပၚဘက္ရွိ <i>Settings</i> ကိုႏွိပ္ပါ။</li>
+ <li>
+ ဘယ္ဘက္ျခမ္းရွိ Message Filter group မွ ျမင္ခ်င္ေသာ message ကို check
+လုပ္ျပီးမျမင္ခ်င္ေသာ message ကို uncheck လုပ္ပါ။
+ </li>
+ <li>message အသစ္ filter ကို apply ျပဳလုပ္ရန္ <i>Save Settings</i> ကို ႏွိပ္ပါ။</li>
+</ol>
+</p>
+
+
+<a name="logfile"/>
+<h3>Logging to a File</h3>
+<p>
+Vidalia သည္လည္း message log window ထဲသို႔ log in ဝင္ျပီး log messages
+မ်ားကို ဖိုင္အျဖစ္ write လုပ္ႏိုင္ပါတယ္။ ဖိုင္ကို logging ျပဳလုပ္ျခင္းအား
+enable လုပ္ရန္ ေအာက္ပါအဆင့္မ်ားအတိုင္း လုပ္ေဆာင္ပါ:
+</p>
+
+<ol>
+ <li>Vidalia ၏ အေသးခ်ံဳ႕ထားေသာ menu မွ message log ကိုဖြင့္ပါ။</li>
+ <li>message log window အေပၚဘက္ရွိ <i>Settings</i> ကိုႏွိပ္ပါ။</li>
+ <li><i>log messages အသစ္မ်ားကို ဖိုင္အျဖစ္ အလိုအေလ်ာက္သိမ္းပါ။</i>ဆိုသည့္
+နာမည္တပ္ထားေသာ box ကို check လုပ္ပါ။ </li>
+ <li>
+ အကယ္၍ message ကို write လုပ္မယ့္ ဖိုင္ကို ေျပာင္းလဲခ်င္တယ္ဆိုလွ်င္ text box
+ထဲမွာ ဖိုင္နာမည္ႏွင့္ လမ္းေၾကာင္းေတြကို ရိုက္ထည့္ရပါမယ္။ သို႔မဟုတ္ သင္၏ log
+ဖိုင္ တည္ေနရာကို ညႊန္းဖို႔ <i>Browse</i> ကိုႏွိပ္ပါ။
+ </li>
+ <li>သင္၏ log မ်ားကို သိမ္းရန္ <i>Save Settings</i>ကို ႏွိပ္ပါ။</li>
+</ol>
+
+</body>
+</html>
+
Added: vidalia/trunk/src/vidalia/help/content/my/netview.html
===================================================================
--- vidalia/trunk/src/vidalia/help/content/my/netview.html (rev 0)
+++ vidalia/trunk/src/vidalia/help/content/my/netview.html 2011-03-02 14:22:16 UTC (rev 4526)
@@ -0,0 +1,182 @@
+
+
+<!--
+** $Id: netview.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.vidalia-project.net/. No part of Vidalia, including this file,
+** may be copied, modified, propagated, or distributed except according to
+** the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Network Viewer</h1>
+<hr />
+
+<p>
+network viewer ဟာ သင္၏ လမ္းေၾကာင္းဘယ္ကို သြားေနလဲဆိုတာရယ္၊ Tor ကြန္ယက္ေပၚက
+relays ေတြကို ၾကည့္ရႈႏိုင္ေအာင္ လုပ္ေဆာင္ေပးပါတယ္။
+</p>
+
+
+<a name="overview"/>
+<h3>ျခံဳငံုၾကည့္ျခင္း</h3>
+<p>
+Tor ကို ျဖတ္ျပီး အမည္မသိအေနနဲ႔ သင္ခ်ိတ္ဆက္လိုလွ်င္ (တနည္းအားျဖင့္
+ဝက္ဘ္ဆိုက္ကို ခ်ိတ္ဆက္ခ်င္လွ်င္)၊ Tor က tunnel တစ္ခုကို ဖန္တီးေပးပါတယ္။
+သို႔မဟုတ္ encrypt (ပံုစံဖ်က္ထားေသာ) ခ်ိတ္ဆက္မႈမ်ား၏ <i>circuit</i>သည္
+ကြန္ယက္ေပၚမွာ ရွိတဲ့ relays အတြဲလိုက္ကို ျဖတ္သန္းသြားပါလိမ့္မယ္။ သင့္
+application ရဲ႕ လမ္းေၾကာင္းေတြဟာ အဲဒိ circuit ကိုျဖတ္ျပီး
+<i>စီးဆင္းရာလမ္းေၾကာင္း</i> အျဖစ္ ပို႔ေဆာင္ မွာ ျဖစ္ပါတယ္။
+အဆင္ေျပေခ်ာေမြ႕ေစရန္ အတြက္ မ်ားစြာေသာ စီးဆင္းရာလမ္းေၾကာင္းေတြကို တူညီတဲ့
+circuit မွာပဲ ေဝမွ်ေပးမွာ ျဖစ္ပါတယ္။
+</p>
+
+<a name="netmap"/>
+<h3>ကြန္ယက္ေျမပံု</h3>
+<p>
+ကြန္ယက္ေျမပံုတြင္ အနီေရာင္ pinpoints မ်ားျဖင့္ ရည္ညႊန္းထားေသာ Tor
+ကြန္ယက္ေပၚရွိ relays မ်ား၏ ပထဝီဆိုင္ရာ ေဒသမ်ားႏွင့္ ကမၻာ့ေျမပံုပါဝင္ပါသည္။
+အစိမ္းေရာင္လိုင္းမ်ားသည္ relays မ်ားအၾကား Tor ကြန္ယက္ကို ျဖတ္၍ ဖန္တီးထားေသာ
+Tor client ျဖစ္တဲ့ circuits မ်ား၏ လမ္းေၾကာင္းကို ရည္ညႊန္းပါတယ္။
+</p>
+<p>
+ေျမပံုေပၚရွိ တည္ေနရာမ်ားကို toolbar ေပၚရွိ <b>Zoom In</b> ႏွင့္ <b>Zoom
+Out</b> ကိုႏွိပ္၍ ခ်ံဳ႕၍/ခ်ဲ႕၍ ၾကည့္ႏိုင္ပါတယ္။ ေျမပံုေပၚတြင္ မည္သည့္
+လမ္းေၾကာင္းကို မဆို သင္ေရြ႕၍ ၾကည့္လိုလွ်င္ ၎ေပၚတြင္ ႏွိပ္၍ ဆြဲေရႊ႕ျပီး
+ၾကည့္ရႈႏိုင္ပါတယ္။
+</p>
+<p>
+GeoIP database ထဲက relay ၏ IP လိပ္စာမ်ားကို ၾကည့္ျခင္းအားျဖင့္ Tor relay
+တစ္ခု၏ ပထဝီဆိုင္ရာ တည္ေနရာကို ဆံုးျဖတ္ႏိုင္ပါသည္။ ၎ကို MaxMind က ဖန္တီးထားတာ
+ျဖစ္ျပီး geoip.vidalia-project.net မွာတည္ရွိပါတယ္။
+</p>
+<p>
+ကြန္ယက္ေျမပံု၏ ေအာက္ဘက္ ဒိုင္ယာေလာ့ခ္၏ အလယ္တြင္ အဲ့ဒိ circuits မ်ားေပၚရွိ
+လတ္တေလာ application လမ္းေၾကာင္းမ်ား ကဲ့သို႔ပင္ သင္၏ လက္ရွိ circuits မ်ား
+စာရင္းကို ျမင္ေတြ႕ႏိုင္ပါတယ္။ ကြန္ယက္ ေျမပံု ပထမဆံုး စတင္တဲ့အခါမွာ Tor
+relays မ်ား၏ စာရင္းအတြက္ ပထဝီဆိုင္ရာ သတင္းအခ်က္အလက္မ်ားကို Vidalia
+ၾကည့္တဲ့ခါ ေတြ႕ရမယ့္ geoip.vidalia-project.net ကို ခ်ိတ္ဆက္မႈအား ျမင္ရမွာပါ။
+အေရးတၾကီး သိရမွာက Tor ကိုျဖတ္၍ ျပီးသြားတယ္ဆိုတာပါပဲ။ ထို႔ေၾကာင့္ GeoIP relay
+သို႔ သင့္တည္ေနရာကို ထုတ္ေဖာ္ေျပာမွာ မဟုတ္ပါဘူး။ ၾကည့္ရႈျခင္း၏ ရလဒ္ကေတာ့
+Vidalia ၏ GeoIP relays မ်ားေပၚမွာ load လုပ္တာကို ေလွ်ာ့ခ်ရန္ အလို႔ငွာ local
+မွာပဲ ဖမ္းယူေပးထားမွာ ျဖစ္ပါတယ္။
+</p>
+
+
+<a name="relaylist"/>
+<h3>Relay Status</h3>
+<p>
+network view ၏ ဘယ္ဘက္ျခမ္းတြင္ Tor ကြန္ယက္ထဲရွိ relays မ်ား စာရင္းကို
+သင္ျမင္ေတြ႕ရမွာ ျဖစ္ပါတယ္။ ေနာက္တစ္ခုကေတာ့ relay တစ္ခုခ်င္းစီဟာ relay ၏
+status ကို ညႊန္းတဲ့ icon ျဖစ္ပါတယ္။ ေအာက္ေဖာ္ျပပါ ဇယားကြက္ကေတာ့ relay status
+icons မ်ားရဲ႕ ျဖစ္ႏိုင္ေျခရွိတဲ့ အႏွစ္ခ်ဳပ္ ဇယားကြက္ ျဖစ္ပါတယ္:
+</p>
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/icons/node-unresponsive.png"/></td>
+ <td valign="middle">
+ relay သည္ offline ျဖစ္ေနျခင္း သို႔မဟုတ္ တံု႔ျပန္မႈမရရွိပါ။
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-hibernating.png"/></td>
+ <td valign="middle">
+ relay သည္ <i>hibernating</i> ျဖစ္ေနပါသည္။ ဆိုလိုတာကေတာ့ online ျဖစ္ေနတယ္
+ဒါေပမယ့္ ေပးထားေသာ အခ်ိန္အတိုင္းအတာအတြင္း operator က ခြင့္ျပဳလိုေပမယ့္
+bandwidth ေတာ္ေတာ္မ်ားမ်ားဟာ အသံုးျပဳလိုက္ျပီး ျဖစ္ေနပါတယ္။
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-none.png"/></td>
+ <td valign="middle">
+ Relay သည္ online ျဖစ္ေနသည္။ သို႔ေသာ္ ၎၏ အနိမ့္ဆံုး ႏႈန္းကို သာ
+ေဖာ္ျပထားပါသည္။
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-low.png"/></td>
+ <td valign="middle">
+ Relay သည္ အြန္လိုင္းျဖစ္ေနသည္။ ၎၏ ႏႈန္းမွာ = 20 KB/s
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-med.png"/></td>
+ <td valign="middle">
+ Relay သည္ အြန္လိုင္းျဖစ္ေနသည္။ ၎၏ ႏႈန္းမွာ = 60 KB/s
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/icons/node-bw-high.png"/></td>
+ <td valign="middle">
+ Relay သည္ အြန္လိုင္းျဖစ္ေနသည္။ ၎၏ ႏႈန္းမွာ = 400 KB/s
+ </td>
+</tr>
+</table>
+</p>
+<p>
+bandwidth တန္ဖိုးအားလံုးသည္ အျမင့္ဆံုး bandwidth ၏ input သို႔မဟုတ္
+လြန္ခဲ့ေသာ ရက္ရွိ ၁၀ စကၠန္႔စာ output ၏ အနိမ့္ဆံုးေပၚတြင္ အၾကမ္းဖ်ဥ္း
+အေျခခံပါသည္။
+</p>
+
+
+<a name="details"/>
+<h3>Relay အေသးစိတ္မ်ား</h3>
+<p>
+screen ၏ ညာဘက္ျခမ္းမွာရွိတဲ့ relay အေသးစိတ္ panel သည္ relay အေၾကာင္း
+အေသးစိတ္ သို႔မဟုတ္ <a href="#relaylist">relay စာရင္း</a> ထဲတြင္ လတ္တေလာ
+ေရြးခ်ယ္ထားေသာ realy အေၾကာင္းကို ေဖာ္ျပေပးပါသည္။ သင္၏ လတ္တေလာ circuits
+မ်ားႏွင့္ streams မ်ား စာရင္းထဲတြင္ circuit သို႔ မဟုတ္ stream ကို
+သင္ေရြးခ်ယ္ထားျပီးျပီ ဆိုလွ်င္ ၎panel သည္ relay တစ္ခုခ်င္းစီကို ျဖတ္၍
+လတ္တေလာ ေပးပို႔ေနေသာ သင္၏ လမ္းေၾကာင္း အေၾကာင္း အေသးစိတ္ကို
+ေဖာ္ျပေပးပါလိမ့္မယ္။
+</p>
+<p>
+panel ထဲတြင္ သင္ျမင္ေတြ႕ရမည့္ နယ္ပယ္မွာ ေအာက္ပါအတိုင္း ျဖစ္ပါသည္။
+(<i>မွတ္ခ်က္</i>: နယ္ပယ္ေတြအားလံုးကေတာ့ အျမဲတမ္း ေဖာ္ျပႏိုင္မွာ မဟုတ္ပါဘူး):
+</p>
+<p>
+<table>
+<tr>
+ <td><b>တည္ေနရာ</b></td>
+ <td>၎ Tor relay ၏ ပထဝီဆိုင္ရာ တည္ေနရာ။</td>
+</tr>
+<tr>
+ <td><b>IP Address</b></td>
+ <td>၎ Tor relay ေပၚရွိ IP လိပ္စာသည္ ေရာက္ရွိႏိုင္ပါသည္။</td>
+</tr>
+<tr>
+ <td><b>Platform</b></td>
+ <td>
+ ၎ relay ေပၚရွိ Operating system သတင္းအခ်က္အလက္ႏွင့္ Tor version မ်ားသည္
+လက္တေလာတြင္ run ေနပါသည္။
+ </td>
+</tr>
+<tr>
+ <td><b>Bandwidth</b></td>
+ <td>
+ bandwidth ၏ အၾကမ္းဖ်ဥ္း အမ်ားဆံုး ပမာဏျဖစ္ေသာ relays ၏ လမ္းေၾကာင္းသည္ ၎
+realy ၏ လတ္တေလာ အေျခအေနကို ထိန္းထားႏိုင္ပါလိမ့္မည္။
+ </td>
+</tr>
+<tr>
+ <td><b>Uptime</b></td>
+ <td>
+ ၎ relay ၏တည္ျငိမ္မႈကို ကူညီရန္ relay ၏ အခ်ိန္အတိုင္းတာကို ရရွိႏိုင္ပါျပီ။
+ </td>
+</tr>
+<tr>
+ <td><b>ေနာက္ဆံုး update ျပဳလုပ္ျပီးျခင္း</b></td>
+ <td>ဤ relay ေန႔စြဲ၏ သတင္းအခ်က္အလက္သည္ ေနာက္ဆံုး update ျပဳလုပ္ျပီး ျဖစ္ပါသည္။</td>
+</tr>
+</table>
+</p>
+</body>
+</html>
+
Added: vidalia/trunk/src/vidalia/help/content/my/running.html
===================================================================
--- vidalia/trunk/src/vidalia/help/content/my/running.html (rev 0)
+++ vidalia/trunk/src/vidalia/help/content/my/running.html 2011-03-02 14:22:16 UTC (rev 4526)
@@ -0,0 +1,109 @@
+
+
+<!--
+** $Id: running.html 2366 2008-03-01 17:58:23Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.vidalia-project.net/. No part of Vidalia, including this file,
+** may be copied, modified, propagated, or distributed except according to
+** the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Running Tor</h1>
+<hr />
+
+<p>
+Vidalia သည္ မေမွ်ာ္လင့္ပဲ ပရိုဂရမ္ ပိတ္သြားျခင္းကို သင္အား ေပးသိျပီး Tor ၏
+status ကို ေကာင္းစြာ ေစာင့္ၾကည့္ေလ့လာရန္ Tor ကို start ႏွင့္ stop သင့္အား
+ျပဳလုပ္ေစျခင္းအားျဖင့္ Tor process ကို သင္ ထိန္းခ်ဳပ္ႏိုင္ရန္ ကူညီေပးပါသည္။
+</p>
+
+<a name="starting"/>
+<h3>Starting and Stopping Tor</h3>
+<p>
+Tor ကို <i>start</i>လုပ္ရန္
+<ol>
+ <li>Vidalia ၏ tray meanu မွ <i>Start</i>ကို ေရြးခ်ယ္ပါ သို႔မဟုတ္
+<i>Ctrl+S</i>ကို ႏွိပ္ပါ။</li>.
+ <li>
+ Tor စတင္လိုက္တဲ့အခ်ိန္မွာ Vidalia ၏ tray icon သည္ အနီေရာင္ X ႏွင့္ onion မွ
+အစိမ္းေရာင္ onion သို႔ ေျပာင္းလဲသြားမွာ ျဖစ္ပါတယ္။
+ </li>
+</ol>
+အကယ္၍ Vidalia သည္ Tor ကို မစတင္ႏိုင္ဘူး ဆိုလွ်င္ ဘာမွားေနတယ္ဆိုတဲ့ error
+message ကို Vidalia က ျပသေပးမွာ ျဖစ္ပါတယ္။ ဘာမွားေနတယ္ဆိုတဲ့
+အခ်က္အလက္မ်ားကို Tor က ေဖာ္ျပခဲ့လွ်င္ <a href="log.html">message
+log</a>မွာလည္း ၾကည့္ရႈႏိုင္ပါတယ္။
+</p>
+
+<p>
+Tor ကို <i>stop</i>ျပဳလုပ္ရန္
+<ol>
+ <li>Vidalia ၏ tray menu မွ <i>Stop</i>ကို ေရြးခ်ယ္ပါ သို႔မဟုတ္ <i>Ctrl+T</i>
+ႏွိပ္ပါ။</li>.
+ <li>
+ Tor ကို ရပ္တန္႔လိုက္တဲ့အခါ Vidalia ၏ tray icon သည္ အစိမ္းေရာင္ onion မွ
+အနီေရာင္ X ႏွင့္အတူ မီးခိုးေရာင္ onion အျဖစ္သို႔ ေျပာင္းလဲသြား ပါလိမ့္မယ္။
+ </li>
+</ol>
+အကယ္၍ Vidalia သည္ Tor ကို မရပ္တန္႔ႏိုင္ခဲ့လွ်င္ Vidalia သည္
+ဘာမွားေနတယ္ဆိုတဲ့ error message ကို ျပသေပးမွာ ျဖစ္ပါတယ္။ အကယ္၍ Tor က
+ဘာမွားေနတယ္ဆိုတဲ့ အခ်က္အလက္မ်ားကို ေဖာ္ျပခဲ့လွ်င္ <a href="log.html">message
+log</a> မွာလည္း ၾကည့္ရႈႏိုင္ပါေသးတယ္။
+</p>
+
+<a name="monitoring"/>
+<h3>Tor ၏ Status ကို ေစာင့္ၾကည့္ေလ့လာျခင္း</h3>
+<p>
+dock area သို႔မဟုတ္ သင္၏ system tray ထဲမွာ icon ကို ေဖာ္ျပျခင္းအားျဖင့္
+Vidalia က Tor ၏ status ေတြ အေၾကာင္း သင့္ကိုေျပာျပမွာပါ။ ေအာက္ေဖာ္ျပပါ
+ဇယားကြက္သည္ သင့္ system ၏ notification area ရွိ icon က မတူညီတဲ့
+အေျခအေနေတြကို ရည္ညႊန္းထားတဲ့ ဇယားကြက္ျဖစ္ပါတယ္:
+</p>
+<p>
+<table border="1">
+<tr>
+ <td><img src="qrc:/images/32x32/tor-off.png"/></td>
+ <td valign="middle">
+ Tor ရပ္တန္႔သြားပါျပီ။ Tor ကို စတင္ရန္ Vidalia menu မွ <i>Start</i>ကို
+ေရြးပါ။
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-starting.png"/></td>
+ <td valign="middle">
+ Tor သည္ စတင္ေနပါျပီ။ စတင္ေနတဲ့အခ်ိန္မွာပဲ Tor အေၾကာင္း အခ်က္အလက္ status
+အတြက္ <a href="log.html">message log</a>ကို စစ္ပါ။
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-on.png"/></td>
+ <td valign="middle">
+ Tor သည္ run ေနပါသည္။ အကယ္၍ Tor ကို ရပ္တန္႔ခ်င္လွ်င္ Vidalia menu မွ
+<i>Stop</i> ကိုေရြးပါ။ အကယ္၍ Tor ဘာလုပ္ေနတယ္ဆိုတာ ျမင္ခ်င္ရင္ Tor က
+အခ်က္အလက္ဆိုင္ရာ messages မ်ားကို <a href="log.html">message log</a> မွာ
+ေဖာ္ျပေပးမွာ ျဖစ္ပါတယ္။
+ </td>
+</tr>
+<tr>
+ <td><img src="qrc:/images/32x32/tor-stopping.png"/></td>
+ <td valign="middle">Tor ဟာ shut down ျပဳလုပ္ေနဆဲ အေျခအေနမွာပါ။</td>
+</tr>
+</table>
+</p>
+
+<p>
+အကယ္၍ မေမွ်ာ္လင့္ပဲ Tor က ထြက္သြားခဲ့လွ်င္ Vidalia ဟာ red X ႏွင့္ အမဲေရာင္
+onion ကိုေျပာင္းလဲသြားမွာ ျဖစ္ျပီး ဘာမွားသြားတယ္ဆိုတဲ့ error message ကို
+ျပသမွာ ျဖစ္ပါတယ္။ မထြက္ခင္မွာ Tor ဟာ ျပႆနာတစ္ခုခုႏွင့္ ၾကံဳေတြ႕တဲ့ အေသးစိတ္
+အေၾကာင္းကို <a href="log.html">message log</a> မွာ စစ္ေဆးႏိုင္ပါတယ္။
+</p>
+
+</body>
+</html>
+
Added: vidalia/trunk/src/vidalia/help/content/my/server.html
===================================================================
--- vidalia/trunk/src/vidalia/help/content/my/server.html (rev 0)
+++ vidalia/trunk/src/vidalia/help/content/my/server.html 2011-03-02 14:22:16 UTC (rev 4526)
@@ -0,0 +1,266 @@
+
+
+<!--
+** $Id: server.html 4323 2010-06-26 15:46:44Z runa $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.vidalia-project.net/. No part of Vidalia, including this file,
+** may be copied, modified, propagated, or distributed except according to
+** the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Tor Relay တစ္ခုကို စတင္ျပင္ဆင္ျခင္း</h1>
+<hr />
+
+Tor ကြန္ယက္သည္ တကမၻာလံုးက ေစတနာ့ဝန္ထမ္းေတြဟာ Tor realy ကို run ျပီး ၎၏ အရံ
+bandwidth ေတြကို လွဴဒါန္းျခင္း အားျဖင့္ တည္ေဆာက္ထားပါတယ္။ Vidalia သည္
+သင့္ကိုယ္တုိင္ realy ကို အလြယ္တကူ set up ျပဳလုပ္ေစျခင္းအားျဖင့္ သင့္ကို
+အစိတ္အပိုင္း တစ္ခုအျဖစ္ပါဝင္ေစရန္ ကူညီေပးပါတယ္။ <a name="basic"/>
+<h3>အေျခခံ Setting မ်ား</h3>
+<p>
+အကယ္၍ realy ကို run ျပီး Tor ကြန္ယက္ကို ဖြံ႕ျဖိဳးေစဖို႔ သင္ကူညီလုိတယ္ဆိုရင္
+စတင္ဖို႔အတြက္ ဤအခ်က္မ်ားကို လိုက္လုပ္ ႏိုင္ပါတယ္:
+</p>
+<ol>
+ <li>
+ Macintosh systems တြင္ သင္၏ system menubar မွ <i>အသြင္အျပင္</i> သို႔မဟုတ္
+tray menu မွ <i>Settings</i> ကိုေရြးခ်ယ္ျခင္းအားျဖင့္ <i>ျပင္ဆင္ျခင္း
+Dialog</i> ကို ဖြင့္ပါ။
+ </li>
+ <li><i>Relay</i> ျပင္ဆင္ျခင္းစာမ်က္ႏွာကို ေရြးခ်ယ္ပါ။</li>
+ <li>
+ မည္သည့္ ပံုမွန္ Tor relay သို႔မဟုတ္ <i>bridge</i> relay (Tor 0.2.0.8-alpha
+သို႔မဟုတ္ ဗားရွင္းအသစ္မ်ား) ကို သင္ run လိုသည္ဆိုတာကို ဆံုးျဖတ္ပါ။ Bridge
+relays ေတြဟာ Tor ကြန္ယက္ကို တိုက္ရိုက္ ဆက္သြယ္ျခင္းကို ပိတ္ဆို႔ျခင္း
+ခံထားရတဲ့ Tor အသံုးျပဳသူမ်ားရဲ႕ ဆင္ဆာျဖတ္ထားျခင္းခံရတာကို ကူညီေပးပါတယ္။
+အကယ္၍ ပံုမွန္ Tor relay ကို run ခ်င္ရင္ <i>Tor ကြန္ယက္အတြက္ Relay
+လမ္းေၾကာင္း</i> သို႔မဟုတ္ bridge relay ကို run ခ်င္လွ်င္ <i>Tor ကြန္ယက္သို႔
+ေရာက္ရွိရန္ ဆင္ဆာ အျဖတ္ခံထားရေသာ အသံုးျပဳသူမ်ားကို ကူညီပါ</i> ဆိုေသာ box
+မ်ားကို check လုပ္ပါ။
+ </li>
+ <li>ေအာက္ပါအခ်က္အလက္မ်ားကို ထည့္သြင္းပါ။</li>
+ <ul>
+ <li><b>နာမည္ေျပာင္</b>: Tor ကြန္ယက္ေပၚတြင္ သင့္ relay နာမည္ကို သိရွိႏိုင္ပါသည္။
+ဥပမာအားျဖင့္ relay နာမည္ေျပာင္ "MyVidaliaRelay" ျဖစ္သည္။
+ </li>
+ <li><b>ဆက္သြယ္ရန္အခ်က္အလက္</b>: သင့္အီးေမးလ္လိပ္စာ။ ၎လိပ္စာကို အေရးၾကီးေသာ Tor
+လံုျခံဳေရးဆိုင္ရာ update မ်ား သို႔မဟုတ္ သင့္ relay တစ္ခုခု မွားယြင္းေနရင္တဲ့
+ကိစၥရပ္မ်ား ရွိခဲ့ရင္ ဆက္သြယ္ဖို႔ အသံုးျပဳမွာပါ။ PGP သို႔မဟုတ္ GPG key ID
+ႏွင့္ fingerprint တို႔ ပါရွိရပါမယ္။
+ </li>
+ <li><b>Relay Port</b>: သင့္ relay ေပၚရွိ ၎ port သည္ clients မ်ားဆီက သို႔မဟုတ္
+အျခား Tor relays မ်ားဆီက လမ္းေၾကာင္းမ်ားကို နားေထာင္ပါလိမ့္မည္။
+ </li>
+ </ul>
+ <li>
+ အကယ္၍ ကြန္ယက္ေပၚရွိ အျခားသူမ်ား အတြက္ relays မ်ား၏ mirror Tor's directory
+ျပဳလုပ္လိုလွ်င္ <i>Mirror the Relay Directory</i> box ကို check လုပ္ပါ။
+အကယ္၍ bandwidth မ်ားမ်ားစားစား မရွိဘူးဆိုရင္ေတာ့ ၎boxကို uncheck လုပ္ပါ။
+အကယ္၍ relay directory ကို mirror ျပဳလုပ္ဖို႔ ဆံုးျဖတ္တယ္ဆိုရင္ သင္အထက္တြင္
+ထည့္ထားေသာ <i>Relay port</i> ႏွင့္ <i>Directory Port</i> တို႔ ကြဲျပားေနပါေစ။
+Bridge relay ေတြဟာ <i>မျဖစ္မေန</i> relay directory ကို mirror ျပဳလုပ္ဖို႔
+လိုပါတယ္။
+ </li>
+</ol>
+
+<a name="bandwidth"/>
+<h3>Bandwidth ကန္႔သတ္ခ်က္မ်ား</h3>
+<p>
+Tor relay ကို run ျခင္းသည္ bandwidth ၏ ၾကီးမာေသာ ပမာဏကို ကုန္ေစပါသည္။
+ဘယ္လိုပဲျဖစ္ျဖစ္ Tor ဟာ သင္ Tor network ကို ပူးေပါင္းပါဝင္ခ်င္ေသာ
+ဆႏၵရွိတဲ့အတြက္ သင့္ကို bandwidth ပမာဏကို ကန္႔သတ္ခြင့္ေပးပါသည္။
+သင့္ကိုယ္ပိုင္ အသံုးျပဳမႈအတြက္ အသံုးျပဳႏိုင္ေသာ ကြန္ယက္ဆက္သြယ္မႈကို
+သိမ္းထားတုန္း အခ်ိန္မွာပဲ relay ကို run ႏိုင္ပါတယ္။
+</p>
+<p>
+သင္ ဆက္သြယ္မႈျမန္ႏႈန္းႏွင့္ လိုက္ဖက္မယ့္ dropdown box ထဲက option ကို
+ေရြးခ်ယ္သင့္ပါတယ္။ အကယ္၍ <i>ကိုယ္ပိုင္</i>ဆိုတာကို ေရြးခ်ယ္ခဲ့လွ်င္
+သင့္ကိုယ္ပိုင္ ကန္႔သတ္ခ်က္မ်ား ကို သတ္မွတ္ရပါလိမ့္မယ္။
+</p>
+<h4>ကိုယ္ပိုင္ကန္႔သတ္ခ်က္မ်ား</h4>
+<p>
+<i>အျမင့္ဆံုးႏႈန္း</i> သည္ bytes အစုေပါင္းျဖစ္ျပီး
+သတ္မွတ္ထားေသာ<i>ပ်မ္းမွ်ႏႈန္း</i>ထက္ ျမန္ဆန္ေသာ လမ္းေၾကာင္း ၏ ကာလတို
+အေတာတြင္း ေတာင္းဆိုမႈမ်ားကို ျဖည့္ဆည္းေပးရန္ အတြက္ အသံုးျပဳသည္။ သို႔ေသာ္
+ကာလရွည္မ်ားတြင္ ပ်မ္းမွ်ႏႈန္းကို ျပဳျပင္ေနဆဲ ျဖစ္သည္။ အကယ္၍ ပ်မ္းမွ်သည္
+ေနာက္က်ျပီး မေရာက္ခဲ့ဘူးဆိုလွ်င္ peak times အေတာအတြင္း
+လမ္းေၾကာင္းအမ်ားျပားကို ခြင့္ျပဳေနခ်ိန္မွာပဲ နိမ့္ေသာ ပ်မ္းမွ်ႏႈန္း ဒါေပမယ့္
+ျမင့္ေသာ အျမင့္ဆံုး ႏႈန္းေတြဟာ ေရရွည္ကာလ ပ်မ္းမွ်ႏႈန္း အတြက္ အတည္ျပဳေပးမွာ
+ျဖစ္ပါသည္။ အကယ္၍ သင္၏ ပ်မ္းမွ်ႏႈန္းသည္ <i>အျမင့္ဆံုးႏႈန္း</i>ႏွင့္
+တူညီေနလွ်င္ Tor သည္ သတ္မွတ္ထားေသာ ႏႈန္းထက္ ဘယ္ေတာ့မွ ပိုလြန္မွာ မဟုတ္ပါဘူး။
+သင္၏ <i>အျမင့္ဆံုးႏႈန္း</i> သည္ အျမဲတမ္း <i>ပ်မ္းမွ်ႏႈန္း</i> ထက္
+ၾကီးရင္ၾကီး သို႔မဟုတ္ တူညီေနရပါမယ္။
+</p>
+<p>
+<i>ပ်မ္းမွ်ႏႈန္း</i> သည္ အျမင့္ဆံုး ကာလရွည္ၾကာ ခြင့္ျပဳေသာ bandwidth
+(kilobytes per second ျဖင့္) ျဖစ္သည္။ ဥပမာအားျဖင့္ 2 megabytes per second
+(2048 KB/s), သို႔မဟုတ္ 50 kilobytes per second (cable ဆက္သြယ္မႈ၏
+ပုံမွန္ျမန္ႏႈန္း)ကို သင္ေရြးခ်ယ္လိုျခင္း ျဖစ္သည္။ Tor သည္ အနိမ့္ဆံုး relay
+ကို run ရန္ 20 kilobytes per second လိုအပ္သည္။
+</p>
+<p>
+အေရးတၾကီး သတိရ ရမွာက Tor ဟာ bandwidth ေတြကို <b>bytes</b> နဲ႔တိုင္းတာပါတယ္။
+bits မဟုတ္ပါ။ Tor ဟာ ထြက္သြားတဲ့ bytes ေတြအစား ဝင္လာတဲ့ bytes ေတြကိုသာ
+ၾကည့္ပါတယ္။ ဥပမာအားျဖင့္ အကယ္၍ သင့္ realy ဟာ directory mirror အျဖစ္
+ျပဳမူတယ္ဆိုရင္ ဝင္လာေသာ bytes မ်ားထက္ ပို၍ထြက္သြားေသာ bytes မ်ားကို
+သင္ေပးပို႔မည္ ျဖစ္သည္။ အကယ္၍ ၎သည္ ျပႆနာ တစ္ခု ျဖစ္သည္ဟု သင္ရွာေဖြ႕ေတြ႕ရွိ
+ခဲ့လွ်င္ ၊ သင့္ bandwidth ေပၚတြင္ အားစိုက္မႈမ်ား အလြန္အမင္း သြတ္သြင္း
+ေနတယ္လို႔ ရွာေဖြေတြ႕ရွိခဲ့လွ်င္ <i>Mirror the relay directory</i> checkbox
+ကို uncheck ျပဳလုပ္ရန္ သင္ဆံုးျဖတ္သင့္သည္။
+</p>
+
+<a name="exitpolicy"/>
+<h3>ထြက္ပံုထြက္နည္းမ်ား</h3>
+<p>
+ထြက္ပံုထြက္နည္းမ်ားသည္ အင္တာနက္ေပၚက မည္သည့္ အရင္းျမစ္အမ်ိဳးအစား ကို သင့္ Tor
+relay မွ အျခားေသာ Tor အသံုးျပဳသူမ်ား ရယူခြင့္ျပဳရန္ သတ္မွတ္ေပးေသာ
+နည္းလမ္းျဖစ္သည္။ Tor က အျခားေသာ ဝန္ေဆာင္မႈမ်ားကို ကန္႔သတ္ထားတဲ့
+ရွိေနျပီးသားမူဝါဒမ်ား စာရင္း မူရင္းကို အသံုးျပဳသည္။ ေမးလ္က spam မ်ားကို
+ကာကြယ္ရန္ႏွင့္ အခ်ိဳ႕ေသာ မူရင္း ဖိုင္ေဝမွ်ျခင္း ports မ်ားသည္ Tor ကြန္ယက္ကို
+ေႏွာင့္ယွက္ျခင္းကို ေလွ်ာ့ခ်ေပးသကဲ့သို႔ ျဖစ္သည္။
+</p>
+<p>
+checkbox ေတြရဲ႕ တစ္ခုခ်င္းစီဟာ သင့္ relay ကို ျဖတ္၍ access လုပ္တာကို Tor
+အသံုးျပဳသူမ်ားအား သင္ခြင့္ျပဳႏိုင္တဲ့ အရင္းျမစ္အမ်ိဳးအစားကို
+ကိုယ္စားျပဳပါတယ္။ အကယ္၍ အရင္းျမစ္အမ်ိဳးစား တစ္ခုခ်င္းစီအလိုက္ uncheck
+လုပ္ခဲ့မယ္ဆိုရင္ သင့္ relay ကေန ၎အရင္းျမစ္မ်ားကို ရယူရန္ Tor
+အသံုးျပဳသူမ်ားအား ခြင့္ျပဳလိမ့္မည္ မဟုတ္ေပ။ <i>Misc
+အျခားေသာဝန္ေဆာင္မႈမ်ား</i> ဟု label တပ္ထားေသာ box ကို check
+လုပ္ျပီးျပီးဆိုလွ်င္ အျခား checkboxes မ်ား အားျဖင့္ Tor အသံုးျပဳသူမ်ားဟာ
+အျခားေသာ ဝန္ေဆာင္မႈမ်ား ကို ရယူႏိုင္ပါလိမ့္မည္။ သို႔မဟုတ္ Tor ၏ မူရင္း
+ရွိေနျပီးသား မူဝါဒ။
+</p>
+
+<p>
+ပိုမိုျပည့္စံုရန္အတြက္ ရွိျပီးသား မူဝါဒ checkboxes မ်ား တစ္ခုခ်င္းစီကို
+ေအာက္ေဖာ္ျပပါ သတ္မွတ္ထားေသာ port နံပါတ္မ်ား ဇယားကြက္ စားရင္းမ်ားက
+ကိုယ္စားျပဳပါတယ္။ <b>ေဖာ္ျပခ်က္</b> ေကာ္လံတြင္ အကယ္၍ ဆက္စပ္ေသာ box ကို check
+လုပ္ခဲ့တယ္ဆိုလွ်င္ Tor clients မ်ား၏ အရင္းျမစ္မ်ားက သင့္ relay ကို ျဖတ္၍
+ရယူရန္ ခြင့္ျပဳတာကို ေဖာ္ျပေပးမည္ ျဖစ္သည္။
+</p>
+
+<table border="1">
+<tr>
+ <td><b>Checkbox</b></td>
+ <td><b>Ports</b></td>
+ <td><b>ေဖာ္ျပခ်က္</b></td>
+</tr>
+<tr>
+ <td>Websites</td>
+ <td valign="middle">80</td>
+ <td>ပံုမွန္ encrypt မလုပ္ထားေသာ Web browsing</td>
+</tr>
+<tr>
+ <td>Secure Websites (SSL)</td>
+ <td valign="middle">443</td>
+ <td>Web browsing ကို encrypt လုပ္ျခင္း</td>
+</tr>
+<tr>
+ <td>Retrieve Mail (POP, IMAP)</td>
+ <td valign="middle">110, 143, 993, 995</td>
+ <td>Downloading email (အီးေမးလ္ေပးပို႔ျခင္းကို ခြင့္မျပဳ)</td>
+</tr>
+<tr>
+ <td>Instant Messaging (IM)</td>
+ <td valign="middle">703, 1863, 5050, 5190, 5222, 5223, 8300, 8888</td>
+ <td>Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber</td>
+</tr>
+<tr>
+ <td>Internet Relay Chat (IRC)</td>
+ <td valign="middle">6660-6669, 6697, 7000-7001</td>
+ <td>IRC clients and servers</td>
+</tr>
+<tr>
+ <td>Misc. အျခားေသာဝန္ေဆာင္မႈမ်ား</td>
+ <td valign="middle">*</td>
+ <td>ျပီးခဲ့ေသာ checkboxes မ်ားသည္ အျခားေသာ applications မ်ားအားလံုးကို
+မျခံဳငံုႏိုင္ပါ။</td>
+</tr>
+</table>
+
+<p>
+အကယ္၍ သင့္ relay ကေန Tor အသံုးျပဳသူမ်ားက Tor ကြန္ယက္ ျပင္ပဆက္သြယ္မႈ
+ျပဳလုပ္မည္ကို ခြင့္မျပဳဘူးဆိုလွ်င္ checkboxes ေတြအားလံုးကို uncheck
+လုပ္ႏိုင္ပါတယ္။ သင္ checkboxes ကို uncheck လုပ္ခဲ့ရင္ေတာင္ သင့္ relay ဟာ Tor
+ကြန္ယက္ကို အက်ိဳးျပဳေနအံုးမွာပါ။ သင့္ relayသည္ အျခားေသာ အသံုးျပဳသူမ်ားက Tor
+ကြန္ယက္ကို ဆက္သြယ္ရန္ ခြင့္ျပဳလိမ့္မည္ ျဖစ္ျပီး အျခား Tor relays မ်ားအၾကား
+relay လမ္းေၾကာင္းကိုလည္း ကူညီေပးလိမ့္မည္ ျဖစ္သည္။
+</p>
+<p>
+အကယ္၍ bridge relay ကို run ဖို႔ ေရြးခ်ယ္လိုက္တယ္ဆိုရင္၊bridge relays မ်ားသည္
+ရွိေနေသာ ဆက္သြယ္မႈမ်ားကို ခြင့္မျပဳဘူး ဆိုကတည္းက <i>Exit Policies</i> tab
+သည္ မီးခိုးေရာင္ေျပာင္းသြားလိမ့္မည္။ Tor ကြန္ယက္ကို Tor clients မ်ား
+ခ်ိတ္ဆက္မွသာ Bridges မ်ားကို အသံုးျပဳႏိုင္သည္။
+</p>
+
+
+<a name="upnp"/>
+<h3>Port Forwarding</h3>
+<p>
+မ်ားစြာေသာ အိမ္တြင္အသံုးျပဳသူမ်ားသည္ local ကြန္ယက္ေပၚရွိ ေျမာက္ျမားစြာေသာ
+ကြန္ျပဴတာမ်ားကို တူညီေသာ အင္တာနက္ဆက္သြယ္မႈအား မွ်ေဝေပးရန္
+ခြင့္ျပဳေသာ<i>router</i> မွတဆင့္ အင္တာနက္ကို ခ်ိတ္ဆက္ၾကသည္။ အခ်ိဳ႕ေသာ
+အသံုးျပဳသူမ်ားသည္ အင္တာနက္ေပၚရွိ အျခားေသာ ကြန္ျပဴတာမ်ားမွ သင့္ကြန္ျပဴတာသို႔
+ဝင္ေရာက္လာသည့္ ဆက္သြယ္မႈမ်ားကို ပိတ္ဆို႔မည့္ <i>firewall</i> ၏
+အေနာက္တြင္လည္း ရွိေနတတ္သည္။ အကယ္၍ Tor relay ကို run ခ်င္တယ္ဆိုလွ်င္ အျခားေသာ
+Tor clients မ်ားႏွင့္ relays မ်ားသည္ အိမ္သံုး router သို႔မဟုတ္ firewall
+ကိုျဖတ္၍ သင္၏ relay ကို ခ်ိတ္ဆက္ရပါလိမ့္မယ္။
+</p>
+
+<p>
+သင့္ realy ကို အမ်ားက ဝင္ၾကည့္ႏိုင္ေအာင္ ျပဳလုပ္ရန္ <i>port
+forwarding</i>ကို ျပင္ဆင္ျခင္း အားျဖင့္ သင္၏ router သို႔မဟုတ္ firewall သည္
+သင့္ကြန္ျပဴတာကို ျဖတ္၍ မည္သည့္ ports မ်ားကို ခြင့္ျပဳရမယ္ဆိုတာ သိရွိရန္
+လိုအပ္ပါသည္။ Port forwarding ျပင္ဆင္ျခင္းသည္ သင္၏ router သို႔မဟုတ္ firewall
+က ဆက္သြယ္မႈအားလံုးကို "forward" ျပဳလုပ္ရန္ သင္၏ router သို႔မဟုတ္ firewall က
+ကြန္ျပဴတာေပၚရွိ local ports မ်ားကို ရရွိရန္ အတြက္ ျဖစ္သည္။
+</p>
+
+<p>
+<i>port forwarding ျပဳလုပ္ရန္အလိုအေလ်ာက္ ျပင္ဆင္ရန္ ၾကိဳးစားျခင္း</i> label
+တပ္ထားေသာ box ကို check လုပ္ခဲ့လွ်င္ သင္၏ local ကြန္ယက္ ဆက္သြယ္မႈတြင္
+Vidalia သည္ အလိုအေလ်ာက္ port forwarding ျပဳလုပ္ရန္အတြက္ ျပင္ဆင္ဖို႔ ၾကိဳးစား
+ေပးမွာ ျဖစ္ပါတယ္။ ထို႔ေၾကာင့္ တစ္ျခား Tor clients မ်ားဟာ သင့္ relay ကို
+ဆက္သြယ္ႏုိင္မွာ ျဖစ္ပါတယ္။ routers အားလံုးကေတာ့ အလိုအေလ်ာက္ port forwarding
+ျပဳလုပ္ျခင္းကို အေထာက္ကူေပးမွာ မဟုတ္ပါဘူး။Vidalia သည္ port forwarding ကို
+အလိုအေလ်ာက္ set up ျပဳလုပ္ခဲ့လွ်င္ <i>Test</i> button ၏ ေဘးရွိ checkbox ကို
+အသံုးျပဳႏိုင္ပါတယ္။
+</p>
+
+<p>
+<i>Test</i> butons သည္ port forwarding ကို set up ျပဳလုပ္ရန္အတြက္ Vidalia
+သည္ unable ျဖစ္ေနသည္ကို ရွာေဖြေတြ႕ရွိခဲ့လွ်င္ router ရွိ ၎ feature ကုိ
+enable လုပ္ျခင္း သို႔မဟုတ္ port forwarding ကို manual အားျဖင့္ set up
+ျပဳလုပ္ဖို႔ လုိအပ္မွာ ျဖစ္ပါတယ္။ တစ္ခ်ိဳ႕ network ပစၥည္းမ်ားတြင္
+<i>Universal Plug-and-Play</i> (UPnP) လို႔ေခၚတဲ့ feature ရွိပါတယ္။ အကယ္၍
+router ၏ စီမံခန္႔ခြဲသူ မ်က္ႏွာစာကို သင္ ဝင္ၾကည့္ႏိုင္သည္ ဆိုလွ်င္ UPnP ကို
+enable ျပဳလုပ္ရန္ option ကို ရွာေဖြသင့္ပါတယ္။ router အမ်ားစုအတြက္
+စီမံခန္႔ခြဲသူ မ်က္ႏွာစာကို Web browser တြင္ <a
+href="http://192.168.0.1/">http://192.168.0.1</a> သို႔မဟုတ္ <a
+href="http://192.168.1.1/">http://192.168.1.1</a> ကို ဖြင့္ျခင္းအားျဖင့္
+ဝင္ၾကည့္ႏိုင္ပါတယ္။ မ်ားစြာေသာ အခ်က္အလက္မ်ားအတြက္ သင့္ router ၏
+ညႊန္ၾကားခ်က္မ်ားကို manual အားျဖင့္ အၾကံဉာဏ္ယူသင့္ပါတယ္။
+</p>
+
+<p>
+port forwarding ကို manual အားျဖင့္ set up လုပ္ဖို႔ လိုအပ္ခဲ့လွ်င္ <a
+href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm">
+portforward.com</a> ဝက္ဘ္ဆိုက္တြင္ routers ႏွင့္ firewalls အမ်ိဳးစံုအတြက္
+port forwarding ကို မည္သို႔ set up ျပဳလုပ္ရမည္ဆိုေသာ လမ္းညႊန္ခ်က္မ်ား
+ရွိပါတယ္။ အနိမ့္ဆံုးအေနႏွင့္ အျခားေသာ Windows ႏွင့္ 9001 operating systems
+မ်ားတြင္ မူရင္းတန္ဖိုး port 443 ျဖစ္ေနေသာ<i>Relay Port</i> ကို forward
+ျပဳလုပ္ေပးဖို႔ လိုအပ္မွာ ျဖစ္ပါတယ္။ <i>Mirror the relay directory</i> label
+တပ္ထားေသာ checkbox ကို check လုပ္ျပီးျပီ ဆိုလွ်င္ <i>Directory
+Port</i>ကိုလည္း forward ျပဳလုပ္ေပးဖို႔ လိုအပ္မွာ ျဖစ္ပါတယ္။ <i>Directory
+Port</i> သည္ opreating systems မ်ားအားလံုးတြင္ မူရင္းတန္ဖိုး port 9030 အျဖစ္
+ရွိေနမွာပါ။
+</p>
+
+</body>
+</html>
+
Added: vidalia/trunk/src/vidalia/help/content/my/services.html
===================================================================
--- vidalia/trunk/src/vidalia/help/content/my/services.html (rev 0)
+++ vidalia/trunk/src/vidalia/help/content/my/services.html 2011-03-02 14:22:16 UTC (rev 4526)
@@ -0,0 +1,144 @@
+
+
+<!--
+** $Id $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.vidalia-project.net/. No part of Vidalia, including this file,
+** may be copied, modified, propagated, or distributed except according to
+** the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Hidden Services</h1>
+<hr />
+
+သတိျပဳရန္၊ Vidalia ရွိ Hidden service အတြက္ ေထာက္ပံ့မႈသည္ အသစ္ျဖစ္ပါသည္။ bug
+မ်ားလည္းရွိေနႏိုင္ၿပီး သင္၏ hidden service configuration ကိုလည္း
+အေႏွာင့္အယွက္ေပးႏိုင္သည္။ ထို႔ေၾကာင့္ ထိုတခုထဲကို ပံုေအာအားမကိုးပါႏွင့္။ bug
+သို႔မဟုတ္ feature အသစ္အတြက္ မွတ္ခ်က္ရွိပါက အသိေပးပါ။ <a name="about"/>
+<h3>hidden service ဆိုတာဘာလဲ</h3>
+<p>
+hidden service က သင့္ကို HTTP service သို႔မဟုတ္ IP လိပ္စာမေဖာ္ျပပဲလုပ္ရသည့္
+TCP အေျခခံ service အကုန္ ေထာက္ပံ့ေပးႏိုင္ပါသည္။ hidden service
+ကိုေထာက္ပံ့ေပးမည့္ protocol ကို Tor က လံုၿခံဳေရးအတြက္အသံုးျပဳထားသည့္
+အခ်က္အလက္မ်ားရွိသည့္ circuit မ်ားတြင္ တည္ေဆာက္ထားပါသည္။
+</p>
+
+<p>
+hidden service အတြက္ အေသးစိတ္အခ်က္လက္မ်ားကို Tor's design paper
+(doc/design-paper/tor-design.pdf) သို႔မဟုတ္ Rendezvous Specification
+(doc/spec/rend-spec.txt)၏ က႑ ၅ တြင္ဖတ္ပါ။
+</p>
+
+<a name="provide"/>
+<h3>hidden service ကိုဘယ္လို ေထာက္ပံ့ေပးရမလဲ</h3>
+<p>
+hidden service ကိုေထာက္ပံ့ျခင္းတြင္ အနည္းဆံုးအဆင့္ ၂ ခုရွိပါသည္
+<ol>
+ <li>web server ကိုသြင္းယူျခင္း (IRC ကဲ့သို႔ သင္ေထာက္ပံ့လိုေသာ မည္သည့္ service
+မဆို၏ဆာဗာအတြက္) local request မ်ားကိုၾကည့္ပါ။</li>
+ <li>သင္၏ hidden service ကို configure လုပ္ပါ။ ထိုအခါမွ သင့္ local server ထဲကို
+Tor user မ်ားထံမွ relay request မ်ားေရာက္ပါမည္။</li>
+</ol>
+Tor website (https://www.torproject.org/docs/tor-hidden-service.html)တြင္
+အေသးစိတ္ကို အဆင့္လိုက္ျပထားေသာ tutorial ေကာင္းမ်ားရွိပါသည္။
+</p>
+
+<a name="data"/>
+<h3>ဘယ္ေဒတာေတြကို ေထာက္ပံ့ေပးဖို႔လိုသလဲ။</h3>
+<p>
+service table တြင္ configured hidden အေၾကာင္းပါဝင္ေသာ colum ၅ ခုပါရွိသည္။
+<ul>
+ <li>Onion လိပ္စာ (ေဖာ္ျပျပီး): Tor သည္ သင့္ဝန္ေဆာင္မႈကို ေရြးထုတ္ျခင္းအားျဖင့္
+ဝန္ေဆာင္မႈ (သို႔မဟုတ္ onion) လိပ္စာကို ေဖာ္ျပေပးပါသည္။ ဝန္ေဆာင္မႈကို
+ရယူႏိုင္ေသာ သူေတြကို onion လိပ္စာကို ေပးပါ။ "Copy to clipboard" button ကို
+typos အား ေရွာင္ၾကဥ္ရန္ အသံုးျပဳႏိုင္သည္။ အကယ္၍ ဝွက္ထားေသာ ဝန္ေဆာင္မႈကို
+ဖန္တီးျပီးသြားခဲ့လွ်င္ "[Created by Tor]" လို႔ ေျပာလိမ့္မည္။ onion လိပ္စာ
+အစစ္မွန္ကို ျပသရန္ အလို႔ငွာ သင့္ ျပင္ဆင္ခ်က္မ်ားကို သိမ္းထားရန္ လိုအပ္ျပီး
+setting မ်ား၏ window ကို ျပန္ဖြင့္ရ လိုအပ္မည္ ျဖစ္သည္။</li>
+ <li>Virtual Port (လိုအပ္သည္): ၎သည္ သင့္ဝန္ေဆာင္မႈကို ရယူရန္ အလို႔ငွာ client က
+သိရန္ လိုအပ္ေသာ TCP port ျဖစ္သည္။ ပံုမွန္အားျဖင့္ သတ္မွတ္ထားေသာ ဝန္ေဆာင္မႈ
+port ကို အသံုးျပဳလိမ့္မည္။ ဥပမာ HTTP အတြက္ port 80 ။ virtual port သည္
+ပံုမွန္အားျဖင့္ firewall setting မ်ားႏွင့္ ျပဳလုပ္ရန္ မရွိပါ
+အဘယ့္ေၾကာင့္ဆုိေသာ္ ၎သည္ Tor ကို internally သာ အသံုးျပဳေသာေၾကာင့္ ျဖစ္သည္။</li>
+ <li>Target (optional): "Virtual Port" ထဲရွိ သင္သတ္မွတ္ထားသည့္ တစ္ခုထက္ မတူညီေသာ
+port ေပၚရွိ localhost ကို Tor ဆီမွ relay ဆက္သြယ္မႈ request
+ပံုမွန္ျပဳလုပ္လိမ့္မည္။ ထို႔ေၾကာင့္ ဦးတည္ခ်က္ပါဝင္ေသာ physical လိပ္စာကို
+သင္သတ္မွတ္ႏိုင္ျပီး port ဆီမွ သင့္ဝွက္ထားေသာ ဝန္ေဆာင္မႈဆီသို႔ redirect
+ျပဳလုပ္ရန္ request လုပ္ႏိုင္သည္။ ဥပမာ localhost:5222 သို႔ (သို႔မဟုတ္ port
+သည္ သင့္ဆာဗာကို မည္သို႔ listen ျပဳလုပ္သည္ျဖစ္ေစ)။ မည္သည့္ ဦးတည္ခ်က္ကိုမွ
+သင္မသတ္မွတ္ ႏိုင္ခဲ့လွ်င္ localhost ထဲရွိ "Virtual Port" ထဲတြင္ port
+သတ္မွတ္ရန္ Tor က request မ်ားကို redirect လုပ္လိမ့္မည္။</li>
+ <li>Service Directory (required): Tor သည္ သပ္သပ္စီ ခြဲထုတ္ထားေသာ directory
+ထဲတြင္ အခ်ိဳ႕ ဝွက္ထားေသာ ဝန္ေဆာင္မႈ သတ္မွတ္ခ်က္ဖိုင္မ်ားကို သိမ္းထားရန္
+လိုအပ္သည္။ ဥပမာ- private key ႏွင့္ onion လိပ္စာ ပါဝင္ေသာ hostname ဖိုင္။ ၎
+directory သည္ ဝန္ေဆာင္မႈက ေထာက္ပံ့ေပးေသာ content မ်ားပါဝင္ေသာ directory
+ႏွင့္ ကြဲျပားသင့္သည္။ ဝန္ေဆာင္မႈ directory အတြက္ အေကာင္းဆံုး ေနရာသည္ Tor ၏
+data directory ထဲတြင္ directory အခြဲတစ္ခုသာ ျဖစ္သင့္သည္။ run ေနေသာ
+ဝန္ေဆာင္မႈ၏ directory ကို မေျပာင္းႏိုင္သည္ကို မွတ္ထားပါ။ (၎ကို ခြင့္ျပဳရန္
+မျဖစ္ႏိုင္ပါ အဘယ့္ေၾကာင့္ဆိုေသာ္ သင့္ hard disk ေပၚရွိ directory မ်ားကို
+ဖယ္ထုတ္ရန္ အေထာက္ကူမေပးႏိုင္ပါ) အကယ္၍ အျခားေသာ directory သို႔ ဝွက္ထားေသာ
+ဝန္ေဆာင္မႈကို ေရႊ႕ေျပာင္းခ်င္လွ်င္ ေက်းဇူးျပဳ၍ ေအာက္ပါအတိုင္း ျပဳလုပ္ပါ:
+Vidalia ထဲရွိ ဝန္ေဆာင္မႈကို disable ျပဳလုပ္ရန္ စတင္ပါ။ ျပင္ဆင္ခ်က္မ်ားကို
+သိမ္းပါ။ ထို႔ေနာက္ သင့္ hard disk ေပၚက directory ကို ေနရာအသစ္သို႔ ေရႊ႕ပါ။
+Vidalia ထဲရွိ directory ကို ေနရာ အသစ္သို႔ ေျပာင္းပါ။ ဝန္ေဆာင္မႈကို enable
+လုပ္ပါ။ ျပင္ဆင္ခ်က္အသစ္ကို သိမ္းပါ။</li>
+ <li>Enabled: အကယ္၍ checkbox ကို disable လုပ္ထားလွ်င္ Vidalia သည္ Tor ထဲရွိ
+ဝွက္ထားသည့္ ဝန္ေဆာင္မႈကို မျပင္ဆင္ႏိုင္ပါ။ ၎သည္ လက္ရွိအသံုးမလိုေသာ
+ဝန္ေဆာင္မႈ၏ ျပင္ဆင္ခ်က္မ်ားကို သိမ္းထား ျခင္းအားျဖင့္ ေနာက္ပိုင္းအသံုးျပဳရန္
+အသံုးဝင္ႏိုင္သည္။ enable မလုပ္ထားေသာ ဝန္ေဆာင္မႈမ်ား အားလံုးကို သတ္မွတ္ထားေသာ
+Vidalia ျပင္ဆင္ခ်က္ ဖိုင္ vidalia.conf ထဲတြင္ သိမ္းထားသည္။</li>
+</ul>
+</p>
+
+<a name="buttons"/>
+<h3>button ငါးခုက ဘာအတြက္ အသံုးျပဳတာလဲ?</h3>
+<p>
+<ul>
+ <li>ဝန္ေဆာင္မႈမ်ားကိုထပ္ေပါင္းျခင္း: ဝန္ေဆာင္မႈအသစ္ ျပင္ဆင္မႈမ်ားကို ဖန္တီးပါ။</li>
+ <li>ဝန္ေဆာင္မႈမ်ားကိုျဖဳတ္ျခင္း: ဝွက္ထားေသာ ဝန္ေဆာင္မႈ ျပင္ဆင္ျခင္းမ်ားကို ထာဝရ
+ျဖဳတ္ပစ္သည္။ (အကယ္၍ ဝန္ေဆာင္မႈကို ယာယီျဖဳတ္ခ်င္လွ်င္ enable လုပ္ထားျပီးသား
+checkbox ကို uncheck လုပ္ပါ။)</li>
+ <li>Copy to clipboard: clipboard သို႔ onion လိပ္စာကို ကူးပါ။ ထို႔ေၾကာင့္
+သင့္ဝန္ေဆာင္မႈကို မည္သူမဆို အသံုးျပဳရန္ ေျပာျပႏိုင္ပါသည္။</li>
+ <li>Browse: local ဝန္ေဆာင္မႈ directory ကို ရွာေဖြရန္ ခြင့္ျပဳသည္။</li>
+</ul>
+</p>
+
+<a name="advanced"/>
+<h3>အဆင့္ျမင့္ ဝွက္ထားေသာ ဝန္ေဆာင္မႈ setting မ်ားကို ျပင္ဆင္ႏိုင္ပါသလား?</h3>
+<p>
+Tor သည္ ဝွက္ထားေသာ ဝန္ေဆာင္မႈမ်ား အတြက္ သတ္မွတ္ထားေသာ setting မ်ားကို
+ျပင္ဆင္ရန္ ခြင့္ျပဳပါသည္။ ဥပမာ မိတ္ဆက္ ပြိဳင့္မ်ား အျဖစ္ ေသခ်ာေသာ node
+မ်ားကို အသံုးျပဳရန္ (သို႔မဟုတ္ ေရွာင္ၾကဥ္ရန္) သို႔မဟုတ္ တူညီေသာ
+ဝန္ေဆာင္မႈအတြက္ မ်ားစြာေသာ virtual port မ်ားကို ေထာက္ပံ့ေပးရန္ တို႔ ျဖစ္သည္။
+</p>
+
+<p>
+ဘယ္လိုပဲျဖစ္ျဖစ္ ကၽြႏု္ပ္တို႔သည္ ဘံု setting မ်ားကိုသာ ေထာက္ပံ့ေပးရန္ ႏွင့္
+Vidalia ထဲရွိ အရာမ်ားကို သတ္မွတ္ရန္ ဆံုးျဖတ္ခဲ့ပါသည္။ အကယ္၍ အဆင့္ျမင့္
+setting မ်ားကို ျပင္ဆင္ခ်င္လွ်င္ Tor torrc ဖိုင္ထဲတြင္ ျပဳလုပ္ရန္
+လိုအပ္ပါသည္။ ဝွက္ထားေသာ ဝန္ေဆာင္မႈမ်ားကို တည္းျဖတ္ေနတဲ့ အခါမွာေတာင္ Vidalia
+က ၎ setting မ်ားကို ဖယ္ထုတ္ လိမ့္မည္ မဟုတ္ပါ။ အကယ္၍ virtual port
+တစ္ခုထက္ပို၍ သတ္မွတ္ခ်င္လွ်င္ ပထမဦးစြာ ေဖာ္ျပေပးလိမ့္မည္ ျဖစ္ျပီး
+တည္းျဖတ္ႏိုင္ပါလိမ့္မည္။
+</p>
+
+<a name="client"/>
+<h3>အျခား ဝွက္ထားေသာ ဝန္ေဆာင္မႈမ်ားကို ရယူရန္ Vidalia က ဘယ္လိုလုပ္သလဲ?</h3>
+<p>
+ထိုကဲ့သို႔ ျပဳလုပ္ရန္ မလိုအပ္ပါ။ အကယ္၍ အျခားေသာ ဝွက္ထားေသာ ဝန္ေဆာင္မႈကို
+ရယူခ်င္လွ်င္ ဝန္ေဆာင္မႈ၏ onion လိပ္စာကို သင့္ browser ထဲတြင္ ရိုက္ထည့္ပါ။
+(သို႔မဟုတ္ web ဝန္ေဆာင္မႈ မဟုတ္လွ်င္ သင့္ေလွ်ာ္ေသာ client application
+ကိုသံုးပါ)။ က်န္တာကို Tor က ျပဳလုပ္ေပးပါမည္။ အဲ့ဒိအတြက္ Tor ကို အေထြထူး
+ျပင္ဆင္ရန္ မလိုအပ္ပါ။
+</p>
+
+</body>
+</html>
+
Added: vidalia/trunk/src/vidalia/help/content/my/troubleshooting.html
===================================================================
--- vidalia/trunk/src/vidalia/help/content/my/troubleshooting.html (rev 0)
+++ vidalia/trunk/src/vidalia/help/content/my/troubleshooting.html 2011-03-02 14:22:16 UTC (rev 4526)
@@ -0,0 +1,165 @@
+
+
+<!--
+** $Id: troubleshooting.html 4366 2010-08-03 18:21:39Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.vidalia-project.net/. No part of Vidalia, including this file,
+** may be copied, modified, propagated, or distributed except according to
+** the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>အကူအညီ</h1>
+<hr />
+
+ေအာက္ပါ စာရင္းမ်ားသည္ ဘံုျပႆနာမ်ား သို႔မဟုတ္ Tor ကို run ေနတဲ့အခ်ိန္မွာ
+လူေတြ ေမးတတ္တဲ့ ေမးခြန္းမ်ား ျဖစ္သည္။ အကယ္၍ ျပႆနာအခ်က္အလက္မ်ား အေၾကာင္း
+တစ္စံုတစ္ခုကို ရွာေဖြမေတြ႕ဘူးဆိုလွ်င္ အေထာက္ကူျပဳ အခ်က္အလက္မ်ား အတြက္
+<i>www.vidalia-project.net</i> ဆိုက္မွာ ရွာၾကည့္ပါ။ <a name="start"/>
+<h3>Tor ကို မစတင္ႏိုင္ပါ။</h3>
+<p>
+Vidalia သည္ Tor ကို မစတင္ႏိုင္သည့္ အေၾကာင္းရင္းသည္ Tor installation
+လမ္းေၾကာင္းအမွား ထဲကို သြားရွာေဖြေန၍ ျဖစ္သည္။ <a
+href="config.html#general">အေထြေထြျပင္ဆင္မႈ settings</a>ထဲရွိ <i>Tor
+Executable</i> option ကို update ျပဳလုပ္ျခင္းအားျဖင့္ Vidalia ကို Tor ရဲ႕
+တည္ေနရာအား ေျပာျပႏိုင္ပါတယ္။
+</p>
+<p>
+အျခားျဖစ္ႏိုင္ေျခရွိသည့္ အေၾကာင္းရင္းမွာ အျခား Tor process သည္ run
+ႏွင့္ေနျပီး ျဖစ္၍ Tor မစတင္ႏိုင္ျခင္း ျဖစ္သည္။ အကယ္၍ သင္ရွာေဖြေတြ႕ခဲ့လွ်င္
+run ေနေသာ process မ်ားစာရင္း ကို စစ္ေဆးၾကည့္ျပီး အရင္ run ေနေသာ Tor process
+ကို ရပ္တန္႔ပစ္ပါ။ ထို႔ေနာက္ ေနာက္တစ္ၾကိမ္ Tor ကို ျပန္ run ၾကည့္ပါ။
+</p>
+<p>
+အကယ္၍ ၎သည္ အကူညီမရဘူးဆိုလွ်င္ အကယ္၍ စတင္ရန္ ၾကိဳးစားတဲ့အခ်ိန္မွာ
+ၾကံဳေတြ႕ရမယ့္ အမွားအယြင္းမ်ား ႏွင့္ သက္ဆုိင္ေသာ အခ်က္အလက္မ်ားကို Tor က
+ျပသတာကို <a href="log.html">message log</a> တြင္ျမင္ေတြ႕ရန္ check လုပ္ပါ။
+</p>
+
+<a name="connect"/>
+<h3>Tor ကို Vidalia ဆက္သြယ္၍ မရပါ။</h3>
+<p>
+Tor ၏ <i>ထိန္းခ်ဳပ္မႈ port</i>မွတဆင့္ ဆက္သြယ္ျခင္းအားျဖင့္ Vidalia သည္ Tor
+ကို ကြပ္ကဲႏိုင္သည္။
+</p>
+<p>
+အမ်ားအားျဖင့္ တူညီေသာ အေၾကာင္းရင္းမွာ Tor စတင္ေန၍ Vidalia သည္ Tor ကို
+မခ်ိတ္ဆက္ႏိုင္ျခင္း ျဖစ္သည္။ သို႔ေသာ္ အမွားအယြင္း ၾကံဳျပီး ရုတ္တရက္ ထြက္သြား
+လိမ့္မည္။ စတင္တဲ့အခ်ိန္မွာ Tor က အမွားယြင္းတစ္ခုခုကို တင္ျပခဲ့လွ်င္ <a
+href="log.html">message log</a>ကို ေတြ႕ျမင္ရန္ check လုပ္ပါ။
+</p>
+<p>
+အကယ္၍ Vidalia ေမွ်ာ္မွန္းတာထက္ Tor က မတူညီေသာ port ေတြေပၚမွာ နားေထာင္ေနလွ်င္
+Vidalia က Tor ဆက္သြယ္မႈကို ျဖတ္ခ်လိုက္မွာ ျဖစ္ပါတယ္။ ၎ setting ကို
+ေျပာင္းလဲဖို႔ လိုအပ္မွာ ျဖစ္ပါတယ္။ ဒါေပမယ့္ အျခား ဝန္ေဆာင္မႈ တစ္ခုခုက
+သင့္စက္ေပၚတြင္ run ေန၍ Tor ၏ ထိန္းခ်ဳပ္မႈ port ႏွင့္ ပဋိပကၡ ျဖစ္ေနခဲ့လွ်င္
+သင္အေနႏွင့္ မတူညီေသာ port တစ္ခုကို သတ္မွတ္ေပးဖို႔ လိုပါလိမ့္မယ္။ Vidalia ၏
+<a href="config.html#advanced">အဆင့္ျမင့္ ျပင္ဆင္ႏိုင္ေသာ settings</a>တြင္
+၎ကို ျပင္ဆင္ႏိုင္ပါသည္။
+</p>
+
+<a name="password"/>
+<h3>Vidalia က "control password" အတြက္ ဘာလို႔ လာေမးေနတာလဲ?</h3>
+<p>
+Vidalia သည္ Tor softwareကို Tor ၏ "control port" မွတဆင့္
+အျပန္အလွန္ဆက္သြယ္ပါတယ္။ control port က Vidalia ကို Tor ၏ ေနာက္ဆံုးရ
+အခ်က္အလက္မ်ားကို ရရွိေစျခင္း၊ identity အသစ္ကို ေတာင္းဆိုေပးျခင္း၊ Tor ၏
+setting ကို ျပင္ဆင္ ေပးျခင္း စသည္တို႔ကို လုပ္ေဆာင္ေပးပါသည္။ Vidalia သည္ Tor
+ကို စတင္လိုက္တိုင္းမွာ အျခား application မ်ားက ထိန္းခ်ဳပ္မႈ port ကို
+ဆက္သြယ္ျခင္းမွ ကာကြယ္ရန္ Tor ၏ control port အတြက္ က်ပန္း password ကို
+ထုတ္ေပးပါသည္။ ျပီးေနာက္ သင္မည္သူမွန္း မသိေအာင္ ေျခရာေဖ်ာက္ေပးပါသည္။
+</p>
+
+<p>
+ပံုမွန္အားျဖင့္ က်ပန္း password ထုတ္ေပးျခင္းႏွင့္ အသစ္ထုတ္ေပးျခင္းမ်ားသည္
+ေနာက္ကြယ္တြင္ ျဖစ္ေလ့ရွိပါတယ္။ Vidalia က သင့္ကို password ထုတ္ေပးမယ့္
+ေနရာတြင္ ဘံုတူညီေသာ အေျခအေန သံုးမ်ိဳးရွိပါတယ္။ :
+</p>
+
+<ul>
+ <li>
+ Vidalia ႏွင့္ Tor ကို run ထားျပီး ျဖစ္ပါသည္။ ဥပမာအားျဖင့္ အကယ္၍ Vidalia
+အစုအေဝး ကို install လုပ္ျပီး ယခုလက္ရွိတြင္ Tor Browser အစုေဝးကို run ဖို႔
+ၾကိဳးစားေနလွ်င္ ၎အေျခအေန ျဖစ္ႏိုင္ပါသည္။ ဤအေျခအေနတြင္ သင္အေနႏွင့္ အသစ္တစ္ခု
+မစတင္ခင္မွာ Vidalia ႏွင့္ Tor အေဟာင္းကို ပိတ္ဖို႔ လိုအပ္မွာ ျဖစ္ပါတယ္။
+ </li>
+
+ <li>
+ <p>Vidalia သည္ ရုတ္တရက္ ပ်က္သြား ေပမယ့္ Tor ဟာ ေနာက္ဆံုး သိခဲ့တဲ့ က်ပန္း
+password ႏွင့္ ဆက္ျပီး run ေနမွာပါ။ Vidalia ကို ျပန္လည္စတင္ျပီးတဲ့အခါ
+ေနာက္ထပ္ က်ပန္း password ထုတ္ေပးမွာ ျဖစ္ပါတယ္။ ဒါေပမယ့္ Vidalia သည္ Tor ကို
+ေျပာျပႏိုင္မွာ မဟုတ္ပါဘူး ဘာလို႔လဲဆုိေတာ့ က်ပန္း password ေတြဟာ
+မတူညီၾကလို႔ပဲ ျဖစ္ပါတယ္။</p>
+
+ <p>အကယ္၍ password ကို ထိန္းခ်ဳပ္ရန္ ေပၚလာေသာ dialog တြင္ <i>Reset</i> button
+ပါလွ်င္ ထို button ကို ႏွိပ္ပါ။ Vidalia သည္ password အသစ္ႏွင့္ Tor ကို
+ျပန္လည္စတင္ ႏိုင္ပါသည္။
+ </p>
+
+ <p>အကယ္၍ <i>Reset</i> button ကုိမေတြ႕လွ်င္ သို႔မဟုတ္ အကယ္၍ Vidalia သည္ Tor ကို
+ျပန္စတင္ရန္ မျဖစ္ႏိုင္လွ်င္ ျပႆနာမ်ားကို maual အားျဖင့္ ေျဖရွင္းႏိုင္ပါတယ္။
+process ကိုသြားပါ သို႔မဟုတ္ task manager ကို သြားပါ။ Tor process ကို
+အဆံုးသတ္ပါ။ ထို႔ေနာက္ Vidalia ကို Tor အား ျပန္စတင္ေစျပီး အားလံုး ပံုမွန္
+အလုပ္ျပန္လုပ္ပါလိမ့္မယ္။</p>
+ </li>
+
+ <li>
+ <p>Tor ဝန္ေဆာင္မႈအျဖစ္ run ျပီးျပီျဖစ္ပါသည္။ Tor ကို ဝန္ေဆာင္မႈျပဳလုပ္ရန္ run
+ဖို႔ ျပင္ဆင္ခ်ိန္မွာ system boots ျပဳလုပ္ခ်ိန္၌ စတင္ေနျပီ ျဖစ္ပါတယ္။ အကယ္၍
+Vidalia ကိုျဖတ္၍ Tor စတင္ရန္ သင္ျပင္ဆင္ျပီးခဲ့လွ်င္ က်ပန္း password တစ္ခုသည္
+Tor ထဲတြင္ သိမ္းျပီးျဖစ္ပါသည္။ သင္ login ဝင္ျပီး Vidalia ကိုစတင္ပါ။ Vidalia
+သည္ Tor run ႏွင့္ေနျပီး ဆိုသည္ကို ေျပာျပရန္ ၾကိဳးပမ္းပါလိမ့္မယ္။ Vidalia
+သည္ က်ပန္း password တစ္ခုကို ထုတ္ေပးပါလိမ့္မယ္ ဒါေပမယ့္ Tor ဝန္ေဆာင္မႈ ထဲမွာ
+သိမ္းထားတဲ့ တစ္ခုနဲ႔ေတာ့ ကြဲျပားပါတယ္။</p>
+
+ <p>Tor ဝန္ေဆာင္မႈ မျပဳလုပ္ရန္ Tor ကို ျပန္လည္ျပင္ဆင္ရန္ လိုအပ္သည္။ Tor
+ဝန္ေဆာင္မႈကို ဘယ္လိုဖယ္ထုတ္ရမယ္ ဆိုတဲ့ အခ်က္လက္မ်ားကို Tor wiki
+စာမ်က္ႏွာတြင္ <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService">
+Tor ဝန္ေဆာင္မႈအျဖစ္</a> ဖတ္ရႈႏိုင္ပါသည္။</p>
+ </li>
+</ul>
+
+
+<a name="torexited"/>
+<h3>ရုတ္တရက္ Tor ထြက္သြားလွ်င္</h3>
+<p>
+အကယ္၍ စတင္ျပီး မၾကာခင္မွာ ရုတ္တရက္ Tor ထြက္သြားလွ်င္ အျခား Tor process သည္
+run ႏွင့္ေနျပီး ျဖစ္ေသာေၾကာင့္ ျဖစ္သည္။ အဝါေရာင္ highlight ျပထားေသာ
+စာရင္းထဲရွိ မည္သည့္ messages အနည္းငယ္ကို မဆို ျမင္ေတြ႕ရန္ <a
+href="log.html">message log</a>ကို စစ္ေဆးပါ။ ၎ႏွင့္ အလားသ႑ာန္တူ message
+မ်ားမွာ ေအာက္ပါအတိုင္းျဖစ္သည္။ :
+</p>
+<pre>
+connection_create_listener(): 127.0.0.1:9050 ကိုမေပါင္းႏိုင္ပါ။: ဤလိပ္စာသည္အသံုးလွ်က္ရွိသည္။
+Tor သည္ run ႏွင့္ေနျပီလား?
+</pre>
+<p>
+အကယ္၍ အထက္ပါကဲ့သို႔ အမွားယြင္း message ကိုေတြ႕လွ်င္ Vidalia ႏွင့္ Tor
+process အသစ္တစ္ခု မစတင္ခင္မွာ အျခား Tor process ကို ရပ္တန္႔ပစ္ဖို႔ လိုပါတယ္။
+Windows မွာဆိုရင္ သင့္ရဲ႕ Task Manager ထဲက <i>tor.exe</i> ကို ရွာေဖြရပါမယ္။
+အျခား Opreating systems ေတြမွာဆိုရင္ေတာ့ <i>ps</i> command ဟာ အျခား Tor
+process ကို ရွာေဖြဖို႔ ကူညီေပးပါလိမ့္မယ္။
+</p>
+<p>
+အကယ္၍ အခ်ိန္အနည္းငယ္(စကၠန္႔အနည္းငယ္)အတြင္း Tor သည္ေအာင္ျမင္စြာ run
+ႏိုင္ခဲ့လွ်င္ သင္အေနႏွင့္ မထြက္ခင္ Tor ၏ အမွားအယြင္းမ်ားဆိုင္ရာ
+အခ်က္အလက္အတြက္ <a href="log.html">message log</a> ကို စစ္ေဆးၾကည့္သင့္သည္။
+</p>
+
+<a name="stop"/>
+<h3>Vidalia သည္ Tor ကို မရပ္တန္႔ႏိုင္ပါ။</h3>
+<p>
+အကယ္၍ Vidalia သည္ Tor ကို မရပ္တန္႔ႏိုင္လွ်င္ ထြက္ေနတုန္း အမွားအယြင္း
+တစ္ခုခုကို Tor တင္ျပတဲ့အခါျမင္ရန္ <a href="log.html">message log</a> ကို
+စစ္ေဆးသင့္ပါသည္။
+</p>
+
+</body>
+</html>
+
Added: vidalia/trunk/src/vidalia/help/content/zh_CN/bridges.html
===================================================================
--- vidalia/trunk/src/vidalia/help/content/zh_CN/bridges.html (rev 0)
+++ vidalia/trunk/src/vidalia/help/content/zh_CN/bridges.html 2011-03-02 14:22:16 UTC (rev 4526)
@@ -0,0 +1,56 @@
+
+
+<!--
+** $Id: bridges.html 3007 2008-08-22 00:12:08Z edmanm $
+**
+** This file is part of Vidalia, and is subject to the license terms in the
+** LICENSE file, found in the top level directory of this distribution. If
+** you did not receive the LICENSE file with this file, you may obtain it
+** from the Vidalia source package distributed by the Vidalia Project at
+** http://www.vidalia-project.net/. No part of Vidalia, including this file,
+** may be copied, modified, propagated, or distributed except according to
+** the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>网桥中继</h1>
+<hr />
+
+<a name="about"/>
+<h3>什么是网桥中继？</h3>
+<p>
+有些因特网服务提供商（ISP们）试着利用封锁已知网桥连接来阻止用户连接到 Tor 网络。网桥中继（或简称<i>网桥</i>）是一种可以帮助这种用户连接到
+Tor 网络的中继。不像其他的 Tor 中继，网桥不会和普通中继一样列表于公共目录中。所以它们并没有一个完整的公共列表，即使你的 ISP 过滤所有已知
+Tor 中继连接，他们依然可能无法封停所有的网桥。
+</p>
+
+<a name="finding"/>
+<h3>如何寻找网桥？</h3>
+<p>
+有两种主要的方法获得网桥地址：
+<ol>
+ <li>找一些朋友为您运行私人网桥。</li>
+ <li>使用一些公开的网桥。</li>
+</ol>
+</p>
+
+<p>
+要使用私人网桥，请您的朋友在无互联网审查的地方运行 Vidalia 和 Tor，然后点击 Vidalia 的<a
+href="server.html">网桥中继设置页面</a>中的<i>帮助受限用户</i>。这样他们应该将网桥中继页面最下面的<i>网桥地址</i>行发送给您。不同于运行一个出口中继，运行一个网桥中继仅仅只是通过
+Tor 网络接收和发送数据，所以他们应当不会有什么被滥用的抱怨。
+</p>
+
+<p>
+您可以通过访问<b>https://bridges.torproject.org</b>来获得一些公共网桥。您从该页面获得的网桥每几天会更新一次，如果您需要更多网桥地址，请定期回访该页面。另一种获得网桥地址的方式是发送一封标题和内容都是<b>get
+bridges</b>的邮件到<b>bridges(a)torproject.org</b>。但是，如果有攻击者想要获得更多网桥地址，我们会感到十分艰难，所以请您通过
+Gmail 帐户发送该请求。
+</p>
+
+<p>
+配置更多的网桥会使您的 Tor 连接更稳定，以免一些网桥无法访问。
+</p>
+
+</body>
+</html>
+
Modified: vidalia/trunk/src/vidalia/help/content/zh_CN/config.html
===================================================================
--- vidalia/trunk/src/vidalia/help/content/zh_CN/config.html 2011-03-02 09:45:37 UTC (rev 4525)
+++ vidalia/trunk/src/vidalia/help/content/zh_CN/config.html 2011-03-02 14:22:16 UTC (rev 4526)
@@ -1,3 +1,5 @@
+
+
<!--
** $Id$
**
@@ -9,64 +11,139 @@
** may be copied, modified, propagated, or distributed except according to
** the terms described in the LICENSE file.
-->
-
<html>
<body>
-<h1>配置Vidalia和Tor</h1>
+<h1>配置 Vidalia 和 Tor</h1>
<hr />
<p>
-Vidalia可以帮助您对Vidalia和Tor的常用部分进行配置，还可以协助您配置
-<a href="server.html">Tor 服务器</a>，从而促进Tor网络的成长。
+Vidalia 允许您配置大多数 Vidalia 和 Tor 的常用部分。它也允许您设置和管理一个<a href="server.html">Tor
+中继</a>，使得您能帮助到 Tor 网络的成长。
</p>
<a name="general"/>
-<h3>一般设置</h3>
+<h3>常规设置</h3>
<p>
-<i>一般</i>页面上的是最常见的一些修改设置。
+<i>常规</i>设置页面是一些最常用的设定。
</p>
<ul>
- <li><b>Tor Executable</b>:
- This is the Tor executable that Vidalia will run when you select
- <i>Start</i> from the tray menu. If you have multiple versions of Tor installed,
- you can tell Vidalia which version you would like to run by clicking the
- <i>Browse</i> button and navigating to the particular Tor installation you
- want.
+ <li><b>Tor Executable</b>: This is the Tor executable that Vidalia will run when
+you select <i>Start</i> from the tray menu. If you have multiple versions of
+Tor installed, you can tell Vidalia which version you would like to run by
+clicking the <i>Browse</i> button and navigating to the particular Tor
+installation you want.
</li>
- <li><b>启动可选项</b>：
- 这里您可以进行设置，使得Vidalia启动时，Tor也能自动启动。
- 您也可以将Vidalia设置成系统启动时就开始运行 (<i>只针对Windows</i>)。
+ <li><b>启动选项</b>：该设定允许您让 Vidalia 在启动的同时也启动 Tor。您也可以配置 Vidalia 在系统启动时运行(<i>仅限
+Windows</i>)。
</li>
</ul>
-<a name="server"/>
-<h3>服务器设置</h3>
+<a name="network"/>
+<h3>网络设置</h3>
<p>
-<i>
- 有关设置、管理Tor服务器的详情，请参见 <a href="server.html">此文件</a>。
-</i>
+<i>网络</i>设置页面使您可以更改 Tor 连接到网络的方式。
</p>
+<ul>
+ <li><b>我使用代理服务器连接到网络</b>：如果您的 Internet 连接需要以 HTTP 代理方式，您可以配置 Tor
+通过您的代理服务器发送所有的目录请求和中继连接。您必须至少指定一个主机名或代理服务器的地址，并且您代理服务器的端口也必须处于监听连接状态。如果您的代理服务器要求身份验证，您也可以输入连接到代理服务器的<i>用户名</i和<i>密码</i>。或者，您可以留空这些选项。
+ </li>
+ <li><b>我的防火墙只允许我连接到指定端口</b>：如果您处于防火墙限制下或代理服务器限制您连接的端口，您可以配置 Tor
+直接从您防火墙或代理服务器允许的端口连接。仅需要输入您防火墙或代理服务器允许的端口列表，通过逗号来分隔。（例如：80,443,8080）
+ </li>
+ <li><b>My ISP blocks connections to the Tor network</b>: If your ISP (Internet
+Service Provider) blocks connections to the Tor network, Tor can attempt to
+avoid being filtered by encrypting its directory connections and connecting
+to the Tor network through relays called <i>bridges</i> (Tor 0.2.0.3-alpha
+or newer only). You can add bridge relays by specifying either their address
+and port number, or their address, port number, and fingerprint.<br/>
+ 以下是可用网桥地址格式的例子：
+ <ul>
+ <li>
+ 128.213.48.13:8080
+ </li>
+ <li>
+ 128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73
+ </li>
+ <li>
+ 128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73
+ </li>
+ </ul>
+ Even if you do not know any bridge relay addresses, checking this checkbox
+may still be helpful. Tor will encrypt its directory requests, which can
+defeat blocking mechanisms that try to filter Tor's requests for information
+about other relays. If connections to normal Tor relays are also blocked,
+then you will need to learn a bridge relay address somehow and add it
+here. See the help topic on <a href="bridges.html#finding">finding bridge
+relays</a> for more information on how to learn new bridge relay addresses
+and fingerprints.
+ </li>
+</ul>
+
+<a name="relay"/>
+<h3>中继设定</h3>
+<p>
+更多关于设置和管理一个 Tor 中继的细节，<i>请查看<a href="server.html">该帮助主题</a>。
+</p>
+
+<a name="appearance"/>
+<h3>外观设定</h3>
+<p>
+<i>外观</i>页的设置允许您定制 Vidalia 的外观。
+</p>
+<ul>
+ <li><b>语言</b>：Vidalia 的界面已经被志愿者们翻译成了许多种语言.当 Vidalia 第一次运行的时候,他会试着猜测您正使用哪种语言。如果
+Vidalia 猜测错误，或如果您更喜欢不同的语言，您可以从下拉菜单中选择别的语言。在改变显示语言之后,您需要重启 Vidalia 使之生效。
+ </li>
+ <li><b>风格</b>：在很多情况下，Vidalia 会默认使用您平台的默认界面风格。如果您不喜欢默认风格，可以从下拉菜单中选择您喜欢的风格。
+ </li>
+</ul>
+
<a name="advanced"/>
-<h3>高级设置</h3>
+<h3>高级设定</h3>
<p>
-<i>高级设置</i>主要针对较有经验的使用者。
+<i>高级</i>页面中的设置通常情况下应当需要有更多经验的用户来改变。
</p>
<ul>
- <li><b>控制端口</b>：
- <i>控制端口</i>，Vidalia通过其与Tor交流。
- 除非与本机的其它服务冲突，否则这个设置不需要更改。
+ <li><b>控制地址 & 端口</b>：<i>控制端口</i>是 Vidalia 与 Tor
+通信的端口。通常无需改变，除非与您机器上的其他服务有冲突，或者您正在使用 Vidalia 控制和监视在其他机器上运行的 Tor 进程。
</li>
- <li><b>改变Tor的配置文件</b>:
- 通过此可选项，可让Vidalia启动时采用指定的<i>torrc</i>
- (Tor的配置文件)。
+ <li><b>控制端口身份验证</b>：控制端口身份验证是用于限制您机器上的应用程序连接和配置您的 Tor 设备的。可用的身份验证格式如下：
+ <ul>
+ <li>
+ <b>无</b> -- 要求无身份验证。使用该设置是<b>强烈</b>不鼓励的。任何您电脑上的应用程序或用户都可以配置您的 Tor 设备。
+ </li>
+ <li>
+ <b>密码</b> <i>(默认)</i> -- 如果选择该方式，您可以指定一个 Tor 要求每次用户或应用程序访问控制端口的密码。如果 Vidalia
+为您启动 Tor,您可以通过勾选<i>随机生成</i>项使得 Vidalia 每次启动 Tor 随机生成一个密码。
+ </li>
+ <li>
+ <b>Cookie</b> -- 如果选择 Cookie 身份验证，Tor
+在启动时会写一个包含随机字符的文件（或<i>cookie</i>）到它的数据目录中。任何试着连接到 Tor 的控制端口的用户和应用程序都必须提供
+Cookie 的内容。
+ </li>
+ </ul>
</li>
- <li><b>权限</b>：
- 如果您设置了此项，Tor启动时，就可以对用户<i>setuid</i>，或对用户组<i>setgid</i>。
+ <li><b>Tor 配置文件</b><i>（可选）</i>：您可以通过该选项使得 Vidalia 启动 Tor 时使用指定的<i>torrc</i>,Tor
+的配置文件。如果您留空该项，Tor 会使用它默认的 torrc。
</li>
+ <li><b>Tor 数据目录</b><i>（可选）</i>：您可以指定目录让 Tor 存储数据，例如缓存 Tor 中继信息，Tor
+中继密钥，和配置文件。如果您留空该项，Tor 会使用它默认的数据目录位置。
+ </li>
+ <li><b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter
+a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it
+starts. If you enter a value for <b>Run as Group</b>, Tor will
+<i>setgid</i> to this group when it starts.
+ </li>
</ul>
+<a name="services"/>
+<h3>隐藏服务设定</h3>
+<p>
+隐藏服务允许您提供任何形式基于 TCP 的服务给他人而无需隐藏您的 IP 地址，例如，一种 HTTP 服务。
+</p>
+
</body>
</html>
Modified: vidalia/trunk/src/vidalia/help/content/zh_CN/index.html
===================================================================
--- vidalia/trunk/src/vidalia/help/content/zh_CN/index.html 2011-03-02 09:45:37 UTC (rev 4525)
+++ vidalia/trunk/src/vidalia/help/content/zh_CN/index.html 2011-03-02 14:22:16 UTC (rev 4526)
@@ -1,3 +1,5 @@
+
+
<!--
** $Id$
**
@@ -9,28 +11,26 @@
** may be copied, modified, propagated, or distributed except according to
** the terms described in the LICENSE file.
-->
-
<html>
<body>
-<h1>Vidalia 帮助</h1>
+<h1>Vidalia帮助</h1>
<hr />
<p>
-请通过选择左边的树状菜单，或者点击主题列表上方的搜索按钮，以对所有帮助内容进行查找。
+从左方的树形图中选择一个帮助主题或者点击在主题列表上方的搜索按钮来搜索所有可用帮助主题。
</p>
<p>
-你可以通过使用工具栏上的<i>查找</i>按钮，以在特定帮助主题内进行搜索。
+您可以使用工具栏上的<i>查找</i>按钮来搜索特定的帮助主题
</p>
<p>
-上方的<i>首页</i>按钮可以返回到本页。
+上面的<i>主页</i>按钮会让您回到主页
</p>
<p>
-See the <a href="links.html">Helpful Links</a> topic for some places you
-can visit to find additional help and information about Vidalia and Tor.
+您可以访问在很多地方看到的<a href="links.html">有帮助的链接</a>主题，来查找关于 Vidalia 和 Tor 更多的帮助和信息
</p>
</body>
Modified: vidalia/trunk/src/vidalia/help/content/zh_CN/netview.html
===================================================================
--- vidalia/trunk/src/vidalia/help/content/zh_CN/netview.html 2011-03-02 09:45:37 UTC (rev 4525)
+++ vidalia/trunk/src/vidalia/help/content/zh_CN/netview.html 2011-03-02 14:22:16 UTC (rev 4526)
@@ -1,3 +1,5 @@
+
+
<!--
** $Id$
**
@@ -9,163 +11,144 @@
** may be copied, modified, propagated, or distributed except according to
** the terms described in the LICENSE file.
-->
-
<html>
<body>
-<h1>Network Viewer</h1>
+<h1>网络查看器</h1>
<hr />
<p>
-The network viewer lets you see routers in the Tor network and where
-your traffic is going.
+网络查看器使您可以查看 Tor 网络的中继和您经由的位置。
</p>
<a name="overview"/>
-<h3>Overview</h3>
+<h3>概述</h3>
<p>
When you want to communicate anonymously through Tor (say, connecting to a
website), Tor creates a tunnel, or <i>circuit</i>, of encrypted connections
-through a series of routers on the network. Your application's traffic is then
-sent as a <i>stream</i> through that circuit. For efficiency, multiple streams
-may share the same circuit.
+through a series of relays on the network. Your application's traffic is
+then sent as a <i>stream</i> through that circuit. For efficiency, multiple
+streams may share the same circuit.
</p>
<a name="netmap"/>
-<h3>Network Map</h3>
+<h3>网络地图</h3>
<p>
-The network map consists of a map of the world, with red pinpoints indicating
-the geographic location of routers in the Tor network. Green lines are drawn
-between routers to indicate the path of circuits that your Tor client has
-created through the Tor network.
+网络地图是由世界地图，和红点指明的 Tor 网络地图上中继的地理位置组成的。绿色线条连接中继用以指明 Tor 客户端通过 Tor 网络创建回路的路径。
</p>
<p>
-You can zoom in on locations in the map by clicking the <b>Zoom In</b> and
-<b>Zoom Out</b> buttons in the toolbar. You can also scroll around on the map
-by clicking on the map and then dragging it in whatever direction you would
-like to move the map.
+您可以通过点击工具栏上的<b>缩小</b>和<b>放大</b>按钮来放缩地图。您也可以通过点击地图并且拖拽到您想要移动的目标上。
</p>
<p>
-The geographic location of a Tor router is determined by looking up the IP
-address of the router in a GeoIP database, created by MaxMind and located at
-geoip.vidalia-project.net.
+Tor 中继的地理位置决定于 GeoIP 数据库中中继的 IP 地址，由 MaxMind 创建并位于geoip.vidalia-project.net。
</p>
<p>
In the middle of the dialog, below the network map, you will see a list of
your current circuits, as well as any application traffic currently on those
-circuits. When the network map first loads, you will probably see a connection
-to geoip.vidalia-project.net, which occurs when Vidalia is looking up
-geographic information for the list of Tor routers. It is important to note
-that this request is done through Tor, so your location is not revealed to the
-GeoIP server.
+circuits. When the network map first loads, you will probably see a
+connection to geoip.vidalia-project.net, which occurs when Vidalia is
+looking up geographic information for the list of Tor relays. It is
+important to note that this request is done through Tor, so your location is
+not revealed to the GeoIP relay. The results of the lookups will be cached
+locally in order to reduce load on Vidalia's GeoIP relays.
</p>
-<a name="status"/>
-<h3>Router Status</h3>
+<a name="relaylist"/>
+<h3>中继状态</h3>
<p>
-On the left side of the network view, you will see a list of routers in the
-Tor network. Next to each router is an icon indicating that router's status.
-The following table summarizes the possible router status icons:
+在网络查看器的左边，您将会看到一个在 Tor 网络中的中继列表。每个中继下面是一个指示中继状态的图标。下面的表格总结了中继状态图标。
</p>
<p>
<table border="1">
<tr>
<td><img src="qrc:/images/icons/node-unresponsive.png"/></td>
<td valign="middle">
- The router is offline or simply not responding.
+ 中继离线或未回应。
</td>
</tr>
<tr>
<td><img src="qrc:/images/icons/node-hibernating.png"/></td>
<td valign="middle">
- The router is <i>hibernating</i>, meaning it is online, but has used up as
- much bandwidth as the operator is willing to allow for a given time
- period.
+ The relay is <i>hibernating</i>, meaning it is online, but has used up as
+much bandwidth as the operator is willing to allow for a given time period.
</td>
</tr>
<tr>
<td><img src="qrc:/images/icons/node-bw-none.png"/></td>
<td valign="middle">
- The router is online, but has shown only minimal throughput.
+ 中继在线，但显示了很小的数据流量。
</td>
</tr>
<tr>
<td><img src="qrc:/images/icons/node-bw-low.png"/></td>
<td valign="middle">
- The router is online and has shown a throughput >= 20 KB/s.
+ 中继在线并且显示流量>= 20 KB/s。
</td>
</tr>
<tr>
<td><img src="qrc:/images/icons/node-bw-med.png"/></td>
<td valign="middle">
- The router is online and has shown a throughput >= 60 KB/s.
+ 中继在线并且显示流量>= 60 KB/s。
</td>
</tr>
<tr>
<td><img src="qrc:/images/icons/node-bw-high.png"/></td>
<td valign="middle">
- The router is online and has shown a throughput >= 400 KB/s.
+ 中继在线并且显示流量>= 400 KB/s。
</td>
</tr>
</table>
</p>
<p>
-All bandwidth values are estimates based on the minimum of either
-the maximum bandwidth sustained input or output over any ten second period
-in the past day.
+All bandwidth values are estimates based on the minimum of either the
+maximum bandwidth sustained input or output over any ten second period in
+the past day.
</p>
<a name="details"/>
-<h3>Router Details</h3>
+<h3>中继细节</h3>
<p>
-The router details panel at the right side of the screen gives you details
-about the router or routers currently selected in the
-<a href="#routerlist">router list</a>. If you have selected a circuit or stream
-in the list of your current circuits and streams, this panel will show you
-details about each router through which your traffic is currently being
-relayed.
+在屏幕右边的终极细节面板向您提供了关于中继或当前在<a
+href="#relaylist">中继列表</a>中选择的细节。如果您在当前回路或流中选择了一个回路或流，该面板将会向您展示关于每个通过回路发送信息的细节。
</p>
<p>
-The fields that you may see in the panel are as follows (<i>Note</i>: not all
-of these fields will always be present):
+面板中您能看的项目如下（<i>注意</i>：不是所有的项目都会显示出来的）：
</p>
<p>
<table>
<tr>
- <td><b>Location</b></td>
- <td>The geographic location of this Tor router.</td>
+ <td><b>位置</b></td>
+ <td>Tor 中继的地理位置。</td>
</tr>
<tr>
- <td><b>IP Address</b></td>
- <td>IP address at which this Tor router can be reached.</td>
+ <td><b>IP 地址</b></td>
+ <td>该 Tor 中继可能连接到的 IP 地址。</td>
</tr>
<tr>
- <td><b>Platform</b></td>
+ <td><b>平台</b></td>
<td>
- Operating system information and Tor version on which this router is
- currently running.
+ 当前正在运行中继平台的操作系统信息和 Tor 版本。
</td>
</tr>
<tr>
- <td><b>Bandwidth</b></td>
+ <td><b>宽带</b></td>
<td>
- Estimated maximum amount of bandwidth that the directory servers have
- seen this router handle recently.
+ Estimated maximum amount of bandwidth that the directory relays have seen
+this relay handle recently.
</td>
</tr>
<tr>
- <td><b>Uptime</b></td>
+ <td><b>运行时间</b></td>
<td>
- Length of time this router has been available, which can be used to help
- estimate this router's stability.
+ 宽带已经运行的时间，可以帮助评估该中继的稳定性。
</td>
</tr>
<tr>
- <td><b>Last Updated</b></td>
- <td>Date this router's information was last updated.</td>
+ <td><b>最后更新</b></td>
+ <td>该中继的信息最后更新的日期。</td>
</tr>
</table>
</p>
Modified: vidalia/trunk/src/vidalia/help/content/zh_CN/running.html
===================================================================
--- vidalia/trunk/src/vidalia/help/content/zh_CN/running.html 2011-03-02 09:45:37 UTC (rev 4525)
+++ vidalia/trunk/src/vidalia/help/content/zh_CN/running.html 2011-03-02 14:22:16 UTC (rev 4526)
@@ -1,3 +1,5 @@
+
+
<!--
** $Id$
**
@@ -9,88 +11,80 @@
** may be copied, modified, propagated, or distributed except according to
** the terms described in the LICENSE file.
-->
-
<html>
<body>
-<h1>运行Tor</h1>
+<h1>运行 Tor</h1>
<hr />
<p>
-Vidalia可以帮助您控制Tor进程，包括启动、停止Tor，监视Tor的状态，包括意外退出。
+Vidalia 能帮助控制您的 Tor 进程使之启动或停止，同样也像监视器一样监视 Tor 的状态并且是您知道它是否异常退出。
</p>
<a name="starting"/>
-<h3>启动和停止Tor</h3>
+<h3>启动和停止 Tor</h3>
<p>
-<i>启动</i>Tor：
+<i>启动</i> Tor，
<ol>
- <li>从Vidalia托盘菜单中选择<i>启动</i>，或者按<i>Ctrl+S</i>；</li>
+ <li>在 Vidalia 的托盘菜单中选择<i>启动</i>,或按<i>Ctrl+S</i></li>。
<li>
- Tor启动后，Vidalia托盘图标会由红色的X，变成一稞绿色的洋葱；
+ 当 Tor 已经启动的时候，Vidalia 面板图标会从一个有红X的洋葱图标，变成一个绿色的洋葱。
</li>
</ol>
-如果Vidalia无法启动Tor，它会显示出错信息，告诉您哪里出了问题。您也可以通过<a href="log.html">消息日志</a>，来查看Tor是否有更多的信息提示。
+如果 Vidalia 未能成功启动 Tor，Vidalia会显示一个错误信息来告诉您哪里有问题。您也可以查看您的<a
+href="log.html">消息日志</a>来发现 Tor 打印了哪些运行中的错误。
</p>
<p>
-<i>停止</i>Tor：
+<i>停止</i> Tor，
<ol>
- <li>从Vidalia托盘菜单中选择<i>停止</i>，或者按<i>Ctrl+T</i>；</li>
+ <li>在 Vidalia 的托盘图标中选择<i>停止</i>或按<i>Ctrl+T</i></li>。
<li>
- Tor停止后，Vidalia托盘图标会由绿色的洋葱，变成红色的X。
+ 当 Tor 停止的时候，Vidalia 面板图标会从一个绿色的洋葱变成一个有红X的洋葱。
</li>
</ol>
-如果Vidalia无法停止Tor，它会显示出错信息，告诉您哪里出了问题。您也可以通过<a href="log.html">消息日志</a>，来查看Tor是否有更多的信息提示。
+如果 Vidalia 无法停止 Tor,Vidalia 会显示一个错误信息来告诉您哪里出了问题。您也可以通过<a
+href="log.html">消息日志</a>来查看 Tor 是否有更多有关运行的错误。
</p>
<a name="monitoring"/>
-<h3>监视Tor的状态</h3>
+<h3>监视 Tor 的状态</h3>
<p>
-Vidalia tells you about the status of Tor by displaying an icon in your system
-tray or dock area. The following table shows the different states indicated by
-an icon in your system's notification area:
+Vidalia 会通过显示在系统托盘或 Dock 区域的图标来告诉您 Tor 的状态。下面的表格会为您指出系统提醒区域 Tor 不同的状态。
</p>
<p>
<table border="1">
<tr>
<td><img src="qrc:/images/32x32/tor-off.png"/></td>
<td valign="middle">
- Tor is stopped. Select <i>Start</i> from the Vidalia menu
- to start Tor.
+ Tor 已经停止。请在 Vidalia 菜单中选择<i>启动</i>来启动 Tor。
</td>
</tr>
<tr>
<td><img src="qrc:/images/32x32/tor-starting.png"/></td>
<td valign="middle">
- Tor is starting up. You can check the
- <a href="log.html">message log</a> for status information about Tor
- while it is starting.
+ Tor 正在启动中。您可以通过检查<a href="log.html">消息日志</a>获得有关 Tor 启动阶段的状态信息。
</td>
</tr>
<tr>
<td><img src="qrc:/images/32x32/tor-on.png"/></td>
<td valign="middle">
- Tor is running. If you want to stop Tor, select <i>Stop</i> from the
- Vidalia menu. Tor will print informational messages to the
- <a href="log.html">message log</a> while it is running, if you want to
- see what Tor is doing.
+ Tor 正在运行。如果您想要停止 Tor，请在 Vidalia 菜单中选择<i>停止</i>。如果您想要查看 Tor 在做什么，Tor 在运行时会在<a
+href="log.html">消息日志</a>中打印消息。
</td>
</tr>
<tr>
<td><img src="qrc:/images/32x32/tor-stopping.png"/></td>
- <td valign="middle">Tor is in the process of shutting down.</td>
+ <td valign="middle">Tor 正在关闭中。</td>
</tr>
</table>
</p>
<p>
-If Tor exits unexpectedly, Vidalia will change its icon to the dark onion with a
-red X and display an error message letting you know what went wrong. You can
-also check the <a href="log.html">message log</a> for details about any problems
-Tor encountered before it exited.
+如果 Tor 异常退出，Vidalia 会将图标变成一个有红X的黑色洋葱,并且显示一个错误消息,让您知道哪里有错误。您也可以通过查看<a
+href="log.html">消息日志</a>获得关于 Tor 退出前发生情况的详细信息。
</p>
</body>
-</html>
+</html>
1
0
r4525: updated translations for vidalia installer (in vidalia/trunk/pkg/win32/po: .tx af ak am arn ast bg bn_IN csb cy de_CH dz eo eu fil fur ga gl gu gun ha hi hr ht hu is kn lb ln lo lt lv mg mi mk ml mn mr ms mt nah nap ne nn nso oc pa pap pms ps pt_BR sco son su sw ta te tg ti tk ur ve zh_HK zu)
by vidalia-svn＠svn.torproject.org 02 Mar '11
by vidalia-svn＠svn.torproject.org 02 Mar '11
02 Mar '11
Author: runa
Date: 2011-03-02 09:45:37 +0000 (Wed, 02 Mar 2011)
New Revision: 4525
Modified:
vidalia/trunk/pkg/win32/po/.tx/config
vidalia/trunk/pkg/win32/po/af/vidalia_af.po
vidalia/trunk/pkg/win32/po/ak/vidalia_ak.po
vidalia/trunk/pkg/win32/po/am/vidalia_am.po
vidalia/trunk/pkg/win32/po/arn/vidalia_arn.po
vidalia/trunk/pkg/win32/po/ast/vidalia_ast.po
vidalia/trunk/pkg/win32/po/bg/vidalia_bg.po
vidalia/trunk/pkg/win32/po/bn_IN/vidalia_bn_IN.po
vidalia/trunk/pkg/win32/po/csb/vidalia_csb.po
vidalia/trunk/pkg/win32/po/cy/vidalia_cy.po
vidalia/trunk/pkg/win32/po/de_CH/vidalia_de_CH.po
vidalia/trunk/pkg/win32/po/dz/vidalia_dz.po
vidalia/trunk/pkg/win32/po/eo/vidalia_eo.po
vidalia/trunk/pkg/win32/po/eu/vidalia_eu.po
vidalia/trunk/pkg/win32/po/fil/vidalia_fil.po
vidalia/trunk/pkg/win32/po/fur/vidalia_fur.po
vidalia/trunk/pkg/win32/po/ga/vidalia_ga.po
vidalia/trunk/pkg/win32/po/gl/vidalia_gl.po
vidalia/trunk/pkg/win32/po/gu/vidalia_gu.po
vidalia/trunk/pkg/win32/po/gun/vidalia_gun.po
vidalia/trunk/pkg/win32/po/ha/vidalia_ha.po
vidalia/trunk/pkg/win32/po/hi/vidalia_hi.po
vidalia/trunk/pkg/win32/po/hr/vidalia_hr.po
vidalia/trunk/pkg/win32/po/ht/vidalia_ht.po
vidalia/trunk/pkg/win32/po/hu/vidalia_hu.po
vidalia/trunk/pkg/win32/po/is/vidalia_is.po
vidalia/trunk/pkg/win32/po/kn/vidalia_kn.po
vidalia/trunk/pkg/win32/po/lb/vidalia_lb.po
vidalia/trunk/pkg/win32/po/ln/vidalia_ln.po
vidalia/trunk/pkg/win32/po/lo/vidalia_lo.po
vidalia/trunk/pkg/win32/po/lt/vidalia_lt.po
vidalia/trunk/pkg/win32/po/lv/vidalia_lv.po
vidalia/trunk/pkg/win32/po/mg/vidalia_mg.po
vidalia/trunk/pkg/win32/po/mi/vidalia_mi.po
vidalia/trunk/pkg/win32/po/mk/vidalia_mk.po
vidalia/trunk/pkg/win32/po/ml/vidalia_ml.po
vidalia/trunk/pkg/win32/po/mn/vidalia_mn.po
vidalia/trunk/pkg/win32/po/mr/vidalia_mr.po
vidalia/trunk/pkg/win32/po/ms/vidalia_ms.po
vidalia/trunk/pkg/win32/po/mt/vidalia_mt.po
vidalia/trunk/pkg/win32/po/nah/vidalia_nah.po
vidalia/trunk/pkg/win32/po/nap/vidalia_nap.po
vidalia/trunk/pkg/win32/po/ne/vidalia_ne.po
vidalia/trunk/pkg/win32/po/nn/vidalia_nn.po
vidalia/trunk/pkg/win32/po/nso/vidalia_nso.po
vidalia/trunk/pkg/win32/po/oc/vidalia_oc.po
vidalia/trunk/pkg/win32/po/pa/vidalia_pa.po
vidalia/trunk/pkg/win32/po/pap/vidalia_pap.po
vidalia/trunk/pkg/win32/po/pms/vidalia_pms.po
vidalia/trunk/pkg/win32/po/ps/vidalia_ps.po
vidalia/trunk/pkg/win32/po/pt_BR/vidalia_pt_BR.po
vidalia/trunk/pkg/win32/po/sco/vidalia_sco.po
vidalia/trunk/pkg/win32/po/son/vidalia_son.po
vidalia/trunk/pkg/win32/po/su/vidalia_su.po
vidalia/trunk/pkg/win32/po/sw/vidalia_sw.po
vidalia/trunk/pkg/win32/po/ta/vidalia_ta.po
vidalia/trunk/pkg/win32/po/te/vidalia_te.po
vidalia/trunk/pkg/win32/po/tg/vidalia_tg.po
vidalia/trunk/pkg/win32/po/ti/vidalia_ti.po
vidalia/trunk/pkg/win32/po/tk/vidalia_tk.po
vidalia/trunk/pkg/win32/po/ur/vidalia_ur.po
vidalia/trunk/pkg/win32/po/ve/vidalia_ve.po
vidalia/trunk/pkg/win32/po/zh_HK/vidalia_zh_HK.po
vidalia/trunk/pkg/win32/po/zu/vidalia_zu.po
Log:
updated translations for vidalia installer
Modified: vidalia/trunk/pkg/win32/po/.tx/config
===================================================================
--- vidalia/trunk/pkg/win32/po/.tx/config 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/.tx/config 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,11 +1,11 @@
[main]
-host = http://www.transifex.net
+host = https://www.transifex.net
[torproject.vidalia-installer-vidalia-pot]
source_file = templates/vidalia.pot
source_lang = en
trans.af = af/vidalia_af.po
-trans.ak = ak
+trans.ak = ak/vidalia_ak.po
trans.am = am/vidalia_am.po
trans.ar = ar/vidalia_ar.po
trans.arn = arn/vidalia_arn.po
Modified: vidalia/trunk/pkg/win32/po/af/vidalia_af.po
===================================================================
--- vidalia/trunk/pkg/win32/po/af/vidalia_af.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/af/vidalia_af.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/ak/vidalia_ak.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ak/vidalia_ak.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ak/vidalia_ak.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,15 +1,17 @@
+#
msgid ""
msgstr ""
-"Project-Id-Version: Vidalia Windows Installers\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
"Last-Translator: \n"
"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Language: ak\n"
+"Plural-Forms: nplurals=2; plural=n > 1\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
@@ -17,16 +19,17 @@
msgctxt "BundleWelcomeText"
msgid ""
-"This wizard will guide you through the installation of Tor, "
-"Vidalia, Polipo, and Torbutton.\n\nTor is a system for using the "
-"Internet anonymously, helping you anonymize Web browsing and publishing, "
-"instant messaging, IRC, and more. Vidalia is a GUI that helps you "
-"control, monitor, and configure Tor.\n\nPolipo is a caching web proxy "
-"that helps increase performance of browsing the web through "
-"Tor.\n\nTorbutton is a Firefox extension that allows you to quickly "
-"enable or disable anonymous web browsing.\n\nIf you have previously "
-"installed Tor, Vidalia, Polipo, or Firefox, please make sure they are "
-"not running before continuing this installation.\n\n$_CLICK"
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -38,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -58,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -94,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -106,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -126,7 +141,9 @@
msgstr ""
msgctxt "PolipoGroupDesc"
-msgid "Polipo is a caching web proxy that increases performance of web browsing through Tor."
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
msgctxt "PolipoUninstDesc"
@@ -154,7 +171,9 @@
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -194,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/am/vidalia_am.po
===================================================================
--- vidalia/trunk/pkg/win32/po/am/vidalia_am.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/am/vidalia_am.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: am\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/arn/vidalia_arn.po
===================================================================
--- vidalia/trunk/pkg/win32/po/arn/vidalia_arn.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/arn/vidalia_arn.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: arn\n"
+"Plural-Forms: nplurals=2; plural=n > 1\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/ast/vidalia_ast.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ast/vidalia_ast.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ast/vidalia_ast.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/bg/vidalia_bg.po
===================================================================
--- vidalia/trunk/pkg/win32/po/bg/vidalia_bg.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/bg/vidalia_bg.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/bn_IN/vidalia_bn_IN.po
===================================================================
--- vidalia/trunk/pkg/win32/po/bn_IN/vidalia_bn_IN.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/bn_IN/vidalia_bn_IN.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/csb/vidalia_csb.po
===================================================================
--- vidalia/trunk/pkg/win32/po/csb/vidalia_csb.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/csb/vidalia_csb.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: csb\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/cy/vidalia_cy.po
===================================================================
--- vidalia/trunk/pkg/win32/po/cy/vidalia_cy.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/cy/vidalia_cy.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:39+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: cy\n"
+"Plural-Forms: nplurals=4; plural=(n==2) ? 1 : 0\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/de_CH/vidalia_de_CH.po
===================================================================
--- vidalia/trunk/pkg/win32/po/de_CH/vidalia_de_CH.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/de_CH/vidalia_de_CH.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: de_CH\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/dz/vidalia_dz.po
===================================================================
--- vidalia/trunk/pkg/win32/po/dz/vidalia_dz.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/dz/vidalia_dz.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: dz\n"
+"Plural-Forms: nplurals=1; plural=0\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/eo/vidalia_eo.po
===================================================================
--- vidalia/trunk/pkg/win32/po/eo/vidalia_eo.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/eo/vidalia_eo.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/eu/vidalia_eu.po
===================================================================
--- vidalia/trunk/pkg/win32/po/eu/vidalia_eu.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/eu/vidalia_eu.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/fil/vidalia_fil.po
===================================================================
--- vidalia/trunk/pkg/win32/po/fil/vidalia_fil.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/fil/vidalia_fil.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: fil\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/fur/vidalia_fur.po
===================================================================
--- vidalia/trunk/pkg/win32/po/fur/vidalia_fur.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/fur/vidalia_fur.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: fur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/ga/vidalia_ga.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ga/vidalia_ga.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ga/vidalia_ga.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: ga\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/gl/vidalia_gl.po
===================================================================
--- vidalia/trunk/pkg/win32/po/gl/vidalia_gl.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/gl/vidalia_gl.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/gu/vidalia_gu.po
===================================================================
--- vidalia/trunk/pkg/win32/po/gu/vidalia_gu.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/gu/vidalia_gu.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:39+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: gu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/gun/vidalia_gun.po
===================================================================
--- vidalia/trunk/pkg/win32/po/gun/vidalia_gun.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/gun/vidalia_gun.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: gun\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/ha/vidalia_ha.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ha/vidalia_ha.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ha/vidalia_ha.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: ha\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/hi/vidalia_hi.po
===================================================================
--- vidalia/trunk/pkg/win32/po/hi/vidalia_hi.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/hi/vidalia_hi.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/hr/vidalia_hr.po
===================================================================
--- vidalia/trunk/pkg/win32/po/hr/vidalia_hr.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/hr/vidalia_hr.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/ht/vidalia_ht.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ht/vidalia_ht.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ht/vidalia_ht.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: ht\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/hu/vidalia_hu.po
===================================================================
--- vidalia/trunk/pkg/win32/po/hu/vidalia_hu.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/hu/vidalia_hu.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/is/vidalia_is.po
===================================================================
--- vidalia/trunk/pkg/win32/po/is/vidalia_is.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/is/vidalia_is.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/kn/vidalia_kn.po
===================================================================
--- vidalia/trunk/pkg/win32/po/kn/vidalia_kn.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/kn/vidalia_kn.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/lb/vidalia_lb.po
===================================================================
--- vidalia/trunk/pkg/win32/po/lb/vidalia_lb.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/lb/vidalia_lb.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/ln/vidalia_ln.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ln/vidalia_ln.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ln/vidalia_ln.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: ln\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/lo/vidalia_lo.po
===================================================================
--- vidalia/trunk/pkg/win32/po/lo/vidalia_lo.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/lo/vidalia_lo.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: lo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/lt/vidalia_lt.po
===================================================================
--- vidalia/trunk/pkg/win32/po/lt/vidalia_lt.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/lt/vidalia_lt.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: lt\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/lv/vidalia_lv.po
===================================================================
--- vidalia/trunk/pkg/win32/po/lv/vidalia_lv.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/lv/vidalia_lv.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/mg/vidalia_mg.po
===================================================================
--- vidalia/trunk/pkg/win32/po/mg/vidalia_mg.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/mg/vidalia_mg.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: mg\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/mi/vidalia_mi.po
===================================================================
--- vidalia/trunk/pkg/win32/po/mi/vidalia_mi.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/mi/vidalia_mi.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: mi\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/mk/vidalia_mk.po
===================================================================
--- vidalia/trunk/pkg/win32/po/mk/vidalia_mk.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/mk/vidalia_mk.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/ml/vidalia_ml.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ml/vidalia_ml.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ml/vidalia_ml.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/mn/vidalia_mn.po
===================================================================
--- vidalia/trunk/pkg/win32/po/mn/vidalia_mn.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/mn/vidalia_mn.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/mr/vidalia_mr.po
===================================================================
--- vidalia/trunk/pkg/win32/po/mr/vidalia_mr.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/mr/vidalia_mr.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: mr\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/ms/vidalia_ms.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ms/vidalia_ms.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ms/vidalia_ms.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: ms\n"
+"Plural-Forms: nplurals=1; plural=0\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/mt/vidalia_mt.po
===================================================================
--- vidalia/trunk/pkg/win32/po/mt/vidalia_mt.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/mt/vidalia_mt.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: mt\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/nah/vidalia_nah.po
===================================================================
--- vidalia/trunk/pkg/win32/po/nah/vidalia_nah.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/nah/vidalia_nah.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: nah\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/nap/vidalia_nap.po
===================================================================
--- vidalia/trunk/pkg/win32/po/nap/vidalia_nap.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/nap/vidalia_nap.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: nap\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/ne/vidalia_ne.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ne/vidalia_ne.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ne/vidalia_ne.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/nn/vidalia_nn.po
===================================================================
--- vidalia/trunk/pkg/win32/po/nn/vidalia_nn.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/nn/vidalia_nn.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/nso/vidalia_nso.po
===================================================================
--- vidalia/trunk/pkg/win32/po/nso/vidalia_nso.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/nso/vidalia_nso.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:39+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: nso\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/oc/vidalia_oc.po
===================================================================
--- vidalia/trunk/pkg/win32/po/oc/vidalia_oc.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/oc/vidalia_oc.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: oc\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/pa/vidalia_pa.po
===================================================================
--- vidalia/trunk/pkg/win32/po/pa/vidalia_pa.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/pa/vidalia_pa.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/pap/vidalia_pap.po
===================================================================
--- vidalia/trunk/pkg/win32/po/pap/vidalia_pap.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/pap/vidalia_pap.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: pap\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/pms/vidalia_pms.po
===================================================================
--- vidalia/trunk/pkg/win32/po/pms/vidalia_pms.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/pms/vidalia_pms.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: pms\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/ps/vidalia_ps.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ps/vidalia_ps.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ps/vidalia_ps.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,16 +1,17 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: ps\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
@@ -18,16 +19,17 @@
msgctxt "BundleWelcomeText"
msgid ""
-"This wizard will guide you through the installation of Tor, "
-"Vidalia, Polipo, and Torbutton.\n\nTor is a system for using the "
-"Internet anonymously, helping you anonymize Web browsing and publishing, "
-"instant messaging, IRC, and more. Vidalia is a GUI that helps you "
-"control, monitor, and configure Tor.\n\nPolipo is a caching web proxy "
-"that helps increase performance of browsing the web through "
-"Tor.\n\nTorbutton is a Firefox extension that allows you to quickly "
-"enable or disable anonymous web browsing.\n\nIf you have previously "
-"installed Tor, Vidalia, Polipo, or Firefox, please make sure they are "
-"not running before continuing this installation.\n\n$_CLICK"
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -39,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -59,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -95,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -107,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -127,7 +141,9 @@
msgstr ""
msgctxt "PolipoGroupDesc"
-msgid "Polipo is a caching web proxy that increases performance of web browsing through Tor."
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
msgctxt "PolipoUninstDesc"
@@ -155,7 +171,9 @@
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -195,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/pt_BR/vidalia_pt_BR.po
===================================================================
--- vidalia/trunk/pkg/win32/po/pt_BR/vidalia_pt_BR.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/pt_BR/vidalia_pt_BR.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/sco/vidalia_sco.po
===================================================================
--- vidalia/trunk/pkg/win32/po/sco/vidalia_sco.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/sco/vidalia_sco.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:39+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: sco\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/son/vidalia_son.po
===================================================================
--- vidalia/trunk/pkg/win32/po/son/vidalia_son.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/son/vidalia_son.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:39+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: son\n"
+"Plural-Forms: nplurals=1; plural=0\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/su/vidalia_su.po
===================================================================
--- vidalia/trunk/pkg/win32/po/su/vidalia_su.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/su/vidalia_su.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: su\n"
+"Plural-Forms: nplurals=1; plural=0\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/sw/vidalia_sw.po
===================================================================
--- vidalia/trunk/pkg/win32/po/sw/vidalia_sw.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/sw/vidalia_sw.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/ta/vidalia_ta.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ta/vidalia_ta.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ta/vidalia_ta.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/te/vidalia_te.po
===================================================================
--- vidalia/trunk/pkg/win32/po/te/vidalia_te.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/te/vidalia_te.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/tg/vidalia_tg.po
===================================================================
--- vidalia/trunk/pkg/win32/po/tg/vidalia_tg.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/tg/vidalia_tg.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: tg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/ti/vidalia_ti.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ti/vidalia_ti.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ti/vidalia_ti.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: ti\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/tk/vidalia_tk.po
===================================================================
--- vidalia/trunk/pkg/win32/po/tk/vidalia_tk.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/tk/vidalia_tk.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: tk\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/ur/vidalia_ur.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ur/vidalia_ur.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ur/vidalia_ur.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,15 +1,17 @@
+#
msgid ""
msgstr ""
-"Project-Id-Version: Vidalia Windows Installers\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
"Last-Translator: \n"
"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);"
+"Language: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
@@ -17,16 +19,17 @@
msgctxt "BundleWelcomeText"
msgid ""
-"This wizard will guide you through the installation of Tor, "
-"Vidalia, Polipo, and Torbutton.\n\nTor is a system for using the "
-"Internet anonymously, helping you anonymize Web browsing and publishing, "
-"instant messaging, IRC, and more. Vidalia is a GUI that helps you "
-"control, monitor, and configure Tor.\n\nPolipo is a caching web proxy "
-"that helps increase performance of browsing the web through "
-"Tor.\n\nTorbutton is a Firefox extension that allows you to quickly "
-"enable or disable anonymous web browsing.\n\nIf you have previously "
-"installed Tor, Vidalia, Polipo, or Firefox, please make sure they are "
-"not running before continuing this installation.\n\n$_CLICK"
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -38,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -58,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -94,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -106,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -126,7 +141,9 @@
msgstr ""
msgctxt "PolipoGroupDesc"
-msgid "Polipo is a caching web proxy that increases performance of web browsing through Tor."
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
msgctxt "PolipoUninstDesc"
@@ -154,7 +171,9 @@
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -194,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/ve/vidalia_ve.po
===================================================================
--- vidalia/trunk/pkg/win32/po/ve/vidalia_ve.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/ve/vidalia_ve.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: ve\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/zh_HK/vidalia_zh_HK.po
===================================================================
--- vidalia/trunk/pkg/win32/po/zh_HK/vidalia_zh_HK.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/zh_HK/vidalia_zh_HK.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:40+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: zh_HK\n"
+"Plural-Forms: nplurals=1; plural=0\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
Modified: vidalia/trunk/pkg/win32/po/zu/vidalia_zu.po
===================================================================
--- vidalia/trunk/pkg/win32/po/zu/vidalia_zu.po 2011-03-02 09:35:31 UTC (rev 4524)
+++ vidalia/trunk/pkg/win32/po/zu/vidalia_zu.po 2011-03-02 09:45:37 UTC (rev 4525)
@@ -1,23 +1,35 @@
-#, fuzzy
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2008-07-12 05:29+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"PO-Revision-Date: 2011-03-02 09:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Language: zu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
msgctxt "BundleSetupCaption"
msgid "${BUNDLE_NAME} setup"
msgstr ""
msgctxt "BundleWelcomeText"
-msgid "This wizard will guide you through the installation of Tor, Vidalia, Privoxy, and Torbutton.\n\nTor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n\nPrivoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups.\n\nTorbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n\nIf you have previously installed Tor, Vidalia, Privoxy, or Firefox, please make sure they are not running before continuing this installation.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n"
+"\n"
+"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n"
+"\n"
+"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n"
+"\n"
+"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "BundleWelcomeTitle"
@@ -29,7 +41,11 @@
msgstr ""
msgctxt "BundleFinishText"
-msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox."
+msgid ""
+"Installation is complete.\n"
+"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n"
+"\n"
+"If you installed Torbutton, you will need to restart Firefox."
msgstr ""
msgctxt "BundleRunNow"
@@ -49,7 +65,10 @@
msgstr ""
msgctxt "VidaliaWelcomeText"
-msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK"
+msgid ""
+"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n"
+"\n"
+"$_CLICK"
msgstr ""
msgctxt "VidaliaWelcomeTitle"
@@ -85,7 +104,9 @@
msgstr ""
msgctxt "TorGroupDesc"
-msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more."
+msgid ""
+"Tor is a system for using the Internet anonymously, helping you anonymize "
+"Web browsing and publishing, instant messaging, IRC, and more."
msgstr ""
msgctxt "TorUninstDesc"
@@ -97,7 +118,10 @@
msgstr ""
msgctxt "TorAskOverwriteTorrc"
-msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?"
+msgid ""
+"You already have a Tor configuration file.$\n"
+"$\n"
+"Do you want to overwrite it with the default sample configuration file?"
msgstr ""
msgctxt "TorDocumentation"
@@ -116,36 +140,40 @@
msgid "Add ${TOR_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyGroupDesc"
-msgid "Privoxy is a filtering web proxy that protects your privacy and helps remove ads, banners, and popups."
+msgctxt "PolipoGroupDesc"
+msgid ""
+"Polipo is a caching web proxy that increases performance of web browsing "
+"through Tor."
msgstr ""
-msgctxt "PrivoxyUninstDesc"
-msgid "Remove ${PRIVOXY_DESC}."
+msgctxt "PolipoUninstDesc"
+msgid "Remove ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyAppDesc"
-msgid "Install ${PRIVOXY_DESC}."
+msgctxt "PolipoAppDesc"
+msgid "Install ${POLIPO_DESC}."
msgstr ""
-msgctxt "PrivoxyShortcuts"
+msgctxt "PolipoShortcuts"
msgid "Add to Start Menu"
msgstr ""
-msgctxt "PrivoxyShortcutsDesc"
-msgid "Add ${PRIVOXY_NAME} to your Start menu."
+msgctxt "PolipoShortcutsDesc"
+msgid "Add ${POLIPO_NAME} to your Start menu."
msgstr ""
-msgctxt "PrivoxyStartup"
+msgctxt "PolipoStartup"
msgid "Run At Startup"
msgstr ""
-msgctxt "PrivoxyStartupDesc"
-msgid "Automatically run ${PRIVOXY_NAME} at startup."
+msgctxt "PolipoStartupDesc"
+msgid "Automatically run ${POLIPO_NAME} at startup."
msgstr ""
msgctxt "TorbuttonGroupDesc"
-msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing."
+msgid ""
+"Torbutton is a Firefox extension that allows you to quickly enable or "
+"disable anonymous web browsing."
msgstr ""
msgctxt "TorbuttonUninstDesc"
@@ -185,23 +213,26 @@
msgstr ""
msgctxt "FirefoxWarningPageSubtitle"
-msgid "We recommend that you install Firefox before continuing, for best safety."
+msgid ""
+"We recommend that you install Firefox before continuing, for best safety."
msgstr ""
msgctxt "FirefoxWarningPageUpperText"
-msgid "The Mozilla Firefox Web browser is not installed on your computer.\n"
+msgid ""
+"The Mozilla Firefox Web browser is not installed on your computer.\n"
"Tor will work with other browsers, such as Internet Explorer, but\n"
"is easier to use with Firefox, which also does a better job of\n"
-"protecting your anonymity."
-"\n\n"
+"protecting your anonymity.\n"
+"\n"
"If you would like to install Firefox, please press Cancel, then go\n"
"to the Firefox download page at"
msgstr ""
msgctxt "FirefoxWarningPageLowerText"
-msgid "When you are done installing Firefox, you can once again run the\n"
-"Tor installer."
-"\n\n"
+msgid ""
+"When you are done installing Firefox, you can once again run the\n"
+"Tor installer.\n"
+"\n"
"Or, if you would prefer to install Tor without Firefox, simply\n"
"press Next to continue."
msgstr ""
1
0