[tor-commits] [vidalia/master] New and updated translations for the Vidalia help files

Wed Apr 13 11:24:05 UTC 2011

commit e8ae07094dc87be8f3b2007d181bffbd93fe3528
Author: Runa A. Sandvik <runa.sandvik at gmail.com>
Date:   Tue Apr 12 16:46:37 2011 +0100

    New and updated translations for the Vidalia help files
---
 src/vidalia/help/content/po/af/netview.po    |   37 ++---
 src/vidalia/help/content/po/ak/netview.po    |   37 ++---
 src/vidalia/help/content/po/am/netview.po    |   37 ++---
 src/vidalia/help/content/po/ar/config.po     |  279 ++++++++++++-------------
 src/vidalia/help/content/po/arn/netview.po   |   37 ++---
 src/vidalia/help/content/po/ast/netview.po   |   37 ++---
 src/vidalia/help/content/po/az/netview.po    |   37 ++---
 src/vidalia/help/content/po/be/netview.po    |   37 ++---
 src/vidalia/help/content/po/bg/netview.po    |   37 ++---
 src/vidalia/help/content/po/bn/netview.po    |   37 ++---
 src/vidalia/help/content/po/bn_IN/netview.po |   37 ++---
 src/vidalia/help/content/po/ca/netview.po    |   37 ++---
 src/vidalia/help/content/po/cs/netview.po    |   37 ++---
 src/vidalia/help/content/po/csb/netview.po   |   37 ++---
 src/vidalia/help/content/po/cy/netview.po    |   37 ++---
 src/vidalia/help/content/po/da/config.po     |  132 +++++++------
 src/vidalia/help/content/po/dz/netview.po    |   37 ++---
 src/vidalia/help/content/po/el/netview.po    |   37 ++---
 src/vidalia/help/content/po/eo/netview.po    |   37 ++---
 src/vidalia/help/content/po/et/netview.po    |   37 ++---
 src/vidalia/help/content/po/eu/netview.po    |   37 ++---
 src/vidalia/help/content/po/fil/netview.po   |   37 ++---
 src/vidalia/help/content/po/fur/netview.po   |   37 ++---
 src/vidalia/help/content/po/ga/netview.po    |   37 ++---
 src/vidalia/help/content/po/gl/netview.po    |   37 ++---
 src/vidalia/help/content/po/gu/netview.po    |   37 ++---
 src/vidalia/help/content/po/gun/netview.po   |   37 ++---
 src/vidalia/help/content/po/ha/netview.po    |   37 ++---
 src/vidalia/help/content/po/he/netview.po    |   37 ++---
 src/vidalia/help/content/po/hi/netview.po    |   37 ++---
 src/vidalia/help/content/po/hr/netview.po    |   37 ++---
 src/vidalia/help/content/po/ht/netview.po    |   37 ++---
 src/vidalia/help/content/po/hu/netview.po    |   37 ++---
 src/vidalia/help/content/po/id/netview.po    |   37 ++---
 src/vidalia/help/content/po/is/netview.po    |   37 ++---
 src/vidalia/help/content/po/kn/netview.po    |   37 ++---
 src/vidalia/help/content/po/kw/netview.po    |   37 ++---
 src/vidalia/help/content/po/lb/netview.po    |   37 ++---
 src/vidalia/help/content/po/ln/netview.po    |   37 ++---
 src/vidalia/help/content/po/lo/netview.po    |   37 ++---
 src/vidalia/help/content/po/lt/netview.po    |   37 ++---
 src/vidalia/help/content/po/lv/netview.po    |   37 ++---
 src/vidalia/help/content/po/mg/netview.po    |   37 ++---
 src/vidalia/help/content/po/mi/netview.po    |   37 ++---
 src/vidalia/help/content/po/mk/netview.po    |   37 ++---
 src/vidalia/help/content/po/ml/netview.po    |   37 ++---
 src/vidalia/help/content/po/mn/netview.po    |   37 ++---
 src/vidalia/help/content/po/mr/netview.po    |   37 ++---
 src/vidalia/help/content/po/ms/netview.po    |   37 ++---
 src/vidalia/help/content/po/mt/netview.po    |   37 ++---
 src/vidalia/help/content/po/nap/netview.po   |   37 ++---
 src/vidalia/help/content/po/nb/netview.po    |   37 ++---
 src/vidalia/help/content/po/ne/netview.po    |   37 ++---
 src/vidalia/help/content/po/nl/netview.po    |   37 ++---
 src/vidalia/help/content/po/nn/netview.po    |   37 ++---
 src/vidalia/help/content/po/nso/netview.po   |   37 ++---
 src/vidalia/help/content/po/oc/netview.po    |   37 ++---
 src/vidalia/help/content/po/pa/netview.po    |   37 ++---
 src/vidalia/help/content/po/pap/netview.po   |   37 ++---
 src/vidalia/help/content/po/pl/netview.po    |   37 ++---
 src/vidalia/help/content/po/pms/netview.po   |   37 ++---
 src/vidalia/help/content/po/ps/netview.po    |   37 ++---
 src/vidalia/help/content/po/pt/netview.po    |   37 ++---
 src/vidalia/help/content/po/pt_BR/netview.po |   37 ++---
 src/vidalia/help/content/po/ro/netview.po    |   37 ++---
 src/vidalia/help/content/po/sco/netview.po   |   37 ++---
 src/vidalia/help/content/po/son/netview.po   |   37 ++---
 src/vidalia/help/content/po/su/netview.po    |   37 ++---
 src/vidalia/help/content/po/sw/netview.po    |   37 ++---
 src/vidalia/help/content/po/ta/netview.po    |   37 ++---
 src/vidalia/help/content/po/te/netview.po    |   37 ++---
 src/vidalia/help/content/po/tg/netview.po    |   37 ++---
 src/vidalia/help/content/po/th/netview.po    |   37 ++---
 src/vidalia/help/content/po/ti/netview.po    |   37 ++---
 src/vidalia/help/content/po/tk/netview.po    |   37 ++---
 src/vidalia/help/content/po/tr/config.po     |  118 +++++------
 src/vidalia/help/content/po/tr/netview.po    |   37 ++---
 src/vidalia/help/content/po/uk/netview.po    |   37 ++---
 src/vidalia/help/content/po/ur/netview.po    |   37 ++---
 src/vidalia/help/content/po/ve/netview.po    |   37 ++---
 src/vidalia/help/content/po/vi/netview.po    |   37 ++---
 src/vidalia/help/content/po/wa/netview.po    |   37 ++---
 src/vidalia/help/content/po/zh_CN/netview.po |  124 ++++--------
 src/vidalia/help/content/po/zh_HK/netview.po |   37 ++---
 src/vidalia/help/content/po/zh_TW/netview.po |   37 ++---
 src/vidalia/help/content/po/zu/netview.po    |   37 ++---
 86 files changed, 1367 insertions(+), 2320 deletions(-)

diff --git a/src/vidalia/help/content/po/af/netview.po b/src/vidalia/help/content/po/af/netview.po
index 47f3d73..41a9038 100644
--- a/src/vidalia/help/content/po/af/netview.po
+++ b/src/vidalia/help/content/po/af/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/ak/netview.po b/src/vidalia/help/content/po/ak/netview.po
index 47f3d73..c3d32d8 100644
--- a/src/vidalia/help/content/po/ak/netview.po
+++ b/src/vidalia/help/content/po/ak/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ak\n"
+"Plural-Forms: nplurals=2; plural=n > 1\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/am/netview.po b/src/vidalia/help/content/po/am/netview.po
index 47f3d73..7ae44b2 100644
--- a/src/vidalia/help/content/po/am/netview.po
+++ b/src/vidalia/help/content/po/am/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: am\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/ar/config.po b/src/vidalia/help/content/po/ar/config.po
index b8d0f05..6823c38 100644
--- a/src/vidalia/help/content/po/ar/config.po
+++ b/src/vidalia/help/content/po/ar/config.po
@@ -1,35 +1,22 @@
 # 
-#   $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.
-# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: 2010-09-02 05:38+0200\n"
-"Last-Translator: shadi <shadi at 35point5.com>\n"
+"PO-Revision-Date: 2011-03-22 16:41+0000\n"
+"Last-Translator: gahgeer <gahgeer at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #. type: Content of: <html><body><h1>
 #: en/config.html:16
 msgid "Configuring Vidalia and Tor"
-msgstr "ØªÙƒÙˆÙŠÙ† ÙÙŠØ¯Ø§Ù„ÙŠØ§ ÙˆØªÙˆØ±"
+msgstr " ØªÙ‡ÙŠØ¦Ø© ÙÙŠØ¯Ø§Ù„ÙŠØ§ Ùˆ ØªÙˆØ±"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:20
@@ -38,9 +25,9 @@ msgid ""
 "of Vidalia and Tor. It also lets you set up and manage a <a "
 "href=\"server.html\">Tor relay</a> so you can help the Tor network grow."
 msgstr ""
-"ÙŠØ³Ù…Ø Ù„Ùƒ ÙÙŠØ¯Ø§Ù„ÙŠØ§ Ø¨ØªÙƒÙˆÙŠÙ† Ø¨Ø¹Ø¶ Ø§Ù„Ø¬ÙˆØ§Ù†Ø¨ Ø§Ù„Ù…Ø¹Ø¯Ù„Ø© Ø§Ù„Ø£ÙƒØ«Ø± Ø´ÙŠÙˆØ¹Ø§ Ù„ÙÙŠØ¯Ø§Ù„ÙŠØ§ ÙˆØªÙˆØ±. ÙŠØ³Ù…Ø "
-"Ù„Ùƒ Ø§ÙŠØ¶Ø§ Ø¨Ø¶Ø¨Ø· ÙˆØ¥Ø¯Ø§Ø±Ø© <a href=\"server.html\">Ù…Ø±ØÙ„ ØªÙˆØ±</a> ØØªÙ‰ ØªØªÙ…ÙƒÙ† Ù…Ù† Ù…Ø³Ø§Ø¹Ø¯Ø© "
-"Ø´Ø¨ÙƒØ© ØªÙˆØ± Ø¨Ø§Ù„Ù†Ù…ÙˆÙ‘.."
+"ÙÙŠØ¯Ø§Ù„ÙŠØ§ ÙŠØ³Ù…Ø Ù„Ùƒ Ø¨ØªÙ‡ÙŠØ¦Ø© Ø¨Ø¹Ø¶ Ø§Ù„Ø¬ÙˆØ§Ù†Ø¨ Ø§Ù„ØªÙŠ ÙŠØ¹Ø¯Ù„Ù‡Ø§ Ø§Ù„Ø¹Ø¯ÙŠØ¯ Ù…Ù† Ù…Ø³ØªØ®Ø¯Ù…ÙŠ ÙÙŠØ¯Ø§Ù„ÙŠØ§ Ùˆ "
+"ØªÙˆØ±. ÙƒÙ…Ø§ Ø£Ù†Ù‡ ÙŠØªÙŠØ Ù„Ùƒ Ø¥Ù†Ø´Ø§Ø¡ ÙˆØ¥Ø¯Ø§Ø±Ø© <a href=\"server.html\">ØªÙˆØµÙŠÙ„Ø© ØªÙˆØ±</a> ØØªÙ‰"
+" ØªØªÙ…ÙƒÙ† Ù…Ù† Ù…Ø³Ø§Ø¹Ø¯Ø© Ø´Ø¨ÙƒØ© ØªÙˆØ± Ø¹Ù„Ù‰ Ø§Ù„Ù†Ù…Ùˆ."
 
 #. type: Content of: <html><body>
 #: en/config.html:26
@@ -50,26 +37,29 @@ msgstr "<a name=\"general\"/>"
 #. type: Content of: <html><body><h3>
 #: en/config.html:27
 msgid "General Settings"
-msgstr "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø¹Ø§Ù…Ø©"
+msgstr "Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø¹Ø§Ù…Ø©"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:29
-msgid "Settings on the <i>General</i> page are the most commonly modified settings."
-msgstr "Ø§Ù„Ø§Ø¹Ø¯Ø§Ø¯Ø§Øª ÙÙŠ Ø§Ù„ØµÙØØ© <i>Ø§Ù„Ø¹Ø§Ù…Ø©</i> Ù‡ÙŠ Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø£ÙƒØ«Ø± ØªØ¹Ø¯ÙŠÙ„Ø§."
+msgid ""
+"Settings on the <i>General</i> page are the most commonly modified settings."
+msgstr ""
+"Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø¹Ù„Ù‰ Ø§Ù„ØµÙØØ© <i>Ø§Ù„Ø¹Ø§Ù…Ø©</i>Ø§Ù„ØªÙŠ ÙŠØ±ØºØ¨ ÙÙŠ ØªØ¨Ø¯ÙŠÙ„Ù‡Ø§ Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙˆÙ†  ØªØ´Ù…Ù„ Ù…Ø¹Ø¸Ù…"
+" Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:32
 msgid ""
-"<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 "
+"<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."
 msgstr ""
-"<b>ØªÙˆØ± Ø§Ù„ØªÙ†ÙÙŠØ°ÙŠ</b>: Ù‡Ùˆ ØªÙˆØ± Ø§Ù„ØªÙ†ÙÙŠØ°ÙŠ Ø§Ù„Ø°ÙŠ Ø³ÙˆÙ ÙŠÙ‚ÙˆÙ… ÙÙŠØ¯Ø§Ù„ÙŠØ§ Ø¨ØªØ´ØºÙŠÙ„Ù‡ Ø¹Ù†Ø¯ "
-"Ø¥Ø®ØªÙŠØ§Ø±Ùƒ <i>Ø¨Ø¯Ø¡</i> Ù…Ù† Ù‚Ø§Ø¦Ù…Ø© Ø§Ù„Ø´Ø±ÙŠØ·. Ø§Ø°Ø§ ÙƒØ§Ù† Ù„Ø¯ÙŠÙƒ Ø¹Ø¯Ø© Ø¥ØµØ¯Ø§Ø±Ø§Øª Ù…Ø«Ø¨ØªØ© Ù„ØªÙˆØ±, "
-"ÙŠÙ…ÙƒÙ†Ùƒ Ø¥Ø®Ø¨Ø§Ø± ÙÙŠØ¯Ø§Ù„ÙŠØ§ Ø£ÙŠ Ø¥ØµØ¯Ø§Ø± ØªØ±ÙŠØ¯ ØªØ´ØºÙŠÙ„Ù‡ Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ù†Ù‚Ø± Ø²Ø± <i>ØªØµÙÙ‘Ø</i> "
-"ÙˆØ§Ù„Ø§Ù†ØªÙ‚Ø§Ù„ Ø§Ù„Ù‰ ØªØ«Ø¨ÙŠØª ØªÙˆØ± Ø§Ù„Ù…Ø¹ÙŠÙ† Ø§Ù„Ø°ÙŠ ØªØ±ÙŠØ¯Ù‡."
+"<b>Ù…Ù„Ù ØªÙˆØ± Ø§Ù„ØªÙ†ÙÙŠØ°ÙŠ</b> : Ù‡Ø°Ø§ Ù‡Ùˆ Ø§Ù„Ù…Ù„Ù Ø§Ù„Ù‚Ø§Ø¨Ù„ Ù„Ù„ØªÙ†ÙÙŠØ° Ø§Ù„Ø°ÙŠ Ø³ØªÙ‚ÙˆÙ… Ø¨ØªØ´ØºÙŠÙ„Ù‡ "
+"ÙÙŠØ¯Ø§Ù„ÙŠØ§ Ø¹Ù†Ø¯ Ø§Ø®ØªÙŠØ§Ø±<i>Ø§Ø¨Ø¯Ø£</i> Ù…Ù† Ø§ÙŠÙ‚ÙˆÙ†Ø© ØªÙˆØ±. Ø¥Ø°Ø§ ÙƒØ§Ù† Ø¹Ù†Ø¯Ùƒ Ø¥ØµØ¯Ø§Ø±Ø§Øª Ù…ØªØ¹Ø¯Ø¯Ø© Ù…Ù† "
+"ØªÙˆØ± ØŒ ÙÙ…Ù† Ø§Ù„Ù…Ù…ÙƒÙ† Ø£Ù† ØªØ®ØªØ§Ø± Ø§Ù„Ø¥ØµØ¯Ø§Ø± Ø§Ù„Ø°ÙŠ ØªØ±ØºØ¨ ÙÙŠ ØªØ´ØºÙŠÙ„Ù‡ Ø¨Ø§Ù„Ù†Ù‚Ø± Ø¹Ù„Ù‰ "
+"<i>Ø§Ø³ØªØ¹Ø±Ø§Ø¶</i ÙˆØ§Ù„Ø§Ù†ØªÙ‚Ø§Ù„ Ø¥Ù„Ù‰ ØªØ«Ø¨ÙŠØª Ø§ØµØ¯Ø§Ø± ØªÙˆØ± Ø§Ù„Ø°ÙŠ ØªØ±ÙŠØ¯ ØªØ«Ø¨ÙŠØªÙ‡."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:39
@@ -78,14 +68,14 @@ msgid ""
 "automatically start Tor when Vidalia starts. You can also configure Vidalia "
 "to run when your system starts (<i>Windows only</i>)."
 msgstr ""
-"<b>Ø®ÙŠØ§Ø±Ø§Øª Ø¨Ø¯Ø¡ Ø§Ù„ØªØ´ØºÙŠÙ„</b>: Ù‡Ø°Ø§ Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯ ÙŠØ³Ù…Ø Ù„Ùƒ Ø¨ØªØ´ØºÙŠÙ„ ÙÙŠØ¯Ø§Ù„ÙŠØ§ Ù„ØªÙˆØ± ØªÙ„Ù‚Ø§Ø¦ÙŠØ§ "
-"Ø¹Ù†Ø¯ ØªØ´ØºÙŠÙ„ ÙÙŠØ¯Ø§Ù„ÙŠØ§. ÙŠÙ…ÙƒÙ†Ùƒ Ø£ÙŠØ¶Ø§ ØªÙƒÙˆÙŠÙ† ÙÙŠØ¯Ø§Ù„ÙŠØ§ Ù„ÙŠØªÙ… ØªØ´ØºÙŠÙ„Ù‡ Ø¹Ù†Ø¯ Ø¨Ø¯Ø¡ ØªØ´ØºÙŠÙ„ Ø§Ù„Ù†Ø¸Ø§Ù… "
-"Ø§Ù„Ø®Ø§Øµ Ø¨Ùƒ (<i>Ù†Ø¸Ø§Ù… ÙˆÙŠÙ†Ø¯ÙˆØ² ÙÙ‚Ø·</i>)."
+"<b>Ø¨Ø¯Ø¡ Ø§Ù„ØªØ´ØºÙŠÙ„ Ø®ÙŠØ§Ø±Ø§Øª</b> : Ù‡Ø°Ø§ Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯ ÙŠØ³Ù…Ø Ø¨Ø¬Ø¹Ù„  ØªÙˆØ± ÙŠØ¹Ù…Ù„ ØªÙ„Ù‚Ø§Ø¦ÙŠØ§ Ø¹Ù†Ø¯Ù…Ø§ "
+"ÙŠØ¨Ø¯Ø£ ÙÙŠØ¯Ø§Ù„ÙŠØ§. ÙŠÙ…ÙƒÙ†Ùƒ Ø£ÙŠØ¶Ø§ ØªÙ‡ÙŠØ¦Ø© ÙÙŠØ¯Ø§Ù„ÙŠØ§ Ø¨ØÙŠØ« ÙŠØ¹Ù…Ù„ Ø¹Ù†Ø¯ Ø¨Ø¯Ø¡ ØªØ´ØºÙŠÙ„ Ø¬Ù‡Ø§Ø² Ø§Ù„ÙƒØ¨Ù…ÙˆØªØ±"
+" <i>(ÙˆÙŠÙ†Ø¯ÙˆØ² ÙÙ‚Ø·).</i>"
 
 #. type: Content of: <html><body>
 #: en/config.html:46
 msgid "<a name=\"network\"/>"
-msgstr "<a name=\"network\"/>"
+msgstr "<a name=\"Ø§Ù„Ø´Ø¨ÙƒØ©\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:47
@@ -95,9 +85,11 @@ msgstr "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø´Ø¨ÙƒØ©"
 #. type: Content of: <html><body><p>
 #: en/config.html:49
 msgid ""
-"The <i>Network</i> settings page lets you change how Tor connects to the Tor "
-"network."
-msgstr "ØµÙØØ© Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª <i>Ø§Ù„Ø´Ø¨ÙƒØ©</i> ØªØªÙŠØ Ù„Ùƒ ØªØºÙŠÙŠØ± ÙƒÙŠÙÙŠØ© Ø¥ØªØµØ§Ù„ ØªÙˆØ± Ø¨Ø´Ø¨ÙƒØ© ØªÙˆØ±."
+"The <i>Network</i> settings page lets you change how Tor connects to the Tor"
+" network."
+msgstr ""
+"ØµÙØØ© Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª <i>Ø§Ù„Ø´Ø¨ÙƒØ©</i> ØªØªÙŠØ Ù„Ùƒ ØªØºÙŠÙŠØ± ÙƒÙŠÙ ÙŠØªØµÙ„  Ø¨Ø±Ù†Ø§Ù…Ø¬ ØªÙˆØ± Ø¨Ø´Ø¨ÙƒØ© ØªÙˆØ± "
+"Ø§Ù„Ù…Ø±ÙƒØ²ÙŠØ©."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:53
@@ -110,13 +102,12 @@ msgid ""
 "you can also enter the <i>Username</i> and <i>Password</i> you use to "
 "connect to your proxy.  Otherwise, you can leave those fields blank."
 msgstr ""
-"<b>Ø£Ù†Ø§ Ø£Ø³ØªØ®Ø¯Ù… ÙˆÙƒÙŠÙ„ Ù„Ù„ÙˆØµÙˆÙ„ Ø§Ù„Ù‰ Ø§Ù„Ø§Ù†ØªØ±Ù†Øª</b>: Ø§Ø°Ø§ ÙƒØ§Ù† Ø§ØªØµØ§Ù„ Ø§Ù„Ø§Ù†ØªØ±Ù†Øª Ø§Ù„Ø®Ø§Øµ Ø¨Ùƒ "
-"ÙŠØªØ·Ù„Ø¨ ÙˆÙƒÙŠÙ„ Ø¨Ø±ÙˆØªÙˆÙƒÙˆÙ„ Ù†Ù‚Ù„ Ø§Ù„Ù†Øµ Ø§Ù„ØªØ´Ø¹Ø¨ÙŠ (HTTP), ÙŠÙ…ÙƒÙ†Ùƒ ØªÙƒÙˆÙŠÙ† ØªÙˆØ± Ù„Ø¥Ø±Ø³Ø§Ù„ Ø¬Ù…ÙŠØ¹ "
-"Ø·Ù„Ø¨Ø§Øª Ø§Ù„Ø¯Ù„ÙŠÙ„ Ø§Ù„Ø®Ø§ØµØ© Ø¨Ù‡ ÙˆØ§ØªØµØ§Ù„Ø§Øª Ù…Ø±ØÙ„ ØªÙˆØ± Ù…Ù† Ø®Ù„Ø§Ù„ Ø§Ù„ÙˆÙƒÙŠÙ„ Ø§Ù„Ø®Ø§Øµ Ø¨Ùƒ. ÙŠØ¬Ø¨ Ø¹Ù„ÙŠÙƒ "
-"ØªØØ¯ÙŠØ¯ Ø¹Ù„Ù‰ Ø§Ù„Ø§Ù‚Ù„ Ø§Ø³Ù… Ø§Ù„Ù…Ø³Ø¶ÙŠÙ Ø£Ùˆ Ø¹Ù†ÙˆØ§Ù† Ø§Ù„ÙˆÙƒÙŠÙ„ Ø§Ù„Ø®Ø§Øµ Ø¨Ùƒ, ÙˆØ§Ù„Ù…Ù†ÙØ° Ø§Ù„Ø°ÙŠ ÙŠØµØºÙŠ Ø§Ù„ÙŠÙ‡ "
-"Ø§Ù„ÙˆÙƒÙŠÙ„ Ø§Ù„Ø®Ø§Øµ Ø¨Ùƒ Ù„Ù„Ø§ØªØµØ§Ù„Ø§Øª. Ø§Ø°Ø§ Ø·Ù„Ø¨ ÙˆÙƒÙŠÙ„Ùƒ Ù…ØµØ§Ø¯Ù‚Ø©, ÙŠÙ…ÙƒÙ†Ùƒ Ø§ÙŠØ¶Ø§ Ø¥Ø¯Ø®Ø§Ù„ <i>Ø§Ø³Ù… "
-"Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…</i> Ùˆ <i>ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±</i> Ø§Ù„Ø°ÙŠÙ† ØªØ³ØªØ®Ø¯Ù…Ù‡Ù… Ù„Ù„Ø§ØªØµØ§Ù„ Ø¨Ø§Ù„ÙˆÙƒÙŠÙ„ Ø§Ù„Ø®Ø§Øµ Ø¨Ùƒ.  "
-"ÙˆØ¥Ù„Ø§, ÙŠÙ…ÙƒÙ†Ùƒ ØªØ±Ùƒ Ù‡Ø°Ù‡ Ø§Ù„ØÙ‚ÙˆÙ„ ÙØ§Ø±ØºØ©."
+"<b>Ø£Ù†Ø§ Ø§Ø³ØªØ®Ø¯Ù… ÙˆÙƒÙŠÙ„ Ù„Ù„ÙˆØµÙˆÙ„ Ø¥Ù„Ù‰ Ø§Ù„Ø¥Ù†ØªØ±Ù†Øª</b> : Ø¥Ø°Ø§ ÙƒØ§Ù† Ø§ØªØµØ§Ù„ Ø¥Ù†ØªØ±Ù†Øª Ù„Ø¯ÙŠÙƒ ÙŠØªØ·Ù„Ø¨"
+" Ø¹Ù†ÙˆØ§Ù† Ø§Ù„Ø¨Ø±ÙˆÙƒØ³ÙŠ ØŒ ÙŠÙ…ÙƒÙ†Ùƒ ØªÙ‡ÙŠØ¦Ø© ØªÙˆØ± Ù„Ø¥Ø±Ø³Ø§Ù„ Ø¬Ù…ÙŠØ¹ Ø·Ù„Ø¨Ø§Øª Ø§Ù„Ø¯Ù„ÙŠÙ„ ÙˆØªØªØ§Ø¨Ø¹ Ø§Ù„Ø§ØªØµØ§Ù„Ø§Øª "
+"Ù…Ù† Ø®Ù„Ø§Ù„ Ø§Ù„Ø¨Ø±ÙˆÙƒØ³ÙŠ. ÙŠØ¬Ø¨ ØªØØ¯ÙŠØ¯ Ø§Ø³Ù… Ø§Ù„Ù…Ø¶ÙŠÙ Ø£Ùˆ Ø¹Ù†ÙˆØ§Ù† Ø§Ù„ÙˆÙƒÙŠÙ„ Ø§Ù„Ø®Ø§Øµ Ø¨Ùƒ  Ø¹Ù„Ù‰ Ø§Ù„Ø§Ù‚Ù„ØŒ "
+"Ùˆ Ø§Ù„Ø¨ÙˆØ±Øª portØ§Ù„Ø°ÙŠ Ø§Ù„ÙˆÙƒÙŠÙ„ ÙŠØµØºÙŠ Ù„Ù„Ø§ØªØµØ§Ù„Ø§Øª. Ø¥Ø°Ø§ Ø§Ù„ÙˆÙƒÙŠÙ„ ÙŠØªØ·Ù„Ø¨ Ø§Ù† ÙƒØ§Ù† Ø§Ù„Ø¨Ø±ÙˆÙƒØ³ÙŠ "
+"ÙŠØªØ·Ù„Ø¨ Ø§Ù„ØªØÙ‚Ù‚ ØŒ ÙÙŠÙ…ÙƒÙ†Ùƒ Ø£ÙŠØ¶Ø§ Ø¥Ø¯Ø®Ø§Ù„ <i>Ø§Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… ÙˆÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±</i> Ø§Ù„Ø°ÙŠ "
+"ØªØ³ØªØ®Ø¯Ù…Ù‡ Ù„Ù„Ø§ØªØµØ§Ù„ . Ø®Ù„Ø§Ù Ø°Ù„Ùƒ ØŒ ÙŠÙ…ÙƒÙ†Ùƒ ØªØ±Ùƒ Ù‡Ø°Ù‡ Ø§Ù„ØÙ‚ÙˆÙ„ ÙØ§Ø±ØºØ©."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:62
@@ -125,14 +116,14 @@ msgid ""
 "a restrictive firewall or proxy that limits the ports you are able to "
 "connect to, you can configure Tor to connect directly only to relays "
 "listening on the ports allowed by your firewall or proxy. Simply enter a "
-"list of ports permitted by your firewall or proxy, separated by "
-"commas. (<i>Example: 80,443,8080</i>)"
+"list of ports permitted by your firewall or proxy, separated by commas. "
+"(<i>Example: 80,443,8080</i>)"
 msgstr ""
-"<b>Ø¬Ø¯Ø§Ø± Ø§Ù„ØÙ…Ø§ÙŠØ© Ø§Ù„Ø®Ø§Øµ Ø¨ÙŠ ÙŠØ³Ù…Ø Ù„ÙŠ ÙÙ‚Ø· Ø¨Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ù…Ù†Ø§ÙØ° Ù…Ø¹ÙŠÙ†Ø©</b>: Ø¥Ø°Ø§ ÙƒÙ†Øª ØªØ¹Ù…Ù„ "
-"Ø®Ù„Ù Ø¬Ø¯Ø§Ø± ØÙ…Ø§ÙŠØ© Ø£Ùˆ ÙˆÙƒÙŠÙ„ ØªÙ‚ÙŠÙŠØ¯ÙŠ ÙŠØØ¯ Ù…Ù† Ø§Ù„Ù…Ù†Ø§ÙØ° Ø§Ù„ØªÙŠ ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ù‡Ø§, ÙŠÙ…ÙƒÙ†Ùƒ "
-"ØªÙƒÙˆÙŠÙ† ØªÙˆØ± Ù„Ù„Ø§ØªØµØ§Ù„ Ù…Ø¨Ø§Ø´Ø±Ø© Ø¨Ù…Ø±ØÙ„Ø§Øª ÙÙ‚Ø· ØªØ³ØªÙ…Ø¹ Ø¹Ù„Ù‰ Ø§Ù„Ù…Ù†Ø§ÙØ° Ø§Ù„Ù…Ø³Ù…ÙˆØ Ø¨Ù‡Ø§ Ù…Ù† Ù‚Ø¨Ù„ "
-"Ø¬Ø¯Ø§Ø± Ø§Ù„ØÙ…Ø§ÙŠØ© Ø£Ùˆ Ø§Ù„ÙˆÙƒÙŠÙ„ Ø§Ù„Ø®Ø§Øµ Ø¨Ùƒ. ÙŠÙƒÙÙŠ Ø£Ù† ØªØ¯Ø®Ù„ Ù‚Ø§Ø¦Ù…Ø© Ø§Ù„Ù…Ù†Ø§ÙØ° Ø§Ù„ØªÙŠ ÙŠØ³Ù…Ø Ø¨Ù‡Ø§ "
-"Ø¬Ø¯Ø§Ø± Ø§Ù„ØÙ…Ø§ÙŠØ© Ø£Ùˆ Ø§Ù„ÙˆÙƒÙŠÙ„ Ø§Ù„Ø®Ø§Øµ Ø¨Ùƒ, Ù…ÙØµÙˆÙ„Ø© Ø¨ÙÙˆØ§ØµÙ„. (<i>Ù…Ø«Ø§Ù„: 80,443,8080</i>)"
+"<b> ÙÙ‚Ø· Ø¬Ø¯Ø§Ø± Ø§Ù„ØÙ…Ø§ÙŠØ© ÙŠØªÙŠØ Ù„ÙŠ Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ù…Ù†Ø§ÙØ° Ù…Ø¹ÙŠÙ†Ø©</b> : Ø¥Ø°Ø§ ÙƒÙ†Øª Ø®Ù„Ù Ø¬Ø¯Ø§Ø± "
+"ØÙ…Ø§ÙŠØ©  Ø£Ùˆ Ø£ÙŠ Ù‚ÙŠÙˆØ¯ ØªØØ¯ Ù…Ù† Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø§Ù„Ø¨ÙˆØ±ØªØ§Øª Ù„Ù„Ø§ØªØµØ§Ù„ Ø¨Ø´Ø¨ÙƒØ© ØªÙˆØ±ØŒ ÙŠÙ…ÙƒÙ†Ùƒ ØªÙ‡ÙŠØ¦Ø© ØªÙˆØ±"
+" Ù„Ù„ØªÙˆØ§ØµÙ„ ÙÙ‚Ø·  Ù…Ø¹ ØªØ¨Ø¯ÙŠÙ„Ø§Øª Ù…Ø³Ù…ÙˆØ Ø¨Ù‡Ø§ Ù…Ù† Ù‚Ø¨Ù„ Ø¬Ø¯Ø§Ø± Ø§Ù„ØÙ…Ø§ÙŠØ© Ø£Ùˆ Ø§Ù„Ø¨Ø±ÙˆÙƒØ³ÙŠ. ÙŠÙƒÙÙŠ Ø£Ù† "
+"ØªØ¯Ø®Ù„ Ù‚Ø§Ø¦Ù…Ø© Ø§Ù„Ù…Ù†Ø§ÙØ° Ø§Ùˆ Ø§Ù„Ø¨ÙˆØ±ØªØ§Øª Ø§Ù„ØªÙŠ ÙŠØ³Ù…Ø Ø¨Ù‡Ø§ Ø¬Ø¯Ø§Ø± Ø§Ù„ØÙ…Ø§ÙŠØ© Ø£Ùˆ Ø§Ù„ÙˆÙƒÙŠÙ„ ØŒ Ø¨ÙŠÙ†Ù‡Ø§ "
+"ÙØ§ØµÙ„Ø© . <i>(Ù…Ø«Ø§Ù„ : 80ØŒ443ØŒ8080)</i>"
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:69
@@ -141,20 +132,19 @@ msgid ""
 "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."
+"or newer only). You can add bridge relays by specifying either their address"
+" and port number, or their address, port number, and fingerprint."
 msgstr ""
-"<b>Ù…Ø²ÙˆØ¯ Ø®Ø¯Ù…Ø© Ø§Ù„Ø§Ù†ØªØ±Ù†Øª (ISP) Ø§Ù„Ø®Ø§Øµ Ø¨ÙŠ ÙŠÙ…Ù†Ø¹ Ø§Ù„Ø§ØªØµØ§Ù„Ø§Øª Ø§Ù„Ù‰ Ø´Ø¨ÙƒØ© ØªÙˆØ±</b>: Ø§Ø°Ø§ "
-"ÙƒØ§Ù† Ù…Ø²ÙˆØ¯ Ø®Ø¯Ù…Ø© Ø§Ù„Ø§Ù†ØªØ±Ù†Øª (ISP) Ø§Ù„Ø®Ø§Øµ Ø¨Ùƒ ÙŠÙ…Ù†Ø¹ Ø§Ù„Ø§ØªØµØ§Ù„Ø§Øª Ø§Ù„Ù‰ Ø´Ø¨ÙƒØ© ØªÙˆØ±, ÙŠØ³ØªØ·ÙŠØ¹ "
-"ØªÙˆØ± Ù…ØØ§ÙˆÙ„Ø© ØªØ¬Ù†Ø¨ Ø§Ù„ØªØ¹Ø±Ø¶ Ù„Ù„ØªØµÙÙŠØ© Ø¹Ù† Ø·Ø±ÙŠÙ‚ ØªØ´ÙÙŠØ± Ø§ØªØµØ§Ù„Ø§Øª Ø§Ù„Ø¯Ù„ÙŠÙ„ Ø§Ù„Ø®Ø§Øµ Ø¨Ù‡ "
-"ÙˆØ§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø´Ø¨ÙƒØ© ØªÙˆØ± Ø¹Ø¨Ø± Ù…Ø±ØÙ„Ø§Øª ØªØ³Ù…Ù‰ <i>Ø¬Ø³ÙˆØ±</i> (Tor 0.2.0.3-alpha Ø§Ùˆ Ø§ØØ¯Ø« "
-"ÙÙ‚Ø·). ÙŠÙ…ÙƒÙ†Ùƒ Ø¥Ø¶Ø§ÙØ© Ù…Ø±ØÙ„Ø§Øª Ø¬Ø³Ø± Ø¹Ù† Ø·Ø±ÙŠÙ‚ ØªØØ¯ÙŠØ¯ Ø¥Ù…Ø§ Ø¹Ù†ÙˆØ§Ù† ÙˆØ±Ù‚Ù… Ø§Ù„Ù…Ù†ÙØ° Ø§Ù„Ø®Ø§Øµ Ø¨Ù‡Ù… "
-"Ø§Ùˆ Ø§Ù„Ø¹Ù†ÙˆØ§Ù† ÙˆØ±Ù‚Ù… Ø§Ù„Ù…Ù†ÙØ° ÙˆØ§Ù„Ø¨ØµÙ…Ø© Ø§Ù„Ø®Ø§Øµ Ø¨Ù‡Ù…."
+"<b>Ù…Ù‚Ø¯Ù…ÙŠ Ø®Ø¯Ù…Ø§Øª Ø§Ù„Ø¥Ù†ØªØ±Ù†Øª ÙŠØØ¸Ø± Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø´Ø¨ÙƒØ© ØªÙˆØ±</b> : Ø¥Ø°Ø§ ÙƒØ§Ù† (Ù…Ù‚Ø¯Ù… Ø§Ù„Ø®Ø¯Ù…Ø©) "
+"ÙŠØØ¸Ø± Ø§Ù„Ø§ØªØµØ§Ù„Ø§Øª Ù…Ø¹ Ø´Ø¨ÙƒØ© ØªÙˆØ± ØŒ ÙØ¥Ù† ØªÙˆØ±  Ø¨Ø§Ù…ÙƒØ§Ù†Ù‡ Ù…ØØ§ÙˆÙ„Ø© ØªØ¬Ù†Ø¨ Ù…Ù†Ø¹Ù‡Ø§  Ù…Ù† Ø®Ù„Ø§Ù„ "
+"ØªØ´ÙÙŠØ± Ø§Ù„Ø§ØªØµØ§Ù„Ø§Øª ÙˆØ§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø§Ù„Ø´Ø¨ÙƒØ© Ù…Ù† Ø®Ù„Ø§Ù„ Ø§Ù„ØªØ¨Ø¯ÙŠÙ„Ø§Øª ÙˆØ§Ù„ØªÙŠ ØªØ³Ù…Ù‰ <i>Ø§Ù„Ø¬Ø³ÙˆØ±</i> "
+"(ØªÙˆØ± 0.2.0.3-Ø£Ù„ÙØ§ Ø£Ùˆ Ø·Ø±Ø§Ø²Ø§Øª Ø£ØØ¯Ø«). ÙŠÙ…ÙƒÙ†Ùƒ Ø¥Ø¶Ø§ÙØ© Ø¬Ø³ÙˆØ± Ø¥Ù…Ø§ Ø¹Ù† Ø·Ø±ÙŠÙ‚ ØªØØ¯ÙŠØ¯ "
+"Ø¹Ù†ÙˆØ§Ù†Ù‡Ù… ÙˆØ±Ù‚Ù… Ø§Ù„Ù…Ù†ÙØ° ØŒ Ø£Ùˆ Ø¹Ù†ÙˆØ§Ù† ÙˆØ±Ù‚Ù… Ø§Ù„Ù…Ù†ÙØ° ØŒ ÙˆØ¨ØµÙ…ØªÙ‡."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:77
 msgid "Below are examples of valid bridge address formats:"
-msgstr "ÙˆÙÙŠÙ…Ø§ ÙŠÙ„ÙŠ Ø£Ù…Ø«Ù„Ø© Ø¹Ù„Ù‰ ØµÙŠØº Ø¹Ù†ÙˆØ§Ù† Ø¬Ø³Ø± ØµØ§Ù„Ø:"
+msgstr "ÙÙŠÙ…Ø§ ÙŠÙ„ÙŠ Ø£Ù…Ø«Ù„Ø© Ù…Ù† Ù†Ù…Ø§Ø°Ø¬ ØµØ§Ù„ØØ© Ù„Ù„Ø¬Ø³ÙˆØ± : "
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:80
@@ -176,44 +166,44 @@ msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73"
 msgid ""
 "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 "
+"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."
 msgstr ""
-"ØØªÙ‰ Ø§Ø°Ø§ ÙƒÙ†Øª Ù„Ø§ ØªØ¹Ø±Ù Ø§ÙŠØ© Ø¹Ù†Ø§ÙˆÙŠÙ† Ù…Ø±ØÙ‘Ù„ Ø§Ù„Ø¬Ø³Ø±, ØªÙÙ‚Ù‘Ø¯ ØµÙ†Ø¯ÙˆÙ‚ Ø§Ù„ÙØØµ ÙŠÙ…ÙƒÙ† Ø§Ù† Ù„Ø§ "
-"ÙŠØ²Ø§Ù„ Ù…ÙÙŠØ¯Ø§. Ø³ÙˆÙ ÙŠÙ‚ÙˆÙ… ØªÙˆØ± Ø¨ØªØ´ÙÙŠØ± Ø·Ù„Ø¨Ø§Øª Ø§Ù„Ø¯Ù„ÙŠÙ„ Ø§Ù„Ø®Ø§Øµ Ø¨Ù‡ Ø§Ù„ØªÙŠ ÙŠÙ…ÙƒÙ†Ù‡Ø§ Ù‡Ø²ÙŠÙ…Ø© "
-"Ø¢Ù„ÙŠØ§Øª Ø§Ù„Ù…Ù†Ø¹ Ø§Ù„ØªÙŠ ØªØØ§ÙˆÙ„ ØªØµÙÙŠØ© Ø·Ù„Ø¨Ø§Øª ØªÙˆØ± Ù„Ù„ØØµÙˆÙ„ Ø¹Ù„Ù‰ Ù…Ø¹Ù„ÙˆÙ…Ø§Øª ØÙˆÙ„ Ø§Ù„Ù…Ø±ØÙ„Ø§Øª "
-"Ø§Ù„Ø£Ø®Ø±Ù‰. Ø§Ø°Ø§ ÙƒØ§Ù†Øª Ø§Ù„Ø§ØªØµØ§Ù„Ø§Øª Ø§Ù„Ù‰ Ù…Ø±ØÙ„Ø§Øª ØªÙˆØ± Ø§Ù„Ø¹Ø§Ø¯ÙŠØ© Ù…ØØ¸ÙˆØ±Ø© Ø§ÙŠØ¶Ø§, ÙØ¥Ù†Ùƒ ØªØØªØ§Ø¬ "
-"Ø§Ù„Ù‰ ØªØ¹Ù„Ù‘Ù… Ø¹Ù†ÙˆØ§Ù† Ù…Ø±ØÙ„ Ø¬Ø³Ø± Ø¨Ø·Ø±ÙŠÙ‚Ø© Ù…Ø§ ÙˆØ¥Ø¶Ø§ÙØªÙ‡ Ù‡Ù†Ø§. Ø£Ù†Ø¸Ø± Ù…ÙˆØ¶ÙˆØ¹ Ø§Ù„Ù…Ø³Ø§Ø¹Ø¯Ø© ØÙˆÙ„ <a "
-"href=\"bridges.html#finding\">Ø¥ÙŠØ¬Ø§Ø¯ Ù…Ø±ØÙ„Ø§Øª Ø¬Ø³Ø±</a> Ù„Ù„Ù…Ø²ÙŠØ¯ Ù…Ù† Ø§Ù„Ù…Ø¹Ù„ÙˆÙ…Ø§Øª ØÙˆÙ„ "
-"ÙƒÙŠÙÙŠØ© ØªØ¹Ù„Ù‘Ù… Ø¹Ù†Ø§ÙˆÙŠÙ† Ù…Ø±ØÙ‘Ù„ Ø§Ù„Ø¬Ø³Ø± ÙˆØ§Ù„Ø¨ØµÙ…Ø§Øª."
+"ÙˆØØªÙ‰ Ù„Ùˆ ÙƒÙ†Øª Ù„Ø§ ØªØ¹Ø±Ù Ø£ÙŠ Ø¹Ù†Ø§ÙˆÙŠÙ† Ù„Ù„Ø¬Ø³ÙˆØ± ØŒ Ù‚Ø¯ ÙŠÙƒÙˆÙ† Ø§Ø®ØªÙŠØ§Ø± Ù‡Ø°Ø§ Ø§Ù„Ø®ÙŠØ§Ø± Ù…ÙÙŠØ¯Ø§. Ø³ÙˆÙ "
+"ÙŠÙ‚ÙˆÙ… ØªÙˆØ± Ø¨ØªØ´ÙÙŠØ± Ø·Ù„Ø¨Ø§Øª Ø§Ù„Ø¯Ù„ÙŠÙ„ Ø§Ù„Ø®Ø§Øµ Ø¨Ù‡ ØŒ ÙˆØ§Ù„ØªÙŠ ÙŠÙ…ÙƒÙ†Ù‡Ø§ Ù…Ù† Ù‡Ø²ÙŠÙ…Ø© Ø¢Ù„ÙŠØ§Øª Ø§Ù„ØØ¸Ø± "
+"Ø§Ù„ØªÙŠ ØªØØ§ÙˆÙ„ Ù…Ù†Ø¹ Ø·Ù„Ø¨Ø§Øª ØªÙˆØ± Ù…Ù† Ø§Ù„ØØµÙˆÙ„ Ø¹Ù„Ù‰ Ù…Ø¹Ù„ÙˆÙ…Ø§Øª Ø¹Ù† ØªØ¨Ø¯ÙŠÙ„Ø§Øª Ø£Ø®Ø±Ù‰. Ø¥Ø°Ø§ Ù…Ù†Ø¹Øª "
+"ØªØ¨Ø¯ÙŠÙ„Ø§Øª ØªÙˆØ± Ø§Ù„Ø¹Ø§Ø¯ÙŠØ© Ø§ÙŠØ¶Ø§ØŒ Ø«Ù… ÙƒÙ†Øª Ø¨ØØ§Ø¬Ø© Ù„Ù…Ø¹Ø±ÙØ© Ø¹Ù†ÙˆØ§Ù† ØªØªØ§Ø¨Ø¹ Ø¬Ø³Ø± Ø¨Ø·Ø±ÙŠÙ‚Ø© Ù…Ø§ Ø£Ùˆ "
+"Ø¨Ø£Ø®Ø±Ù‰ ÙˆØ¥Ø¶Ø§ÙØªÙ‡ Ù‡Ù†Ø§. Ø±Ø§Ø¬Ø¹ Ù…ÙˆØ¶ÙˆØ¹ Ø§Ù„Ù…Ø³Ø§Ø¹Ø¯Ø© ÙÙ‰ <a "
+"href=\"bridges.html#finding\">Ø¥ÙŠØ¬Ø§Ø¯ ØªØ¨Ø¯ÙŠÙ„Ø§Øª Ù„Ù„Ø¬Ø³ÙˆØ±</a> Ù„Ù…Ø²ÙŠØ¯ Ù…Ù† Ø§Ù„Ù…Ø¹Ù„ÙˆÙ…Ø§Øª "
+"ØÙˆÙ„ ÙƒÙŠÙÙŠØ© Ù…Ø¹Ø±ÙØ© Ø¹Ù†Ø§ÙˆÙŠÙ† Ø¬Ø¯ÙŠØ¯Ø© Ù„ØªØªØ§Ø¨Ø¹ Ø§Ù„Ø¬Ø³ÙˆØ± ÙˆØ¨ØµÙ…Ø§ØªÙ‡Ø§ ."
 
 #. type: Content of: <html><body>
 #: en/config.html:100
 msgid "<a name=\"relay\"/>"
-msgstr "<a name=\"relay\"/>"
+msgstr "<a name=\"ØªØ¨Ø¯ÙŠØ©\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:101
 msgid "Relay Settings"
-msgstr "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ù…Ø±ØÙ„"
+msgstr "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„ØªØ¨Ø¯ÙŠÙ„Ø§Øª"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:103
 msgid ""
-"<i> See <a href=\"server.html\">this help topic</a> for detailed information "
-"about setting up and managing a Tor relay.  </i>"
+"<i> See <a href=\"server.html\">this help topic</a> for detailed information"
+" about setting up and managing a Tor relay.  </i>"
 msgstr ""
-"<i> Ø£Ù†Ø¸Ø± <a href=\"server.html\">Ù…ÙˆØ¶ÙˆØ¹ Ø§Ù„Ù…Ø³Ø§Ø¹Ø¯Ø© Ù‡Ø°Ø§</a> Ù„Ù„ØØµÙˆÙ„ Ø¹Ù„Ù‰ Ù…Ø¹Ù„ÙˆÙ…Ø§Øª "
-"Ù…ÙØµÙ‘Ù„Ø© ØÙˆÙ„ Ø¶Ø¨Ø· ÙˆØ¥Ø¯Ø§Ø±Ø© Ù…Ø±ØÙ‘Ù„ ØªÙˆØ±.  </i>"
+"<i>Ø§Ù†Ø¸Ø± <a href=\"server.html\">Ù‡Ø°Ø§ Ø§Ù„Ù…ÙˆØ¶ÙˆØ¹ Ù…Ø³Ø§Ø¹Ø¯Ø©</a> Ù„Ù„ØØµÙˆÙ„ Ø¹Ù„Ù‰ Ù…Ø¹Ù„ÙˆÙ…Ø§Øª "
+"Ù…ÙØµÙ„Ø© ØÙˆÙ„ Ø¥Ù†Ø´Ø§Ø¡ ÙˆØ¥Ø¯Ø§Ø±Ø© ØªØ¨Ø¯ÙŠÙ„Ø© ØªÙˆØ±.</i>"
 
 #. type: Content of: <html><body>
 #: en/config.html:109
 msgid "<a name=\"appearance\"/>"
-msgstr "<a name=\"appearance\"/>"
+msgstr "<a name=\"Ù„Ù…Ø¸Ù‡Ø±\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:110
@@ -225,23 +215,23 @@ msgstr "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ù…Ø¸Ù‡Ø±"
 msgid ""
 "The settings on the <i>Appearance</i> page allow you to customize the look "
 "and feel of Vidalia."
-msgstr "Ø§Ù„Ø§Ø¹Ø¯Ø§Ø¯Ø§Øª ÙÙŠ ØµÙØØ© <i>Ø§Ù„Ù…Ø¸Ù‡Ø±</i> ØªØ³Ù…Ø Ù„Ùƒ Ø¨ØªØ®ØµÙŠØµ Ø´ÙƒÙ„ ÙˆØ£Ø³Ù„ÙˆØ¨ ÙÙŠØ¯Ø§Ù„ÙŠØ§."
+msgstr "Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø¹Ù„Ù‰ ØµÙØØ© <i>Ø§Ù„Ù…Ø¸Ù‡Ø±</i> ØªØ³Ù…Ø Ù„Ùƒ Ø¨ØªØ®ØµÙŠØµ Ù…Ø¸Ù‡Ø± ÙÙŠØ¯Ø§Ù„ÙŠØ§."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:116
 msgid ""
-"<b>Language</b>: Vidalia's interface has been translated into many languages "
-"by helpful volunteers. When Vidalia is first run, it will try to guess which "
-"language your computer is currently using. If Vidalia guesses incorrectly, "
-"or if you prefer a different language, you can choose another language from "
-"the dropdown box. You will need to restart Vidalia after changing the "
-"displayed language for the changes to take effect."
+"<b>Language</b>: Vidalia's interface has been translated into many languages"
+" by helpful volunteers. When Vidalia is first run, it will try to guess "
+"which language your computer is currently using. If Vidalia guesses "
+"incorrectly, or if you prefer a different language, you can choose another "
+"language from the dropdown box. You will need to restart Vidalia after "
+"changing the displayed language for the changes to take effect."
 msgstr ""
-"<b>Ø§Ù„Ù„ØºØ©</b>: ØªÙ… ØªØ±Ø¬Ù…Øª ÙˆØ§Ø¬Ù‡Ø© ÙÙŠØ¯Ø§Ù„ÙŠØ§ Ø¥Ù„Ù‰ Ù„ØºØ§Øª Ø¹Ø¯ÙŠØ¯Ø© Ù…Ù† Ù‚Ø¨Ù„ Ù…ØªØ·ÙˆØ¹ÙŠÙ† Ù…Ø³Ø§Ø¹Ø¯ÙŠÙ†. "
-"Ø¹Ù†Ø¯ ØªØ´ØºÙŠÙ„ ÙÙŠØ¯Ø§Ù„ÙŠØ§ Ù„Ø£ÙˆÙ„ Ù…Ø±Ø©, Ø³ÙˆÙ ÙŠØØ§ÙˆÙ„ ØªØ®Ù…ÙŠÙ† Ø£ÙŠ Ù„ØºØ© ÙŠØ³ØªØ®Ø¯Ù…Ù‡Ø§ Ø¬Ù‡Ø§Ø²Ùƒ ØØ§Ù„ÙŠØ§. Ø§Ø°Ø§ "
-"ÙƒØ§Ù†Øª ØªØ®Ù…ÙŠÙ†Ø§Øª ÙÙŠØ¯Ø§Ù„ÙŠØ§ ØºÙŠØ± ØµØÙŠØØ© Ø£Ùˆ Ø¥Ø°Ø§ ÙƒÙ†Øª ØªÙØ¶Ù„ Ù„ØºØ© Ù…Ø®ØªÙ„ÙØ©, ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ø®ØªÙŠØ§Ø± Ù„ØºØ© "
-"Ø£Ø®Ø±Ù‰ Ù…Ù† ØµÙ†Ø¯ÙˆÙ‚ Ø§Ù„Ù‚Ø§Ø¦Ù…Ø© Ø§Ù„Ù…Ù†Ø³Ø¯Ù„Ø©. Ø³ÙˆÙ ØªØØªØ§Ø¬ Ø¥Ù„Ù‰ Ø¥Ø¹Ø§Ø¯Ø© ØªØ´ØºÙŠÙ„ ÙÙŠØ¯Ø§Ù„ÙŠØ§ Ø¨Ø¹Ø¯ ØªØºÙŠÙŠØ± "
-"Ù„ØºØ© Ø§Ù„Ø¹Ø±Ø¶ Ù„ØªØµØ¨Ø Ø§Ù„ØªØºÙŠÙŠØ±Ø§Øª Ù†Ø§ÙØ°Ø© Ø§Ù„Ù…ÙØ¹ÙˆÙ„."
+"<b>Ø§Ù„Ù„ØºØ©</b> :ØªÙ… ØªØ±Ø¬Ù…Ø© ÙˆØ§Ø¬Ù‡Ø© ÙÙŠØ¯Ø§Ù„ÙŠØ§ Ø¥Ù„Ù‰ Ø§Ù„Ø¹Ø¯ÙŠØ¯ Ù…Ù† Ø§Ù„Ù„ØºØ§Øª Ù…Ù† Ù‚Ø¨Ù„ Ø§Ù„Ù…ØªØ·ÙˆØ¹ÙŠÙ†. "
+"Ø¹Ù†Ø¯Ù…Ø§ ÙŠØªÙ… ØªØ´ØºÙŠÙ„ ÙÙŠØ¯Ø§Ù„ÙŠØ§ Ù„Ù„Ù…Ø±Ø© Ø§Ù„Ø£ÙˆÙ„Ù‰ ØŒ ÙØ¥Ù†Ù‡ Ø³ÙŠØØ§ÙˆÙ„ ØªØ®Ù…ÙŠÙ† Ù„ØºØ© Ø§Ù„ÙƒÙ…Ø¨ÙŠÙˆØªØ± Ø§Ù„ØªÙŠ "
+"ØªØ³ØªØ®Ø¯Ù…Ù‡Ø§ ØØ§Ù„ÙŠØ§. Ø¥Ø°Ø§ ÙƒØªÙ† ØªØ®Ù…ÙŠÙ† ÙÙŠØ¯Ø§Ù„ÙŠØ§ ØºÙŠØ± ØµØÙŠØ ØŒ Ø£Ùˆ Ø¥Ø°Ø§ ÙƒÙ†Øª ØªÙØ¶Ù„ Ù„ØºØ© Ù…Ø®ØªÙ„ÙØ© "
+"ØŒ ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ø®ØªÙŠØ§Ø± Ù„ØºØ© Ø£Ø®Ø±Ù‰ Ù…Ù† Ù…Ø±Ø¨Ø¹ Ø§Ù„Ù‚Ø§Ø¦Ù…Ø© Ø§Ù„Ù…Ù†Ø³Ø¯Ù„Ø©. Ø³ÙˆÙ ØªØØªØ§Ø¬ Ø¥Ù„Ù‰ Ø¥Ø¹Ø§Ø¯Ø© ØªØ´ØºÙŠÙ„ "
+"ÙÙŠØ¯Ø§Ù„ÙŠØ§  Ù…Ø±Ø© Ø§Ø®Ø±Ù‰ Ø¨Ø¹Ø¯ ØªØºÙŠÙŠØ± Ù„ØºØ© Ø§Ù„Ø¹Ø±Ø¶ Ù„ØªØµØ¨Ø Ø§Ù„ØªØºÙŠÙŠØ±Ø§Øª Ù†Ø§ÙØ°Ø© Ø§Ù„Ù…ÙØ¹ÙˆÙ„."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:124
@@ -250,14 +240,14 @@ msgid ""
 "default interface style. If you dislike the default, you can choose "
 "whichever interface style you prefer from the dropdown box."
 msgstr ""
-"<b>Ø§Ù„Ø£Ø³Ù„ÙˆØ¨</b>: ÙÙŠ Ù…Ø¹Ø¸Ù… Ø§Ù„ØØ§Ù„Ø§ØªØŒ Ø³ÙˆÙ ÙŠÙ‚ÙˆÙ… ÙÙŠØ¯Ø§Ù„ÙŠØ§ Ø§ÙØªØ±Ø§Ø¶ÙŠØ§ Ø¨Ø¥Ø³ØªØ®Ø¯Ø§Ù… Ø£Ø³Ù„ÙˆØ¨ "
-"Ø§Ù„ÙˆØ§Ø¬Ù‡Ø© Ø§Ù„Ø§ÙØªØ±Ø§Ø¶ÙŠ Ù„Ù„Ù†Ø¸Ø§Ù… Ø§Ù„Ø£Ø³Ø§Ø³ÙŠ Ø§Ù„Ø®Ø§Øµ Ø¨Ùƒ. Ø¥Ø°Ø§ Ù„Ù… ÙŠØ¹Ø¬Ø¨Ùƒ Ø§Ù„Ø®ÙŠØ§Ø± Ø§Ù„Ø§ÙØªØ±Ø§Ø¶ÙŠØŒ "
-"ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ø®ØªÙŠØ§Ø± Ø£ÙŠ Ø£Ø³Ù„ÙˆØ¨ ÙˆØ§Ø¬Ù‡Ø© ØªÙØ¶Ù„ Ù…Ù† ØµÙ†Ø¯ÙˆÙ‚ Ø§Ù„Ù‚Ø§Ø¦Ù…Ø© Ø§Ù„Ù…Ù†Ø³Ø¯Ù„Ø©."
+"<b>Ø§Ù„Ù†Ù…Ø·</b> : ÙÙŠ Ù…Ø¹Ø¸Ù… Ø§Ù„ØØ§Ù„Ø§Øª ØŒ Ø³ÙˆÙ ÙŠÙ‚ÙˆÙ… ÙÙŠØ¯Ø§Ù„ÙŠØ§ Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø§Ù„Ù†Ù…Ø· Ø§Ù„Ø§ÙØªØ±Ø§Ø¶ÙŠ "
+"Ø¹Ù„Ù‰ Ø¬Ù‡Ø§Ø²Ùƒ . Ø¥Ø°Ø§ ÙƒØ§Ù† Ù„Ø§ ÙŠØ±ÙˆÙ‚Ùƒ Ø§Ù„Ù†Ù…Ø· Ø§Ù„Ø§ÙØªØ±Ø§Ø¶ÙŠ ØŒ ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ø®ØªÙŠØ§Ø± Ù†Ù…Ø· ÙˆØ§Ø¬Ù‡Ø© Ø¢Ø®Ø± Ù…Ù†"
+" Ù…Ø±Ø¨Ø¹ Ø§Ù„Ù‚Ø§Ø¦Ù…Ø© Ø§Ù„Ù…Ù†Ø³Ø¯Ù„Ø©."
 
 #. type: Content of: <html><body>
 #: en/config.html:131
 msgid "<a name=\"advanced\"/>"
-msgstr "<a name=\"advanced\"/>"
+msgstr "<a name=\"Ù…ØªÙ‚Ø¯Ù…Ø©\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:132
@@ -270,21 +260,21 @@ msgid ""
 "The settings on the <i>Advanced</i> page should generally only be modified "
 "by more experienced users."
 msgstr ""
-"Ø§Ù„Ø§Ø¹Ø¯Ø§Ø¯Ø§Øª ÙÙŠ Ø§Ù„ØµÙØØ© <i>Ø§Ù„Ù…ØªÙ‚Ø¯Ù…Ø©</i> ÙŠÙ†Ø¨ØºÙŠ ØªØ¹Ø¯ÙŠÙ„Ù‡Ø§ Ø¨Ø´ÙƒÙ„ Ø¹Ø§Ù… ÙÙ‚Ø· Ù…Ù† Ù‚Ø¨Ù„ "
-"Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ† Ø£ÙƒØ«Ø± Ø®Ø¨Ø±Ø©."
+" <i>Ø§Ù„ØµÙØØ© Ø§Ù„Ù…ØªÙ‚Ø¯Ù…Ø© </i> Ø¹Ù…ÙˆÙ…Ø§ ÙŠÙ†Ø¨ØºÙŠ Ø£Ù† ÙŠØªÙ… ØªØ¹Ø¯ÙŠÙ„ Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ÙÙ‚Ø· Ù…Ù† Ù‚Ø¨Ù„ Ø°ÙˆÙŠ "
+"Ø§Ù„Ø®Ø¨Ø±Ø© Ø¹Ù„Ù‰."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:138
 msgid ""
-"<b>Control Address &amp; Port</b>: The <i>Control Port</i> is the port which "
-"Vidalia uses to talk to Tor.  This doesn't need to be changed unless you "
+"<b>Control Address &amp; Port</b>: The <i>Control Port</i> is the port which"
+" Vidalia uses to talk to Tor.  This doesn't need to be changed unless you "
 "have a conflict with another service on your machine, or if you are using "
 "Vidalia to control and monitor a Tor process running on another machine."
 msgstr ""
-"<b>Ø§Ù„Ø¹Ù†ÙˆØ§Ù† ÙˆÙ…Ù†ÙØ° Ø§Ù„ØªØÙƒÙ…</b>: Ù…Ù†ÙØ° <i>Ø§Ù„ØªØÙƒÙ…</i> Ù‡Ùˆ Ø§Ù„Ù…Ù†ÙØ° Ø§Ù„Ø°ÙŠ ÙŠØ³ØªØ®Ø¯Ù…Ù‡ "
-"ÙÙŠØ¯Ø§Ù„ÙŠØ§ Ù„Ù„Ø§ØªØµØ§Ù„ Ù…Ø¹ ØªÙˆØ±. Ù‡Ø°Ø§ Ù„Ø§ ÙŠØØªØ§Ø¬ Ø¥Ù„Ù‰ ØªØºÙŠÙŠØ± Ù…Ø§ Ù„Ù… ÙŠÙƒÙ† Ù„Ø¯ÙŠÙƒ ØªØ¹Ø§Ø±Ø¶ Ù…Ø¹ Ø®Ø¯Ù…Ø© "
-"Ø£Ø®Ø±Ù‰ Ø¹Ù„Ù‰ Ø¬Ù‡Ø§Ø²Ùƒ, Ø£Ùˆ Ø¥Ø°Ø§ ÙƒÙ†Øª ØªØ³ØªØ®Ø¯Ù… ÙÙŠØ¯Ø§Ù„ÙŠØ§ Ù„Ù„ØªØÙƒÙ… ÙˆÙ…Ø±Ø§Ù‚Ø¨Ø© Ø¹Ù…Ù„ÙŠØ© Ù„ØªÙˆØ± ØªØ¹Ù…Ù„ Ø¹Ù„Ù‰ "
-"Ø¬Ù‡Ø§Ø² Ø¢Ø®Ø±."
+"<b>Ø§Ù„ØªØÙƒÙ… Ø¨Ø§Ù„Ø¹Ù†ÙˆØ§Ù† <i>ÙˆØ§Ù„Ù…Ù†ÙØ°</i></b> : <b>Ø¨Ø§Ù„Ù…Ù†ÙØ°</b> <i>Ø§Ù„ØªØÙƒÙ…</i> Ù‡Ùˆ "
+"Ø§Ù„Ù…Ù†ÙØ° Ø§Ù„Ø°ÙŠ ÙŠØ³ØªØ®Ø¯Ù… ÙÙŠØ¯Ø§Ù„ÙŠØ§ Ù„Ø§Ø¬Ø±Ø§Ø¡ Ø§ØªØµØ§Ù„ Ù…Ø¹ ØªÙˆØ±. Ù‡Ø°Ø§ Ù„Ø§ ÙŠØØªØ§Ø¬ Ø¥Ù„Ù‰ ØªØºÙŠÙŠØ± Ù…Ø§ Ù„Ù…"
+" ÙŠÙƒÙ† Ù„Ø¯ÙŠÙ‡ ØªØ¹Ø§Ø±Ø¶ Ù…Ø¹ Ø®Ø¯Ù…Ø© Ø£Ø®Ø±Ù‰ Ø¹Ù„Ù‰ Ø¬Ù‡Ø§Ø²Ùƒ ØŒ Ø£Ùˆ Ø¥Ø°Ø§ ÙƒÙ†Øª ØªØ³ØªØ®Ø¯Ù… ÙÙŠØ¯Ø§Ù„ÙŠØ§ Ù„Ù…Ø±Ø§Ù‚Ø¨Ø© "
+"ÙˆØ±ØµØ¯ Ø§ØªØµØ§Ù„ Ù„ØªÙˆØ± Ø¹Ù„Ù‰ Ø¬Ù‡Ø§Ø² Ø¢Ø®Ø±."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:144
@@ -293,9 +283,9 @@ msgid ""
 "limit the applications on your machine that can connect to and reconfigure "
 "your Tor installation. The available authentication methods are:"
 msgstr ""
-"<b>Ù…ØµØ§Ø¯Ù‚Ø© Ù…Ù†ÙØ° Ø§Ù„ØªØÙƒÙ…</b>: ØªØ³ØªØ®Ø¯Ù… Ù…ØµØ§Ø¯Ù‚Ø© Ù…Ù†ÙØ° Ø§Ù„ØªØÙƒÙ… Ù„Ù„ØØ¯ Ù…Ù† Ø§Ù„ØªØ·Ø¨ÙŠÙ‚Ø§Øª Ø¹Ù„Ù‰ "
-"Ø¬Ù‡Ø§Ø²Ùƒ Ø§Ù„ØªÙŠ ÙŠÙ…ÙƒÙ† Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ù‡Ø§ ÙˆØ¥Ø¹Ø§Ø¯Ø© ØªÙƒÙˆÙŠÙ† ØªØ«Ø¨ÙŠØª ØªÙˆØ±. Ø£Ø³Ø§Ù„ÙŠØ¨ Ø§Ù„Ù…ØµØ§Ø¯Ù‚Ø© Ø§Ù„Ù…ØªÙˆÙØ±Ø© "
-"Ù‡ÙŠ:"
+"<b>Ø§Ù„ØªØÙƒÙ… Ø¨Ù…ØµØ§Ø¯Ù‚Ø© Ø§Ù„Ù…Ù†Ø§ÙØ°</b>ÙŠØ³ØªØ®Ø¯Ù… Ø§Ù„ØªØÙƒÙ… Ø¨Ù…ØµØ§Ø¯Ù‚Ø© Ø§Ù„Ù…Ù†Ø§ÙØ° Ù„ØªÙ‚ÙŠÙŠØ¯ Ø¹Ø¯Ø¯ "
+"Ø§Ù„ØªØ·Ø¨ÙŠÙ‚Ø§Øª Ø¹Ù„Ù‰ Ø¬Ù‡Ø§Ø²Ùƒ Ø§Ù„ØªÙŠ Ø¨Ø§Ø³ØªØ·Ø§Ø¹ØªÙ‡Ø§ Ø§Ù„Ø§ØªØµØ§Ù„ Ùˆ ØªÙ‡ÙŠØ¦Ø© ØªØ«Ø¨ÙŠØª ØªÙˆØ± . Ø£Ø³Ø§Ù„ÙŠØ¨ "
+"Ø§Ù„Ù…ØµØ§Ø¯Ù‚Ø© Ø§Ù„Ù…ØªÙˆÙØ±Ø©: :"
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:150
@@ -304,8 +294,8 @@ msgid ""
 "<b>strongly</b> discouraged. Any application or user on your computer can "
 "reconfigure your Tor installation."
 msgstr ""
-"<b>Ù„Ø§ ÙŠÙˆØ¬Ø¯</b> -- Ù„Ø§ ÙŠÙ„Ø²Ù… Ù…ØµØ§Ø¯Ù‚Ø©. Ø¥Ø³ØªØ®Ø¯Ø§Ù… Ù‡Ø°Ø§ Ø§Ù„Ø®ÙŠØ§Ø± <b>Ù…Ø«Ø¨Ù‘Ø·</b> Ø¨Ù‚ÙˆØ©. "
-"ÙŠØ³ØªØ·ÙŠØ¹ Ø£ÙŠ ØªØ·Ø¨ÙŠÙ‚ Ø£Ùˆ Ù…Ø³ØªØ®Ø¯Ù… Ø¹Ù„Ù‰ Ø¬Ù‡Ø§Ø² Ø§Ù„ÙƒÙ…Ø¨ÙŠÙˆØªØ± Ø§Ù„Ø®Ø§Øµ Ø¨Ùƒ Ø¥Ø¹Ø§Ø¯Ø© ØªÙƒÙˆÙŠÙ† ØªØ«Ø¨ÙŠØª ØªÙˆØ±."
+"Ù„Ø§ Ù…ØµØ§Ø¯Ù‚Ø© Ù…Ø·Ù„ÙˆØ¨Ø© <b>Ø¨Ù„Ø§</b> --. Ø§Ù„Ø®ÙŠØ§Ø± <b>Ø¨Ø´Ø¯Ø©</b> Ø§Ø³ØªØ®Ø¯Ø§Ù… Ù‡Ø°Ø§ Ø§Ù„Ø®ÙŠØ§Ø± ØºÙŠØ± "
+"Ù…ÙØ¶Ù„. ÙˆÙŠÙ…ÙƒÙ† Ù„Ø£ÙŠ Ù…Ø³ØªØ®Ø¯Ù… Ø¹Ù„Ù‰ Ø§Ù„ÙƒÙ…Ø¨ÙŠÙˆØªØ± Ø§Ù„Ø®Ø§Øµ Ø¨Ùƒ ØªÙ‡ÙŠØ¦Ø©  ØªØ«Ø¨ÙŠØª ØªÙˆØ± ."
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:155
@@ -313,27 +303,26 @@ msgid ""
 "<b>Password</b> <i>(Default)</i> -- If this method is selected, you can "
 "specify a password that Tor will require each time a user or application "
 "connects to Tor's control port. If Vidalia starts Tor for you, you can have "
-"Vidalia randomly generate a new password each time it starts Tor by checking "
-"the <i>Randomly Generate</i> checkbox."
+"Vidalia randomly generate a new password each time it starts Tor by checking"
+" the <i>Randomly Generate</i> checkbox."
 msgstr ""
-"<b>ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±</b> <i>(Ø§ÙØªØ±Ø§Ø¶ÙŠØ§)</i> -- Ø§Ø°Ø§ ØªÙ… Ø¥Ø®ØªÙŠØ§Ø± Ù‡Ø°Ù‡ Ø§Ù„Ø·Ø±ÙŠÙ‚Ø©, ÙŠÙ…ÙƒÙ†Ùƒ "
-"ØªØØ¯ÙŠØ¯ ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ± Ø§Ù„ØªÙŠ Ø³ÙˆÙ ÙŠØ·Ù„Ø¨Ù‡Ø§ ØªÙˆØ± ÙÙŠ ÙƒÙ„ Ù…Ø±Ø© ÙŠÙ‚ÙˆÙ… Ù…Ø³ØªØ®Ø¯Ù… Ø£Ùˆ ØªØ·Ø¨ÙŠÙ‚ "
-"Ø¨Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ù…Ù†ÙØ° Ø§Ù„ØªØÙƒÙ… Ù„ØªÙˆØ±. Ø§Ø°Ø§ Ù‚Ø§Ù… ÙÙŠØ¯Ø§Ù„ÙŠØ§ Ø¨ØªØ´ØºÙŠÙ„ ØªÙˆØ± Ù„Ùƒ, ÙŠÙ…ÙƒÙ†Ùƒ Ø¬Ø¹Ù„ ÙÙŠØ¯Ø§Ù„ÙŠØ§ "
-"ÙŠÙˆÙ„Ù‘Ø¯ ÙƒÙ„Ù…Ø© Ù…Ø±ÙˆØ± Ø¬Ø¯ÙŠØ¯Ø© Ø¹Ø´ÙˆØ§Ø¦ÙŠØ§ ÙÙŠ ÙƒÙ„ Ù…Ø±Ø© ÙŠÙ‚ÙˆÙ… Ø¨ØªØ´ØºÙŠÙ„ ØªÙˆØ± Ø¹Ù† Ø·Ø±ÙŠÙ‚ ØªÙÙ‚Ø¯ ØµÙ†Ø¯ÙˆÙ‚ "
-"ÙØØµ <i>Ø§Ù„ØªÙˆÙ„ÙŠØ¯ Ø§Ù„Ø¹Ø´ÙˆØ§Ø¦ÙŠ</i>."
+"<b>ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±</b> <i>(Ø§Ù„Ø§ÙØªØ±Ø§Ø¶ÙŠ)</i> -- Ø¥Ø°Ø§ ØªÙ… ØªØØ¯ÙŠØ¯ Ù‡Ø°Ø§ Ø§Ù„Ø£Ø³Ù„ÙˆØ¨ ØŒ ÙŠÙ…ÙƒÙ†Ùƒ "
+"ØªØØ¯ÙŠØ¯ ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø± Ø§Ù„ØªÙŠ ÙŠØ·Ù„Ø¨Ù‡Ø§ ØªÙˆØ± ÙÙŠ ÙƒÙ„ Ù…Ø±Ø© ÙŠØªØµÙ„ Ù…Ø³ØªØ®Ø¯Ù… Ø¹Ù„Ù‰ Ù…Ù†ÙØ° ØªÙˆØ±. Ø¥Ø°Ø§ Ù‚Ø§Ù… "
+"ÙÙŠØ¯Ø§Ù„ÙŠØ§  Ø¨ØªØ´ØºÙŠÙ„ ØªÙˆØ± Ù„Ùƒ ØŒ ÙŠÙ…ÙƒÙ† Ù„Ù‡ ØªÙˆÙ„ÙŠØ¯ ÙƒÙ„Ù…Ø© Ø³Ø± Ø¬Ø¯ÙŠØ¯Ø© ÙÙŠ ÙƒÙ„ Ù…Ø±Ø© ÙŠØ¨Ø¯Ø£ ØªÙˆØ± Ø¹Ù† "
+"Ø·Ø±ÙŠÙ‚ Ø§Ù„ØªØÙ‚Ù‚ Ù…Ù† ØµÙ†Ø¯ÙˆÙ‚ <i>Ø´ÙƒÙ„ Ø¹Ø´ÙˆØ§Ø¦ÙŠ.</i> "
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:162
 msgid ""
-"<b>Cookie</b> -- If cookie authentication is selected, Tor will write a file "
-"(or, <i>cookie</i>) containing random bytes to its data directory when it "
+"<b>Cookie</b> -- If cookie authentication is selected, Tor will write a file"
+" (or, <i>cookie</i>) containing random bytes to its data directory when it "
 "starts. Any user or application that tries to connect to Tor's control port "
 "must be able to provide the contents of this cookie."
 msgstr ""
-"<b>Ù…Ù„Ù ØªØ¹Ø±ÙŠÙ Ø§Ù„Ø§Ø±ØªØ¨Ø§Ø·</b> -- Ø§Ø°Ø§ ØªÙ… Ø¥Ø®ØªÙŠØ§Ø± Ù…ØµØ§Ø¯Ù‚Ø© Ù…Ù„Ù ØªØ¹Ø±ÙŠÙ Ø§Ù„Ø§Ø±ØªØ¨Ø§Ø·, Ø³ÙˆÙ "
-"ÙŠÙ‚ÙˆÙ… ØªÙˆØ± Ø¨ÙƒØªØ§Ø¨Ø© Ù…Ù„Ù (Ø£Ùˆ, <i>Ù…Ù„Ù ØªØ¹Ø±ÙŠÙ Ø§Ù„Ø§Ø±ØªØ¨Ø§Ø·</i>) ÙŠØØªÙˆÙŠ Ø¨Ø§ÙŠØªØ§Øª Ø¹Ø´ÙˆØ§Ø¦ÙŠØ© "
-"Ù„Ø¯Ù„ÙŠÙ„ Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª Ø§Ù„Ø®Ø§Øµ Ø¨Ù‡ Ø¹Ù†Ø¯ ØªØ´ØºÙŠÙ„Ù‡. Ø£ÙŠ Ù…Ø³ØªØ®Ø¯Ù… Ø£Ùˆ ØªØ·Ø¨ÙŠÙ‚ ÙŠØØ§ÙˆÙ„ Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ù…Ù†ÙØ° "
-"Ø§Ù„ØªØÙƒÙ… Ù„ØªÙˆØ± ÙŠØ¬Ø¨ Ø£Ù† ÙŠÙƒÙˆÙ† Ù‚Ø§Ø¯Ø±Ø§ Ø¹Ù„Ù‰ ØªÙˆÙÙŠØ± Ù…ØØªÙˆÙŠØ§Øª Ù…Ù„Ù ØªØ¹Ø±ÙŠÙ Ø§Ù„Ø§Ø±ØªØ¨Ø§Ø· Ù‡Ø°Ø§ ."
+"<b> Ø§Ù„ÙƒØ¹ÙƒØ§Øª ÙƒÙˆÙƒÙŠØ²</b> -- Ø§Ø°Ø§ ØªÙ… Ø§Ø®ØªÙŠØ§Ø± Ø§Ù„ØªØÙ‚Ù‚ Ù…Ù† Ø§Ù„ÙƒÙˆÙƒÙŠØ² ØŒ ØªÙˆØ± Ø³ÙŠÙ†Ø´Ø¦ Ù…Ù„Ù (Ø£Ùˆ"
+"  <i>Ø§Ù„ÙƒØ¹ÙƒØ©)</i> Ø§Ù„ØªÙŠ ØªØØªÙˆÙŠ Ø¹Ù„Ù‰ Ø¨Ø§ÙŠØª Ø¹Ø´ÙˆØ§Ø¦ÙŠ Ø¥Ù„Ù‰ Ø¯Ù„ÙŠÙ„ Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª Ø§Ù„Ø®Ø§ØµØ© Ø¨Ù‡ Ø¹Ù†Ø¯ "
+"Ø¨Ø¯Ø¡ ØªØ´ØºÙŠÙ„Ù‡. ÙŠØ¬Ø¨ Ø£Ù† ÙŠÙƒÙˆÙ† Ø£ÙŠ Ù…Ø³ØªØ®Ø¯Ù…  ÙŠØØ§ÙˆÙ„ Ø§Ù„Ø§ØªØµØ§Ù„ Ø¥Ù„Ù‰ Ù…Ù†ÙØ° ØªØÙƒÙ… ØªÙˆØ± Ù‚Ø§Ø¯Ø±Ø§ Ø¹Ù„Ù‰"
+" ØªÙˆÙÙŠØ± Ù…ØØªÙˆÙŠØ§Øª Ù‡Ø°Ù‡ Ø§Ù„ÙƒØ¹ÙƒØ©."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:170
@@ -343,9 +332,9 @@ msgid ""
 "file. If you leave this field blank, Tor will uses its own default torrc "
 "location."
 msgstr ""
-"<b>Ù…Ù„Ù ØªÙƒÙˆÙŠÙ† ØªÙˆØ±</b> <i>(Ø¥Ø®ØªÙŠØ§Ø±ÙŠ)</i>: ÙŠÙ…ÙƒÙ†Ùƒ Ø¥Ø³ØªØ®Ø¯Ø§Ù… Ù‡Ø°Ø§ Ø§Ù„Ø®ÙŠØ§Ø± Ù„Ø¬Ø¹Ù„ ÙÙŠØ¯Ø§Ù„ÙŠØ§ "
-"ÙŠÙ‚ÙˆÙ… Ø¨ØªØ´ØºÙŠÙ„ ØªÙˆØ± Ø¨Ø¥Ø³ØªØ®Ø¯Ø§Ù… <i>ØªÙˆØ±Ùƒ</i> Ù…ØØ¯Ø¯, Ù…Ù„Ù ØªÙƒÙˆÙŠÙ† ØªÙˆØ±. Ø§Ø°Ø§ ØªØ±ÙƒØª Ù‡Ø°Ø§ "
-"Ø§Ù„ØÙ‚Ù„ ÙØ§Ø±ØºØ§, Ø³ÙˆÙ ÙŠØ³ØªØ®Ø¯Ù… ØªÙˆØ± Ù…ÙˆÙ‚Ø¹ ØªÙˆØ±Ùƒ Ø§Ù„Ø§ÙØªØ±Ø§Ø¶ÙŠ Ø§Ù„Ø®Ø§Øµ Ø¨Ù‡."
+"<b> Ù…Ù„Ù ØªÙ‡ÙŠØ¦Ø© ØªÙˆØ± </b> <i>(Ø§Ø®ØªÙŠØ§Ø±ÙŠ)</i> : ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ø³ØªØ®Ø¯Ø§Ù… Ù‡Ø°Ø§ Ø§Ù„Ø®ÙŠØ§Ø± Ù„Ø¨Ø¯Ø¡ "
+"ÙÙŠØ¯Ø§Ù„ÙŠØ§ ØªÙˆØ± Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù… <i>torrc</i> Ù…ØØ¯Ø¯Ø© ØŒ Ø§Ùˆ Ù…Ù„Ù ØªÙ‡ÙŠØ¦Ø© ØªÙˆØ±. Ø¥Ø°Ø§ ØªØ±ÙƒØª Ù‡Ø°Ø§ "
+"Ø§Ù„ØÙ‚Ù„ ÙØ§Ø±ØºØ§ ØŒ Ø³ÙˆÙ ÙŠØ³ØªØ®Ø¯Ù… ØªÙˆØ± Ù…ÙˆÙ‚Ø¹Ù‡ Ø§Ù„Ø§ÙØªØ±Ø§Ø¶ÙŠ torrc."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:175
@@ -355,40 +344,40 @@ msgid ""
 "information, Tor relay keys, and configuration files. If you leave this "
 "field blank, Tor will use its own default data directory location."
 msgstr ""
-"<b>Ø¯Ù„ÙŠÙ„ Ø¨ÙŠØ§Ù†Ø§Øª ØªÙˆØ±</b> <i>(Ø¥Ø®ØªÙŠØ§Ø±ÙŠ)</i>: ÙŠÙ…ÙƒÙ†Ùƒ ØªØØ¯ÙŠØ¯ Ø§Ù„Ø¯Ù„ÙŠÙ„ Ø§Ù„Ø°ÙŠ Ø³ÙˆÙ ÙŠÙ‚ÙˆÙ… "
-"ØªÙˆØ± Ø¨ØªØ®Ø²ÙŠÙ† Ø¨ÙŠØ§Ù†Ø§ØªÙ‡ Ø§Ù„Ù…ØÙÙˆØ¸Ø©, Ù…Ø«Ù„ Ù…Ø¹Ù„ÙˆÙ…Ø§Øª Ù…Ø±ØÙ„ ØªÙˆØ± Ø§Ù„Ù…Ø¤Ù‚ØªØ©, Ù…ÙØ§ØªÙŠØ Ù…Ø±ØÙ„ ØªÙˆØ± "
-"ÙˆÙ…Ù„ÙØ§Øª Ø§Ù„ØªÙƒÙˆÙŠÙ†. Ø§Ø°Ø§ ØªØ±ÙƒØª Ù‡Ø°Ø§ Ø§Ù„ØÙ‚Ù„ ÙØ§Ø±ØºØ§, Ø³ÙˆÙ ÙŠØ³ØªØ®Ø¯Ù… ØªÙˆØ± Ù…ÙˆÙ‚Ø¹ Ø¯Ù„ÙŠÙ„ Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª "
-"Ø§Ù„Ø§ÙØªØ±Ø§Ø¶ÙŠ Ø§Ù„Ø®Ø§Øµ Ø¨Ù‡."
+"<b> Ø¯Ù„ÙŠÙ„ Ø¨ÙŠØ§Ù†Ø§Øª ØªÙˆØ±  </b> <i>(Ø§Ø®ØªÙŠØ§Ø±ÙŠ)</i> : ÙŠÙ…ÙƒÙ†Ùƒ ØªØØ¯ÙŠØ¯ Ø§Ù„Ø¯Ù„ÙŠÙ„ Ø§Ù„Ø°ÙŠ Ø³ÙŠÙ‚ÙˆÙ… "
+"ØªÙˆØ± Ø¨ØÙØ¸ Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª Ø§Ù„Ø®Ø§ØµØ© ÙÙŠÙ‡ØŒ Ù…Ø«Ù„ Ø§Ù„Ù…Ø¹Ù„ÙˆÙ…Ø§Øª Ø§Ù„Ù…Ø®Ø²Ù†Ø© Ù…Ø¤Ù‚ØªØ§ Ø¹Ù† ØªØ¨Ø¯ÙŠÙ„Ø© ØªÙˆØ± ØŒ "
+"Ù…ÙØ§ØªÙŠØ ØªØªØ§Ø¨Ø¹ ØªÙˆØ± ØŒ ÙˆÙ…Ù„ÙØ§Øª Ø§Ù„ØªÙ‡ÙŠØ¦Ø©. Ø¥Ø°Ø§ ØªØ±ÙƒØª Ù‡Ø°Ø§ Ø§Ù„ØÙ‚Ù„ ÙØ§Ø±ØºØ§ ØŒ Ø³ÙˆÙ ÙŠÙ‚ÙˆÙ… ØªÙˆØ± "
+"Ø¨ÙˆØ¶Ø¹ Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª Ø§Ù„Ø®Ø§ØµØ© Ø¨Ù‡ ÙÙŠ Ø§Ù„Ø¯Ù„ÙŠÙ„ Ø§Ù„Ø§ÙØªØ±Ø§Ø¶ÙŠ."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:181
 msgid ""
-"<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 "
+"<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."
 msgstr ""
-"<b>Ø§Ù„Ø£Ø°ÙˆÙ†Ø§Øª</b> <i>(Ø¥Ø®ØªÙŠØ§Ø±ÙŠ, ØºÙŠØ± Ù…ØªÙˆÙØ± ÙÙŠ ÙˆÙŠÙ†Ø¯ÙˆØ²)</i>: Ø§Ø°Ø§ Ù‚Ù…Øª Ø¨Ø¥Ø¯Ø®Ø§Ù„ Ù‚ÙŠÙ…Ø© "
-"<b>Ù„Ù„ØªØ´ØºÙŠÙ„ ÙƒÙ…Ø³ØªØ®Ø¯Ù…</b>, Ø³ÙˆÙ ÙŠÙ‚ÙˆÙ… ØªÙˆØ± <i>Ø¨Ø¶Ø¨Ø· Ù‡ÙˆÙŠØ© Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…</i> Ù„Ù‡Ø°Ø§ Ø§Ù„Ù…Ø³Ø®Ø¯Ù… "
-"Ø¹Ù†Ø¯ Ø¨Ø¯Ø¡ ØªØ´ØºÙŠÙ„Ù‡.  Ø§Ø°Ø§ Ù‚Ù…Øª Ø¨Ø¥Ø¯Ø®Ø§Ù„ Ù‚ÙŠÙ…Ø© <b>Ù„Ù„ØªØ´ØºÙŠÙ„ ÙƒÙ…Ø¬Ù…ÙˆØ¹Ø©</b>, Ø³ÙˆÙ ÙŠÙ‚ÙˆÙ… ØªÙˆØ± "
-"<i>Ø¨Ø¶Ø¨Ø· Ù‡ÙˆÙŠØ© Ø§Ù„Ù…Ø¬Ù…ÙˆØ¹Ø©</i> Ù„Ù‡Ø°Ù‡ Ø§Ù„Ù…Ø¬Ù…ÙˆØ¹Ø© Ø¹Ù†Ø¯ Ø¨Ø¯Ø¡ ØªØ´ØºÙŠÙ„Ù‡Ø§."
+"<b>Ø£Ø°ÙˆÙ†Ø§Øª</b> <i>(Ø§Ø®ØªÙŠØ§Ø±ÙŠ ØŒ ØºÙŠØ±Ù…ØªÙˆÙØ± Ø¹Ù„Ù‰ ÙˆÙŠÙ†Ø¯ÙˆØ²)</i> : Ø¥Ø°Ø§ Ø§Ø®ØªØ±Øª  <b>ØªØ´ØºÙŠÙ„ "
+"ÙƒÙ…Ø³ØªØ®Ø¯Ù…</b> ØŒ   Ø³ÙŠÙ‚ÙˆÙ… ØªÙˆØ± Ø¨Ø¹Ù…Ù„ <i>setuid</i> Ù„Ù‡Ø°Ø§ Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… Ø¹Ù†Ø¯ Ø¨Ø¯Ø¡ ØªØ´ØºÙŠÙ„Ù‡. "
+"Ø¥Ø°Ø§ Ù‚Ù…Øª Ø¨Ø¥Ø®ØªÙŠØ§Ø±  <b>ØªØ´ØºÙŠÙ„ ÙƒÙ…Ø¬Ù…ÙˆØ¹Ø©</b> ØŒ Ø³ÙˆÙ ÙŠÙ‚ÙˆÙ… ØªÙˆØ± Ø¨Ø¹Ù…Ù„ <i>setgid</i> Ø¥Ù„Ù‰ "
+"Ù‡Ø°Ù‡ Ø§Ù„Ù…Ø¬Ù…ÙˆØ¹Ø© Ø¹Ù†Ø¯ Ø¨Ø¯Ø¡ ØªØ´ØºÙŠÙ„Ù‡."
 
 #. type: Content of: <html><body>
 #: en/config.html:189
 msgid "<a name=\"services\"/>"
-msgstr "<a name=\"services\"/>"
+msgstr "<a name=\"Ø§Ù„Ø®Ø¯Ù…Ø§Øª\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:190
 msgid "Hidden Service Settings"
-msgstr "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø®Ø¯Ù…Ø© Ø§Ù„Ø®ÙÙŠØ©"
+msgstr "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø®Ø¯Ù…Ø© Ø§Ù„Ù…Ø®ÙÙŠØ©"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:192
 msgid ""
-"Hidden services allow you to provide any kind of TCP-based service, e.g.  an "
-"HTTP service, to others without revealing your IP address."
+"Hidden services allow you to provide any kind of TCP-based service, e.g.  an"
+" HTTP service, to others without revealing your IP address."
 msgstr ""
-"Ø§Ù„Ø®Ø¯Ù…Ø§Øª Ø§Ù„Ø®ÙÙŠØ© ØªØ³Ù…Ø Ù„Ùƒ Ø¨ØªÙ‚Ø¯ÙŠÙ… Ø£ÙŠ Ù†ÙˆØ¹ Ù…Ù† Ø§Ù„Ø®Ø¯Ù…Ø© Ø¹Ù„Ù‰ Ø£Ø³Ø§Ø³ Ø¨Ø±Ù†Ø§Ù…Ø¬ Ø§Ù„ØªØ¹Ø§ÙˆÙ† Ø§Ù„ÙÙ†ÙŠ "
-"(TCP), Ø¹Ù„Ù‰ Ø³Ø¨ÙŠÙ„ Ø§Ù„Ù…Ø«Ø§Ù„:  Ø®Ø¯Ù…Ø© Ø¨Ø±ÙˆØªÙˆÙƒÙˆÙ„ Ù†Ù‚Ù„ Ø§Ù„Ù†Øµ Ø§Ù„ØªØ´Ø¹Ø¨ÙŠ (HTTP), Ø§Ù„Ù‰ Ø§Ù„Ø¢Ø®Ø±ÙŠÙ† "
-"Ø¨Ø¯ÙˆÙ† ÙƒØ´Ù Ø¹Ù†ÙˆØ§Ù† IP Ø§Ù„Ø®Ø§Øµ Ø¨Ùƒ."
+"Ø§Ù„Ø®Ø¯Ù…Ø§Øª Ø§Ù„Ù…Ø®ÙÙŠØ© ØªØ³Ù…Ø Ù„Ùƒ Ø¨ØªÙ‚Ø¯ÙŠÙ… Ø£ÙŠ Ù†ÙˆØ¹ Ù…Ù† Ø§Ù„Ø®Ø¯Ù…Ø© Ø¹Ù„Ù‰ Ø£Ø³Ø§Ø³ Ø¨Ø±Ù†Ø§Ù…Ø¬ Ø§Ù„ØªØ¹Ø§ÙˆÙ† "
+"Ø§Ù„ÙÙ†ÙŠ ØŒ Ø¹Ù„Ù‰ Ø³Ø¨ÙŠÙ„ Ø§Ù„Ù…Ø«Ø§Ù„ Ø®Ø¯Ù…Ø© Ø§Ù„Ù†Øµ Ø§Ù„Ù…ØªØ´Ø¹Ø¨ ØŒ Ù„Ù„Ø¢Ø®Ø±ÙŠÙ† Ø¯ÙˆÙ† Ø§Ù„ÙƒØ´Ù Ø¹Ù† Ø¹Ù†ÙˆØ§Ù† "
+"Ø¨Ø±ÙˆØªÙˆÙƒÙˆÙ„ Ø§Ù„Ø¥Ù†ØªØ±Ù†Øª Ø§Ù„Ø®Ø§Øµ Ø¨Ùƒ."
diff --git a/src/vidalia/help/content/po/arn/netview.po b/src/vidalia/help/content/po/arn/netview.po
index 47f3d73..5ceca62 100644
--- a/src/vidalia/help/content/po/arn/netview.po
+++ b/src/vidalia/help/content/po/arn/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: arn\n"
+"Plural-Forms: nplurals=2; plural=n > 1\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/ast/netview.po b/src/vidalia/help/content/po/ast/netview.po
index 47f3d73..d8b3403 100644
--- a/src/vidalia/help/content/po/ast/netview.po
+++ b/src/vidalia/help/content/po/ast/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/az/netview.po b/src/vidalia/help/content/po/az/netview.po
index 47f3d73..094d880 100644
--- a/src/vidalia/help/content/po/az/netview.po
+++ b/src/vidalia/help/content/po/az/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: az\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/be/netview.po b/src/vidalia/help/content/po/be/netview.po
index 47f3d73..8289556 100644
--- a/src/vidalia/help/content/po/be/netview.po
+++ b/src/vidalia/help/content/po/be/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: be\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"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/bg/netview.po b/src/vidalia/help/content/po/bg/netview.po
index 47f3d73..62bfd23 100644
--- a/src/vidalia/help/content/po/bg/netview.po
+++ b/src/vidalia/help/content/po/bg/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/bn/netview.po b/src/vidalia/help/content/po/bn/netview.po
index 47f3d73..45b9b57 100644
--- a/src/vidalia/help/content/po/bn/netview.po
+++ b/src/vidalia/help/content/po/bn/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/bn_IN/netview.po b/src/vidalia/help/content/po/bn_IN/netview.po
index 47f3d73..b5b86d6 100644
--- a/src/vidalia/help/content/po/bn_IN/netview.po
+++ b/src/vidalia/help/content/po/bn_IN/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/ca/netview.po b/src/vidalia/help/content/po/ca/netview.po
index 47f3d73..060c759 100644
--- a/src/vidalia/help/content/po/ca/netview.po
+++ b/src/vidalia/help/content/po/ca/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/cs/netview.po b/src/vidalia/help/content/po/cs/netview.po
index 47f3d73..8a804a7 100644
--- a/src/vidalia/help/content/po/cs/netview.po
+++ b/src/vidalia/help/content/po/cs/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/csb/netview.po b/src/vidalia/help/content/po/csb/netview.po
index 47f3d73..b40bd36 100644
--- a/src/vidalia/help/content/po/csb/netview.po
+++ b/src/vidalia/help/content/po/csb/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\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"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/cy/netview.po b/src/vidalia/help/content/po/cy/netview.po
index 47f3d73..d1cdb64 100644
--- a/src/vidalia/help/content/po/cy/netview.po
+++ b/src/vidalia/help/content/po/cy/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: cy\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/da/config.po b/src/vidalia/help/content/po/da/config.po
index 92f675c..a44674f 100644
--- a/src/vidalia/help/content/po/da/config.po
+++ b/src/vidalia/help/content/po/da/config.po
@@ -1,33 +1,22 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"PO-Revision-Date: 2011-03-22 16:41+0000\n"
+"Last-Translator: aputsiaq <aputtu at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/config.html:16
 msgid "Configuring Vidalia and Tor"
-msgstr ""
+msgstr "Konfigurerer Vidalia og Tor"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:20
@@ -36,31 +25,43 @@ msgid ""
 "of Vidalia and Tor. It also lets you set up and manage a <a "
 "href=\"server.html\">Tor relay</a> so you can help the Tor network grow."
 msgstr ""
+"Vidalia lader dig konfigurere nogle af de aspekter som hyppigst Ã¦ndres i "
+"Vidalia og Tor. Det lader dig ogsÃ¥ opsÃ¦tte og hÃ¥ndtere et <a "
+"href=\"server.html\">Tor-relÃ¦</a>, sÃ¥ du kan hjÃ¦lpe Tor-netvÃ¦rket med at "
+"gro."
 
 #. type: Content of: <html><body>
 #: en/config.html:26
 msgid "<a name=\"general\"/>"
-msgstr ""
+msgstr "<a name=\"general\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:27
 msgid "General Settings"
-msgstr ""
+msgstr "Generelle indstillinger"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:29
-msgid "Settings on the <i>General</i> page are the most commonly modified settings."
+msgid ""
+"Settings on the <i>General</i> page are the most commonly modified settings."
 msgstr ""
+"Indstillinger pÃ¥ siden <i>Generelt</i> er de indstillinger som hyppigst "
+"Ã¦ndres."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:32
 msgid ""
-"<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 "
+"<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."
 msgstr ""
+"<b>Tor-eksekverbar</b>: Dette er den eksekverbare Tor som Vidalia vil kÃ¸re "
+"nÃ¥r du vÃ¦lger <i>Start</i> fra bakkemenuen. Hvis du har flere versioner af "
+"Tor installeret, sÃ¥ kan du fortÃ¦lle Vidalia hvilken version du vil kÃ¸re ved "
+"at klikke pÃ¥ <i>Gennemse</i>-knappen og navigere til den sÃ¦rlige Tor-"
+"installation du foretrÃ¦kker."
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:39
@@ -69,22 +70,25 @@ msgid ""
 "automatically start Tor when Vidalia starts. You can also configure Vidalia "
 "to run when your system starts (<i>Windows only</i>)."
 msgstr ""
+"<b>Opstartsvalg:</b> Med denne indstilling kan du fÃ¥ Vidalia til automatisk "
+"at starte Tor nÃ¥r Vidalia starter. Du kan ogsÃ¥ konfigurere Vidalia til at "
+"kÃ¸re nÃ¥r dit system starter <i>(kun Windows).</i>"
 
 #. type: Content of: <html><body>
 #: en/config.html:46
 msgid "<a name=\"network\"/>"
-msgstr ""
+msgstr "<a name=\"network\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:47
 msgid "Network Settings"
-msgstr ""
+msgstr "NetvÃ¦rksindstillinger"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:49
 msgid ""
-"The <i>Network</i> settings page lets you change how Tor connects to the Tor "
-"network."
+"The <i>Network</i> settings page lets you change how Tor connects to the Tor"
+" network."
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
@@ -106,8 +110,8 @@ msgid ""
 "a restrictive firewall or proxy that limits the ports you are able to "
 "connect to, you can configure Tor to connect directly only to relays "
 "listening on the ports allowed by your firewall or proxy. Simply enter a "
-"list of ports permitted by your firewall or proxy, separated by "
-"commas. (<i>Example: 80,443,8080</i>)"
+"list of ports permitted by your firewall or proxy, separated by commas. "
+"(<i>Example: 80,443,8080</i>)"
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
@@ -117,39 +121,39 @@ msgid ""
 "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."
+"or newer only). You can add bridge relays by specifying either their address"
+" and port number, or their address, port number, and fingerprint."
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:77
 msgid "Below are examples of valid bridge address formats:"
-msgstr ""
+msgstr "Nedenfor er eksempler pÃ¥ gyldige bro-adresseformater:"
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:80
 msgid "128.213.48.13:8080"
-msgstr ""
+msgstr "128.213.48.13:8080"
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:83
 msgid "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73"
-msgstr ""
+msgstr "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73"
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:86
 msgid "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73"
-msgstr ""
+msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73"
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:89
 msgid ""
 "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 "
+"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."
 msgstr ""
@@ -157,29 +161,29 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/config.html:100
 msgid "<a name=\"relay\"/>"
-msgstr ""
+msgstr "<a name=\"relay\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:101
 msgid "Relay Settings"
-msgstr ""
+msgstr "Indstillinger for relÃ¦"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:103
 msgid ""
-"<i> See <a href=\"server.html\">this help topic</a> for detailed information "
-"about setting up and managing a Tor relay.  </i>"
+"<i> See <a href=\"server.html\">this help topic</a> for detailed information"
+" about setting up and managing a Tor relay.  </i>"
 msgstr ""
 
 #. type: Content of: <html><body>
 #: en/config.html:109
 msgid "<a name=\"appearance\"/>"
-msgstr ""
+msgstr "<a name=\"appearance\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:110
 msgid "Appearance Settings"
-msgstr ""
+msgstr "Indstillinger for udseende"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:112
@@ -191,12 +195,12 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:116
 msgid ""
-"<b>Language</b>: Vidalia's interface has been translated into many languages "
-"by helpful volunteers. When Vidalia is first run, it will try to guess which "
-"language your computer is currently using. If Vidalia guesses incorrectly, "
-"or if you prefer a different language, you can choose another language from "
-"the dropdown box. You will need to restart Vidalia after changing the "
-"displayed language for the changes to take effect."
+"<b>Language</b>: Vidalia's interface has been translated into many languages"
+" by helpful volunteers. When Vidalia is first run, it will try to guess "
+"which language your computer is currently using. If Vidalia guesses "
+"incorrectly, or if you prefer a different language, you can choose another "
+"language from the dropdown box. You will need to restart Vidalia after "
+"changing the displayed language for the changes to take effect."
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
@@ -227,8 +231,8 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:138
 msgid ""
-"<b>Control Address &amp; Port</b>: The <i>Control Port</i> is the port which "
-"Vidalia uses to talk to Tor.  This doesn't need to be changed unless you "
+"<b>Control Address &amp; Port</b>: The <i>Control Port</i> is the port which"
+" Vidalia uses to talk to Tor.  This doesn't need to be changed unless you "
 "have a conflict with another service on your machine, or if you are using "
 "Vidalia to control and monitor a Tor process running on another machine."
 msgstr ""
@@ -255,15 +259,15 @@ msgid ""
 "<b>Password</b> <i>(Default)</i> -- If this method is selected, you can "
 "specify a password that Tor will require each time a user or application "
 "connects to Tor's control port. If Vidalia starts Tor for you, you can have "
-"Vidalia randomly generate a new password each time it starts Tor by checking "
-"the <i>Randomly Generate</i> checkbox."
+"Vidalia randomly generate a new password each time it starts Tor by checking"
+" the <i>Randomly Generate</i> checkbox."
 msgstr ""
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:162
 msgid ""
-"<b>Cookie</b> -- If cookie authentication is selected, Tor will write a file "
-"(or, <i>cookie</i>) containing random bytes to its data directory when it "
+"<b>Cookie</b> -- If cookie authentication is selected, Tor will write a file"
+" (or, <i>cookie</i>) containing random bytes to its data directory when it "
 "starts. Any user or application that tries to connect to Tor's control port "
 "must be able to provide the contents of this cookie."
 msgstr ""
@@ -289,9 +293,9 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:181
 msgid ""
-"<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 "
+"<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."
 msgstr ""
 
@@ -308,6 +312,6 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/config.html:192
 msgid ""
-"Hidden services allow you to provide any kind of TCP-based service, e.g.  an "
-"HTTP service, to others without revealing your IP address."
+"Hidden services allow you to provide any kind of TCP-based service, e.g.  an"
+" HTTP service, to others without revealing your IP address."
 msgstr ""
diff --git a/src/vidalia/help/content/po/dz/netview.po b/src/vidalia/help/content/po/dz/netview.po
index 47f3d73..2894859 100644
--- a/src/vidalia/help/content/po/dz/netview.po
+++ b/src/vidalia/help/content/po/dz/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: dz\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/el/netview.po b/src/vidalia/help/content/po/el/netview.po
index 47f3d73..188d4fd 100644
--- a/src/vidalia/help/content/po/el/netview.po
+++ b/src/vidalia/help/content/po/el/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/eo/netview.po b/src/vidalia/help/content/po/eo/netview.po
index 47f3d73..056acbb 100644
--- a/src/vidalia/help/content/po/eo/netview.po
+++ b/src/vidalia/help/content/po/eo/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/et/netview.po b/src/vidalia/help/content/po/et/netview.po
index 47f3d73..27aba36 100644
--- a/src/vidalia/help/content/po/et/netview.po
+++ b/src/vidalia/help/content/po/et/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/eu/netview.po b/src/vidalia/help/content/po/eu/netview.po
index 47f3d73..0a395c8 100644
--- a/src/vidalia/help/content/po/eu/netview.po
+++ b/src/vidalia/help/content/po/eu/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/fil/netview.po b/src/vidalia/help/content/po/fil/netview.po
index 47f3d73..217b3f2 100644
--- a/src/vidalia/help/content/po/fil/netview.po
+++ b/src/vidalia/help/content/po/fil/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: fil\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/fur/netview.po b/src/vidalia/help/content/po/fur/netview.po
index 47f3d73..c4937ac 100644
--- a/src/vidalia/help/content/po/fur/netview.po
+++ b/src/vidalia/help/content/po/fur/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: fur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/ga/netview.po b/src/vidalia/help/content/po/ga/netview.po
index 47f3d73..f951aa0 100644
--- a/src/vidalia/help/content/po/ga/netview.po
+++ b/src/vidalia/help/content/po/ga/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ga\n"
+"Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/gl/netview.po b/src/vidalia/help/content/po/gl/netview.po
index 47f3d73..5d0cf41 100644
--- a/src/vidalia/help/content/po/gl/netview.po
+++ b/src/vidalia/help/content/po/gl/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/gu/netview.po b/src/vidalia/help/content/po/gu/netview.po
index 47f3d73..818c042 100644
--- a/src/vidalia/help/content/po/gu/netview.po
+++ b/src/vidalia/help/content/po/gu/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: gu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/gun/netview.po b/src/vidalia/help/content/po/gun/netview.po
index 47f3d73..2428ec9 100644
--- a/src/vidalia/help/content/po/gun/netview.po
+++ b/src/vidalia/help/content/po/gun/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: gun\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/ha/netview.po b/src/vidalia/help/content/po/ha/netview.po
index 47f3d73..e192f33 100644
--- a/src/vidalia/help/content/po/ha/netview.po
+++ b/src/vidalia/help/content/po/ha/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ha\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/he/netview.po b/src/vidalia/help/content/po/he/netview.po
index 47f3d73..6500e46 100644
--- a/src/vidalia/help/content/po/he/netview.po
+++ b/src/vidalia/help/content/po/he/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/hi/netview.po b/src/vidalia/help/content/po/hi/netview.po
index 47f3d73..d80af46 100644
--- a/src/vidalia/help/content/po/hi/netview.po
+++ b/src/vidalia/help/content/po/hi/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/hr/netview.po b/src/vidalia/help/content/po/hr/netview.po
index 47f3d73..67ab0ce 100644
--- a/src/vidalia/help/content/po/hr/netview.po
+++ b/src/vidalia/help/content/po/hr/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/ht/netview.po b/src/vidalia/help/content/po/ht/netview.po
index 47f3d73..895ffb1 100644
--- a/src/vidalia/help/content/po/ht/netview.po
+++ b/src/vidalia/help/content/po/ht/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ht\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/hu/netview.po b/src/vidalia/help/content/po/hu/netview.po
index 47f3d73..1d8621a 100644
--- a/src/vidalia/help/content/po/hu/netview.po
+++ b/src/vidalia/help/content/po/hu/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/id/netview.po b/src/vidalia/help/content/po/id/netview.po
index 47f3d73..08f1eac 100644
--- a/src/vidalia/help/content/po/id/netview.po
+++ b/src/vidalia/help/content/po/id/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/is/netview.po b/src/vidalia/help/content/po/is/netview.po
index 47f3d73..02af0a6 100644
--- a/src/vidalia/help/content/po/is/netview.po
+++ b/src/vidalia/help/content/po/is/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/kn/netview.po b/src/vidalia/help/content/po/kn/netview.po
index 47f3d73..9fb7dd1 100644
--- a/src/vidalia/help/content/po/kn/netview.po
+++ b/src/vidalia/help/content/po/kn/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/kw/netview.po b/src/vidalia/help/content/po/kw/netview.po
index 47f3d73..3253e05 100644
--- a/src/vidalia/help/content/po/kw/netview.po
+++ b/src/vidalia/help/content/po/kw/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: kw\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n == 3) ? 2 : 3\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/lb/netview.po b/src/vidalia/help/content/po/lb/netview.po
index 47f3d73..5b4167f 100644
--- a/src/vidalia/help/content/po/lb/netview.po
+++ b/src/vidalia/help/content/po/lb/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/ln/netview.po b/src/vidalia/help/content/po/ln/netview.po
index 47f3d73..44255cb 100644
--- a/src/vidalia/help/content/po/ln/netview.po
+++ b/src/vidalia/help/content/po/ln/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ln\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/lo/netview.po b/src/vidalia/help/content/po/lo/netview.po
index 47f3d73..dec50df 100644
--- a/src/vidalia/help/content/po/lo/netview.po
+++ b/src/vidalia/help/content/po/lo/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: lo\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/lt/netview.po b/src/vidalia/help/content/po/lt/netview.po
index 47f3d73..ca0b4ac 100644
--- a/src/vidalia/help/content/po/lt/netview.po
+++ b/src/vidalia/help/content/po/lt/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\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"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/lv/netview.po b/src/vidalia/help/content/po/lv/netview.po
index 47f3d73..4aab18d 100644
--- a/src/vidalia/help/content/po/lv/netview.po
+++ b/src/vidalia/help/content/po/lv/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/mg/netview.po b/src/vidalia/help/content/po/mg/netview.po
index 47f3d73..849cdf1 100644
--- a/src/vidalia/help/content/po/mg/netview.po
+++ b/src/vidalia/help/content/po/mg/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: mg\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/mi/netview.po b/src/vidalia/help/content/po/mi/netview.po
index 47f3d73..77d5231 100644
--- a/src/vidalia/help/content/po/mi/netview.po
+++ b/src/vidalia/help/content/po/mi/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: mi\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/mk/netview.po b/src/vidalia/help/content/po/mk/netview.po
index 47f3d73..6dbd9ee 100644
--- a/src/vidalia/help/content/po/mk/netview.po
+++ b/src/vidalia/help/content/po/mk/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/ml/netview.po b/src/vidalia/help/content/po/ml/netview.po
index 47f3d73..ef9ffa6 100644
--- a/src/vidalia/help/content/po/ml/netview.po
+++ b/src/vidalia/help/content/po/ml/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/mn/netview.po b/src/vidalia/help/content/po/mn/netview.po
index 47f3d73..450c1ed 100644
--- a/src/vidalia/help/content/po/mn/netview.po
+++ b/src/vidalia/help/content/po/mn/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/mr/netview.po b/src/vidalia/help/content/po/mr/netview.po
index 47f3d73..f450fe0 100644
--- a/src/vidalia/help/content/po/mr/netview.po
+++ b/src/vidalia/help/content/po/mr/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: mr\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/ms/netview.po b/src/vidalia/help/content/po/ms/netview.po
index 47f3d73..e65713a 100644
--- a/src/vidalia/help/content/po/ms/netview.po
+++ b/src/vidalia/help/content/po/ms/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ms\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/mt/netview.po b/src/vidalia/help/content/po/mt/netview.po
index 47f3d73..fc20730 100644
--- a/src/vidalia/help/content/po/mt/netview.po
+++ b/src/vidalia/help/content/po/mt/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\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"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/nap/netview.po b/src/vidalia/help/content/po/nap/netview.po
index 47f3d73..3130bf3 100644
--- a/src/vidalia/help/content/po/nap/netview.po
+++ b/src/vidalia/help/content/po/nap/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: nap\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/nb/netview.po b/src/vidalia/help/content/po/nb/netview.po
index 15de0c5..267c31f 100644
--- a/src/vidalia/help/content/po/nb/netview.po
+++ b/src/vidalia/help/content/po/nb/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\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: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/ne/netview.po b/src/vidalia/help/content/po/ne/netview.po
index 47f3d73..1203d67 100644
--- a/src/vidalia/help/content/po/ne/netview.po
+++ b/src/vidalia/help/content/po/ne/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ne\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/nl/netview.po b/src/vidalia/help/content/po/nl/netview.po
index 47f3d73..a66393d 100644
--- a/src/vidalia/help/content/po/nl/netview.po
+++ b/src/vidalia/help/content/po/nl/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/nn/netview.po b/src/vidalia/help/content/po/nn/netview.po
index 47f3d73..6dec764 100644
--- a/src/vidalia/help/content/po/nn/netview.po
+++ b/src/vidalia/help/content/po/nn/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/nso/netview.po b/src/vidalia/help/content/po/nso/netview.po
index 47f3d73..30d29e9 100644
--- a/src/vidalia/help/content/po/nso/netview.po
+++ b/src/vidalia/help/content/po/nso/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: nso\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/oc/netview.po b/src/vidalia/help/content/po/oc/netview.po
index 47f3d73..611816a 100644
--- a/src/vidalia/help/content/po/oc/netview.po
+++ b/src/vidalia/help/content/po/oc/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: oc\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/pa/netview.po b/src/vidalia/help/content/po/pa/netview.po
index 47f3d73..a4cda00 100644
--- a/src/vidalia/help/content/po/pa/netview.po
+++ b/src/vidalia/help/content/po/pa/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/pap/netview.po b/src/vidalia/help/content/po/pap/netview.po
index 47f3d73..32e0745 100644
--- a/src/vidalia/help/content/po/pap/netview.po
+++ b/src/vidalia/help/content/po/pap/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: pap\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/pl/netview.po b/src/vidalia/help/content/po/pl/netview.po
index 47f3d73..5c43864 100644
--- a/src/vidalia/help/content/po/pl/netview.po
+++ b/src/vidalia/help/content/po/pl/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/pms/netview.po b/src/vidalia/help/content/po/pms/netview.po
index 47f3d73..0fd0845 100644
--- a/src/vidalia/help/content/po/pms/netview.po
+++ b/src/vidalia/help/content/po/pms/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: pms\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/ps/netview.po b/src/vidalia/help/content/po/ps/netview.po
index 47f3d73..9b4ee0f 100644
--- a/src/vidalia/help/content/po/ps/netview.po
+++ b/src/vidalia/help/content/po/ps/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ps\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/pt/netview.po b/src/vidalia/help/content/po/pt/netview.po
index 47f3d73..3e5919f 100644
--- a/src/vidalia/help/content/po/pt/netview.po
+++ b/src/vidalia/help/content/po/pt/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/pt_BR/netview.po b/src/vidalia/help/content/po/pt_BR/netview.po
index 47f3d73..8ab192c 100644
--- a/src/vidalia/help/content/po/pt_BR/netview.po
+++ b/src/vidalia/help/content/po/pt_BR/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/ro/netview.po b/src/vidalia/help/content/po/ro/netview.po
index 47f3d73..a9d79de 100644
--- a/src/vidalia/help/content/po/ro/netview.po
+++ b/src/vidalia/help/content/po/ro/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/sco/netview.po b/src/vidalia/help/content/po/sco/netview.po
index 47f3d73..8c98164 100644
--- a/src/vidalia/help/content/po/sco/netview.po
+++ b/src/vidalia/help/content/po/sco/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: sco\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/son/netview.po b/src/vidalia/help/content/po/son/netview.po
index 47f3d73..a9fd80d 100644
--- a/src/vidalia/help/content/po/son/netview.po
+++ b/src/vidalia/help/content/po/son/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: son\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/su/netview.po b/src/vidalia/help/content/po/su/netview.po
index 47f3d73..5263b4f 100644
--- a/src/vidalia/help/content/po/su/netview.po
+++ b/src/vidalia/help/content/po/su/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: su\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/sw/netview.po b/src/vidalia/help/content/po/sw/netview.po
index 47f3d73..e3748e6 100644
--- a/src/vidalia/help/content/po/sw/netview.po
+++ b/src/vidalia/help/content/po/sw/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/ta/netview.po b/src/vidalia/help/content/po/ta/netview.po
index 47f3d73..48786fb 100644
--- a/src/vidalia/help/content/po/ta/netview.po
+++ b/src/vidalia/help/content/po/ta/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/te/netview.po b/src/vidalia/help/content/po/te/netview.po
index 47f3d73..9b16a10 100644
--- a/src/vidalia/help/content/po/te/netview.po
+++ b/src/vidalia/help/content/po/te/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/tg/netview.po b/src/vidalia/help/content/po/tg/netview.po
index 47f3d73..333df5d 100644
--- a/src/vidalia/help/content/po/tg/netview.po
+++ b/src/vidalia/help/content/po/tg/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: tg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/th/netview.po b/src/vidalia/help/content/po/th/netview.po
index 47f3d73..6f90155 100644
--- a/src/vidalia/help/content/po/th/netview.po
+++ b/src/vidalia/help/content/po/th/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/ti/netview.po b/src/vidalia/help/content/po/ti/netview.po
index 47f3d73..7719a04 100644
--- a/src/vidalia/help/content/po/ti/netview.po
+++ b/src/vidalia/help/content/po/ti/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ti\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/tk/netview.po b/src/vidalia/help/content/po/tk/netview.po
index 47f3d73..1cd01b8 100644
--- a/src/vidalia/help/content/po/tk/netview.po
+++ b/src/vidalia/help/content/po/tk/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: tk\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/tr/config.po b/src/vidalia/help/content/po/tr/config.po
index 92f675c..7613a9a 100644
--- a/src/vidalia/help/content/po/tr/config.po
+++ b/src/vidalia/help/content/po/tr/config.po
@@ -1,33 +1,22 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 16:58+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: tr_TR\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/config.html:16
 msgid "Configuring Vidalia and Tor"
-msgstr ""
+msgstr "Vidalia ve Tor'u yapÄ±landÄ±rÄ±yor"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:20
@@ -40,25 +29,26 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/config.html:26
 msgid "<a name=\"general\"/>"
-msgstr ""
+msgstr "<a name=\"genel\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:27
 msgid "General Settings"
-msgstr ""
+msgstr "Genel Ayarlar"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:29
-msgid "Settings on the <i>General</i> page are the most commonly modified settings."
+msgid ""
+"Settings on the <i>General</i> page are the most commonly modified settings."
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:32
 msgid ""
-"<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 "
+"<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."
 msgstr ""
 
@@ -73,18 +63,18 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/config.html:46
 msgid "<a name=\"network\"/>"
-msgstr ""
+msgstr "<a name=\"AÄŸ\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:47
 msgid "Network Settings"
-msgstr ""
+msgstr "AÄŸ AyarlarÄ±"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:49
 msgid ""
-"The <i>Network</i> settings page lets you change how Tor connects to the Tor "
-"network."
+"The <i>Network</i> settings page lets you change how Tor connects to the Tor"
+" network."
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
@@ -106,8 +96,8 @@ msgid ""
 "a restrictive firewall or proxy that limits the ports you are able to "
 "connect to, you can configure Tor to connect directly only to relays "
 "listening on the ports allowed by your firewall or proxy. Simply enter a "
-"list of ports permitted by your firewall or proxy, separated by "
-"commas. (<i>Example: 80,443,8080</i>)"
+"list of ports permitted by your firewall or proxy, separated by commas. "
+"(<i>Example: 80,443,8080</i>)"
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
@@ -117,8 +107,8 @@ msgid ""
 "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."
+"or newer only). You can add bridge relays by specifying either their address"
+" and port number, or their address, port number, and fingerprint."
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
@@ -129,27 +119,27 @@ msgstr ""
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:80
 msgid "128.213.48.13:8080"
-msgstr ""
+msgstr "128.213.48.13:8080"
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:83
 msgid "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73"
-msgstr ""
+msgstr "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73"
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:86
 msgid "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73"
-msgstr ""
+msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73"
 
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:89
 msgid ""
 "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 "
+"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."
 msgstr ""
@@ -167,19 +157,19 @@ msgstr ""
 #. type: Content of: <html><body><p>
 #: en/config.html:103
 msgid ""
-"<i> See <a href=\"server.html\">this help topic</a> for detailed information "
-"about setting up and managing a Tor relay.  </i>"
+"<i> See <a href=\"server.html\">this help topic</a> for detailed information"
+" about setting up and managing a Tor relay.  </i>"
 msgstr ""
 
 #. type: Content of: <html><body>
 #: en/config.html:109
 msgid "<a name=\"appearance\"/>"
-msgstr ""
+msgstr "<a name=\"gÃ¶rÃ¼nÃ¼m\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:110
 msgid "Appearance Settings"
-msgstr ""
+msgstr "GÃ¶rÃ¼nÃ¼m AyarlarÄ±"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:112
@@ -191,12 +181,12 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:116
 msgid ""
-"<b>Language</b>: Vidalia's interface has been translated into many languages "
-"by helpful volunteers. When Vidalia is first run, it will try to guess which "
-"language your computer is currently using. If Vidalia guesses incorrectly, "
-"or if you prefer a different language, you can choose another language from "
-"the dropdown box. You will need to restart Vidalia after changing the "
-"displayed language for the changes to take effect."
+"<b>Language</b>: Vidalia's interface has been translated into many languages"
+" by helpful volunteers. When Vidalia is first run, it will try to guess "
+"which language your computer is currently using. If Vidalia guesses "
+"incorrectly, or if you prefer a different language, you can choose another "
+"language from the dropdown box. You will need to restart Vidalia after "
+"changing the displayed language for the changes to take effect."
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
@@ -210,12 +200,12 @@ msgstr ""
 #. type: Content of: <html><body>
 #: en/config.html:131
 msgid "<a name=\"advanced\"/>"
-msgstr ""
+msgstr "<a name=\"geliÅŸmiÅŸ\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:132
 msgid "Advanced Settings"
-msgstr ""
+msgstr "GeliÅŸmiÅŸ Ayarlar"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:134
@@ -227,8 +217,8 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:138
 msgid ""
-"<b>Control Address &amp; Port</b>: The <i>Control Port</i> is the port which "
-"Vidalia uses to talk to Tor.  This doesn't need to be changed unless you "
+"<b>Control Address &amp; Port</b>: The <i>Control Port</i> is the port which"
+" Vidalia uses to talk to Tor.  This doesn't need to be changed unless you "
 "have a conflict with another service on your machine, or if you are using "
 "Vidalia to control and monitor a Tor process running on another machine."
 msgstr ""
@@ -255,15 +245,15 @@ msgid ""
 "<b>Password</b> <i>(Default)</i> -- If this method is selected, you can "
 "specify a password that Tor will require each time a user or application "
 "connects to Tor's control port. If Vidalia starts Tor for you, you can have "
-"Vidalia randomly generate a new password each time it starts Tor by checking "
-"the <i>Randomly Generate</i> checkbox."
+"Vidalia randomly generate a new password each time it starts Tor by checking"
+" the <i>Randomly Generate</i> checkbox."
 msgstr ""
 
 #. type: Content of: <html><body><ul><li><ul><li>
 #: en/config.html:162
 msgid ""
-"<b>Cookie</b> -- If cookie authentication is selected, Tor will write a file "
-"(or, <i>cookie</i>) containing random bytes to its data directory when it "
+"<b>Cookie</b> -- If cookie authentication is selected, Tor will write a file"
+" (or, <i>cookie</i>) containing random bytes to its data directory when it "
 "starts. Any user or application that tries to connect to Tor's control port "
 "must be able to provide the contents of this cookie."
 msgstr ""
@@ -289,25 +279,25 @@ msgstr ""
 #. type: Content of: <html><body><ul><li>
 #: en/config.html:181
 msgid ""
-"<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 "
+"<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."
 msgstr ""
 
 #. type: Content of: <html><body>
 #: en/config.html:189
 msgid "<a name=\"services\"/>"
-msgstr ""
+msgstr "<a name=\"hizmetler\"/>"
 
 #. type: Content of: <html><body><h3>
 #: en/config.html:190
 msgid "Hidden Service Settings"
-msgstr ""
+msgstr "GizlenmiÅŸ Hizmet AyarlarÄ±"
 
 #. type: Content of: <html><body><p>
 #: en/config.html:192
 msgid ""
-"Hidden services allow you to provide any kind of TCP-based service, e.g.  an "
-"HTTP service, to others without revealing your IP address."
+"Hidden services allow you to provide any kind of TCP-based service, e.g.  an"
+" HTTP service, to others without revealing your IP address."
 msgstr ""
diff --git a/src/vidalia/help/content/po/tr/netview.po b/src/vidalia/help/content/po/tr/netview.po
index 47f3d73..79e248b 100644
--- a/src/vidalia/help/content/po/tr/netview.po
+++ b/src/vidalia/help/content/po/tr/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/uk/netview.po b/src/vidalia/help/content/po/uk/netview.po
index 47f3d73..6a03b77 100644
--- a/src/vidalia/help/content/po/uk/netview.po
+++ b/src/vidalia/help/content/po/uk/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/ur/netview.po b/src/vidalia/help/content/po/ur/netview.po
index 47f3d73..95e3b63 100644
--- a/src/vidalia/help/content/po/ur/netview.po
+++ b/src/vidalia/help/content/po/ur/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/ve/netview.po b/src/vidalia/help/content/po/ve/netview.po
index 47f3d73..8b0aa3d 100644
--- a/src/vidalia/help/content/po/ve/netview.po
+++ b/src/vidalia/help/content/po/ve/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: ve\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/vi/netview.po b/src/vidalia/help/content/po/vi/netview.po
index 47f3d73..74ff807 100644
--- a/src/vidalia/help/content/po/vi/netview.po
+++ b/src/vidalia/help/content/po/vi/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/wa/netview.po b/src/vidalia/help/content/po/wa/netview.po
index 47f3d73..503a27d 100644
--- a/src/vidalia/help/content/po/wa/netview.po
+++ b/src/vidalia/help/content/po/wa/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: wa\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/zh_CN/netview.po b/src/vidalia/help/content/po/zh_CN/netview.po
index da54615..8e4e7d5 100644
--- a/src/vidalia/help/content/po/zh_CN/netview.po
+++ b/src/vidalia/help/content/po/zh_CN/netview.po
@@ -1,57 +1,42 @@
 # 
-#   $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.
-# 
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: 2010-11-14 07:13+0200\n"
-"Last-Translator: jonchil <abcd666 at gmail.com>\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.5\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
 msgid "Network Viewer"
-msgstr "ç½‘ç»œæŸ¥çœ‹å™¨"
+msgstr ""
 
 #. type: Content of: <html><body><p>
 #: en/netview.html:20
 msgid ""
 "The network viewer lets you see relays in the Tor network and where your "
 "traffic is going."
-msgstr "ç½‘ç»œæŸ¥çœ‹å™¨ä½¿æ‚¨å¯ä»¥æŸ¥çœ‹ Tor ç½‘ç»œçš„ä¸ç»§å’Œæ‚¨ç»ç”±çš„ä½ç½®ã€‚"
+msgstr ""
 
 #. type: Content of: <html><body>
 #: en/netview.html:25
 msgid "<a name=\"overview\"/>"
-msgstr "<a name=\"overview\"/>"
+msgstr ""
 
 #. type: Content of: <html><body><h3>
 #: en/netview.html:26
 msgid "Overview"
-msgstr "æ¦‚è¿°"
+msgstr ""
 
-# multiply streamsä¸çŸ¥å¦‚ä½•ç¿»è¯‘ï¼Œä¸“ä¸šæœ¯è¯
-# by Jonchil
 #. type: Content of: <html><body><p>
 #: en/netview.html:28
-#, fuzzy
 msgid ""
 "When you want to communicate anonymously through Tor (say, connecting to a "
 "website), Tor creates a tunnel, or <i>circuit</i>, of encrypted connections "
@@ -59,28 +44,25 @@ msgid ""
 "then sent as a <i>stream</i> through that circuit. For efficiency, multiple "
 "streams may share the same circuit."
 msgstr ""
-"å½“æ‚¨æƒ³è¦é€šè¿‡ Tor å’ŒåŒ¿åè€…äº¤æµæ—¶ï¼ˆè¯´è¯ï¼Œè¿žæŽ¥åˆ°ç½‘ç«™ï¼‰ï¼ŒTor é€šè¿‡ç½‘ç»œä¸ç»§åˆ›å»ºä¸€ä¸ªåŠ å¯†äº†è¿žæŽ¥çš„é€šè·¯ï¼Œæˆ–<i>å›žè·¯</i>ã€‚æ‚¨çš„åº”ç”¨ç¨‹åºæ˜¯é€šè¿‡è¯¥å›žè·¯ä½œ"
-"ä¸º<i>æµ</i>æ¥å‘é€çš„ã€‚ä¸ºäº†æé«˜æ•ˆçŽ‡ï¼Œå¤šåª’ä½“æµä¹Ÿå¯èƒ½ä¼šå…±äº«åŒä¸€ä¸ªå›žè·¯ã€‚"
 
 #. type: Content of: <html><body>
 #: en/netview.html:35
 msgid "<a name=\"netmap\"/>"
-msgstr "<a name=\"netmap\"/>"
+msgstr ""
 
 #. type: Content of: <html><body><h3>
 #: en/netview.html:36
 msgid "Network Map"
-msgstr "ç½‘ç»œåœ°å›¾"
+msgstr ""
 
 #. type: Content of: <html><body><p>
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
-"ç½‘ç»œåœ°å›¾æ˜¯ç”±ä¸–ç•Œåœ°å›¾ï¼Œå’Œçº¢ç‚¹æŒ‡æ˜Žçš„ Tor ç½‘ç»œåœ°å›¾ä¸Šä¸ç»§çš„åœ°ç†ä½ç½®ç»„æˆçš„ã€‚ç»¿è‰²çº¿æ¡è¿žæŽ¥ä¸ç»§ç”¨ä»¥æŒ‡æ˜Ž Tor å®¢æˆ·ç«¯é€šè¿‡ Tor ç½‘ç»œåˆ›å»ºå›žè·¯çš„è·¯å¾„ã€‚"
 
 #. type: Content of: <html><body><p>
 #: en/netview.html:44
@@ -89,7 +71,7 @@ msgid ""
 "<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."
-msgstr "æ‚¨å¯ä»¥é€šè¿‡ç‚¹å‡»å·¥å…·æ ä¸Šçš„<b>ç¼©å°</b>å’Œ<b>æ”¾å¤§</b>æŒ‰é’®æ¥æ”¾ç¼©åœ°å›¾ã€‚æ‚¨ä¹Ÿå¯ä»¥é€šè¿‡ç‚¹å‡»åœ°å›¾å¹¶ä¸”æ‹–æ‹½åˆ°æ‚¨æƒ³è¦ç§»åŠ¨çš„ç›®æ ‡ä¸Šã€‚"
+msgstr ""
 
 #. type: Content of: <html><body><p>
 #: en/netview.html:50
@@ -98,37 +80,29 @@ msgid ""
 "address of the relay in a GeoIP database, created by MaxMind and located at "
 "geoip.vidalia-project.net."
 msgstr ""
-"Tor ä¸ç»§çš„åœ°ç†ä½ç½®å†³å®šäºŽ GeoIP æ•°æ®åº“ä¸ä¸ç»§çš„ IP åœ°å€ï¼Œç”± MaxMind åˆ›å»ºå¹¶ä½äºŽgeoip.vidalia-project.netã€‚"
 
-# æœ€åŽä¸€å¥ï¼Œç¿»è¯‘ä¸é€šé¡º
-# by Jonchil
 #. type: Content of: <html><body><p>
 #: en/netview.html:55
-#, fuzzy
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
-"åœ¨å¯¹è¯æ¡†ä¸é—´ï¼Œä½äºŽç½‘ç»œåœ°å›¾ä¸‹æ–¹çš„ä½ç½®ï¼Œæ‚¨å¯ä»¥çœ‹åˆ°ä¸€ä¸ªå½“å‰å›žè·¯åˆ—è¡¨ï¼Œä»»ä½•åº”ç”¨ç¨‹åºä¹Ÿç›´æŽ¥ç»ç”±è¯¥å›žè·¯ã€‚å½“ç½‘ç»œåœ°å›¾ç¬¬ä¸€æ¬¡è½½å…¥æ—¶ï¼Œæ‚¨åº”å½“å¯ä»¥çœ‹åˆ°ä¸€ä¸ªåˆ°geoip"
-".vidalia-project.netçš„è¿žæŽ¥ï¼Œè¯¥è¿žæŽ¥å‘ç”Ÿåœ¨å½“ Vidalia ä¸º Tor "
-"ä¸ç»§åˆ—è¡¨æœç´¢åœ°ç†ä½ç½®ä¿¡æ¯çš„æ—¶å€™ã€‚å¾ˆé‡è¦éœ€è¦æ‚¨æ³¨æ„çš„ä¸€ç‚¹æ˜¯è¯¥è¯·æ±‚æ˜¯é€šè¿‡ Tor å®Œæˆçš„ï¼Œæ‰€ä»¥æ‚¨çš„ä½ç½®ä¸ä¼šé€éœ²ç»™ GeoIP "
-"ä¸ç»§ã€‚è¯¥æœç´¢ç»“æžœå°†ä¼šåœ¨æœ¬åœ°æ•æ‰ä»¥æ±‚é™ä½Žè½½å…¥åˆ° Vidalia GeoIP ä¸ç»§ã€‚"
 
 #. type: Content of: <html><body>
 #: en/netview.html:66
 msgid "<a name=\"relaylist\"/>"
-msgstr "<a name=\"relaylist\"/>"
+msgstr ""
 
 #. type: Content of: <html><body><h3>
 #: en/netview.html:67
 msgid "Relay Status"
-msgstr "ä¸ç»§çŠ¶æ€"
+msgstr ""
 
 #. type: Content of: <html><body><p>
 #: en/netview.html:69
@@ -136,119 +110,111 @@ msgid ""
 "On the left side of the network view, you will see a list of relays in the "
 "Tor network. Next to each relay is an icon indicating that relay's status.  "
 "The following table summarizes the possible relay status icons:"
-msgstr "åœ¨ç½‘ç»œæŸ¥çœ‹å™¨çš„å·¦è¾¹ï¼Œæ‚¨å°†ä¼šçœ‹åˆ°ä¸€ä¸ªåœ¨ Tor ç½‘ç»œä¸çš„ä¸ç»§åˆ—è¡¨ã€‚æ¯ä¸ªä¸ç»§ä¸‹é¢æ˜¯ä¸€ä¸ªæŒ‡ç¤ºä¸ç»§çŠ¶æ€çš„å›¾æ ‡ã€‚ä¸‹é¢çš„è¡¨æ ¼æ€»ç»“äº†ä¸ç»§çŠ¶æ€å›¾æ ‡ã€‚"
+msgstr ""
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:78
 msgid "The relay is offline or simply not responding."
-msgstr "ä¸ç»§ç¦»çº¿æˆ–æœªå›žåº”ã€‚"
+msgstr ""
 
-# hibernatingä¸å¥½ç¿»è¯‘ï¼Œæœ¬æ„æ˜¯ä¼‘çœ ä¹‹æ„ï¼Œè¿™é‡Œæš‚æ—¶å–å—é¢æ„æ€
-# by Jonchil
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:84
-#, fuzzy
 msgid ""
 "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."
-msgstr "ä¸ç»§<i>æ£åœ¨ä¼‘çœ </i>ï¼Œæ„æ€æ˜¯ä¸ç»§åœ¨çº¿ï¼Œä½†å·²ç»ç”¨å°½å®½å¸¦ï¼Œå› ä¸ºæ“ä½œå‘˜å¸Œæœ›å…è®¸åœ¨æŒ‡å®šæ—¶é—´æ®µå†…è¿è¡Œã€‚"
+msgstr ""
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:92
 msgid "The relay is online, but has shown only minimal throughput."
-msgstr "ä¸ç»§åœ¨çº¿ï¼Œä½†æ˜¾ç¤ºäº†å¾ˆå°çš„æ•°æ®æµé‡ã€‚"
+msgstr ""
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:98
 msgid "The relay is online and has shown a throughput &gt;= 20 KB/s."
-msgstr "ä¸ç»§åœ¨çº¿å¹¶ä¸”æ˜¾ç¤ºæµé‡&gt;= 20 KB/sã€‚"
+msgstr ""
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:104
 msgid "The relay is online and has shown a throughput &gt;= 60 KB/s."
-msgstr "ä¸ç»§åœ¨çº¿å¹¶ä¸”æ˜¾ç¤ºæµé‡&gt;= 60 KB/sã€‚"
+msgstr ""
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:110
 msgid "The relay is online and has shown a throughput &gt;= 400 KB/s."
-msgstr "ä¸ç»§åœ¨çº¿å¹¶ä¸”æ˜¾ç¤ºæµé‡&gt;= 400 KB/sã€‚"
+msgstr ""
 
-# ç¬¬äºŒè¡ŒoveråŽä¸çŸ¥å¦‚ä½•è¿žæŽ¥ç¿»è¯‘
-# by Jonchil
 #. type: Content of: <html><body><p>
 #: en/netview.html:116
-#, fuzzy
 msgid ""
 "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."
-msgstr "æ‰€æœ‰çš„å®½å¸¦å€¼éƒ½æ˜¯åŸºäºŽæœ€å°æˆ–æœ€å¤§å®½å¸¦çš„è¾“å…¥è¾“å‡ºå€¼"
+msgstr ""
 
 #. type: Content of: <html><body>
 #: en/netview.html:122
 msgid "<a name=\"details\"/>"
-msgstr "<a name=\"details\"/>"
+msgstr ""
 
 #. type: Content of: <html><body><h3>
 #: en/netview.html:123
 msgid "Relay Details"
-msgstr "ä¸ç»§ç»†èŠ‚"
+msgstr ""
 
 #. type: Content of: <html><body><p>
 #: en/netview.html:125
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
-"åœ¨å±å¹•å³è¾¹çš„ç»ˆæžç»†èŠ‚é¢æ¿å‘æ‚¨æä¾›äº†å…³äºŽä¸ç»§æˆ–å½“å‰åœ¨<a href=\"#relaylist\">ä¸ç»§åˆ—è¡¨</a>ä¸é€‰æ‹©çš„ç»†èŠ‚ã€‚å¦‚æžœæ‚¨åœ¨å½“å‰å›žè·¯æˆ–æµä¸é€‰æ‹©äº†ä¸€"
-"ä¸ªå›žè·¯æˆ–æµï¼Œè¯¥é¢æ¿å°†ä¼šå‘æ‚¨å±•ç¤ºå…³äºŽæ¯ä¸ªé€šè¿‡å›žè·¯å‘é€ä¿¡æ¯çš„ç»†èŠ‚ã€‚"
 
 #. type: Content of: <html><body><p>
 #: en/netview.html:132
 msgid ""
 "The fields that you may see in the panel are as follows (<i>Note</i>: not "
 "all of these fields will always be present):"
-msgstr "é¢æ¿ä¸æ‚¨èƒ½çœ‹çš„é¡¹ç›®å¦‚ä¸‹ï¼ˆ<i>æ³¨æ„</i>ï¼šä¸æ˜¯æ‰€æœ‰çš„é¡¹ç›®éƒ½ä¼šæ˜¾ç¤ºå‡ºæ¥çš„ï¼‰ï¼š"
+msgstr ""
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:138
 msgid "<b>Location</b>"
-msgstr "<b>ä½ç½®</b>"
+msgstr ""
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:139
 msgid "The geographic location of this Tor relay."
-msgstr "Tor ä¸ç»§çš„åœ°ç†ä½ç½®ã€‚"
+msgstr ""
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:142
 msgid "<b>IP Address</b>"
-msgstr "<b>IP åœ°å€</b>"
+msgstr ""
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:143
 msgid "IP address at which this Tor relay can be reached."
-msgstr "è¯¥ Tor ä¸ç»§å¯èƒ½è¿žæŽ¥åˆ°çš„ IP åœ°å€ã€‚"
+msgstr ""
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:146
 msgid "<b>Platform</b>"
-msgstr "<b>å¹³å°</b>"
+msgstr ""
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:148
 msgid ""
 "Operating system information and Tor version on which this relay is "
 "currently running."
-msgstr "å½“å‰æ£åœ¨è¿è¡Œä¸ç»§å¹³å°çš„æ“ä½œç³»ç»Ÿä¿¡æ¯å’Œ Tor ç‰ˆæœ¬ã€‚"
+msgstr ""
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:153
 msgid "<b>Bandwidth</b>"
-msgstr "<b>å®½å¸¦</b>"
+msgstr ""
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:155
@@ -260,21 +226,21 @@ msgstr ""
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:160
 msgid "<b>Uptime</b>"
-msgstr "<b>è¿è¡Œæ—¶é—´</b>"
+msgstr ""
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:162
 msgid ""
 "Length of time this relay has been available, which can be used to help "
 "estimate this relay's stability."
-msgstr "å®½å¸¦å·²ç»è¿è¡Œçš„æ—¶é—´ï¼Œå¯ä»¥å¸®åŠ©è¯„ä¼°è¯¥ä¸ç»§çš„ç¨³å®šæ€§ã€‚"
+msgstr ""
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:167
 msgid "<b>Last Updated</b>"
-msgstr "<b>æœ€åŽæ›´æ–°</b>"
+msgstr ""
 
 #. type: Content of: <html><body><p><table><tr><td>
 #: en/netview.html:168
 msgid "Date this relay's information was last updated."
-msgstr "è¯¥ä¸ç»§çš„ä¿¡æ¯æœ€åŽæ›´æ–°çš„æ—¥æœŸã€‚"
+msgstr ""
diff --git a/src/vidalia/help/content/po/zh_HK/netview.po b/src/vidalia/help/content/po/zh_HK/netview.po
index 47f3d73..835d3e1 100644
--- a/src/vidalia/help/content/po/zh_HK/netview.po
+++ b/src/vidalia/help/content/po/zh_HK/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: zh_HK\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/zh_TW/netview.po b/src/vidalia/help/content/po/zh_TW/netview.po
index 47f3d73..6332f41 100644
--- a/src/vidalia/help/content/po/zh_TW/netview.po
+++ b/src/vidalia/help/content/po/zh_TW/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 
diff --git a/src/vidalia/help/content/po/zu/netview.po b/src/vidalia/help/content/po/zu/netview.po
index 47f3d73..607e743 100644
--- a/src/vidalia/help/content/po/zu/netview.po
+++ b/src/vidalia/help/content/po/zu/netview.po
@@ -1,28 +1,17 @@
 # 
-#   $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.
-# 
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-06-26 17:00+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-04-12 15:29+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Language: zu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <html><body><h1>
 #: en/netview.html:16
@@ -70,8 +59,8 @@ msgstr ""
 #: en/netview.html:38
 msgid ""
 "The network map consists of a map of the world, with red pinpoints "
-"indicating the geographic location of relays in the Tor network. Green lines "
-"are drawn between relays to indicate the path of circuits that your Tor "
+"indicating the geographic location of relays in the Tor network. Green lines"
+" are drawn between relays to indicate the path of circuits that your Tor "
 "client has created through the Tor network."
 msgstr ""
 
@@ -96,12 +85,12 @@ msgstr ""
 #: en/netview.html:55
 msgid ""
 "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 "
+"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 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 "
+"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."
 msgstr ""
 
@@ -178,8 +167,8 @@ msgstr ""
 msgid ""
 "The relay details panel at the right side of the screen gives you details "
 "about the relay or relays currently selected in the <a "
-"href=\"#relaylist\">relay list</a>. If you have selected a circuit or stream "
-"in the list of your current circuits and streams, this panel will show you "
+"href=\"#relaylist\">relay 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 relay through which your traffic is currently being sent."
 msgstr ""
 



